From MAILER-DAEMON Thu Jun 01 00:24:27 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FlejT-00009o-GL
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 00:24:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FlejR-00009g-Ux
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 00:24:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FlejQ-00009U-9B
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 00:24:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FlejQ-00009R-3u
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 00:24:24 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Flepa-0001k1-Fm
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 00:30:46 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FlejM-0000HI-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 00:24:20 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FlejM-0000HF-0N
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 04:24:20 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FlejM-0000HF-0N@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Thu, 01 Jun 2006 04:24:20 +0000
Subject: [commit-cp] classpath/native/jni/gtk-peer gnu_java_awt_peer...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 04:24:26 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Sven de Marothy <smarothy@savannah.gnu.org>	06/06/01 04:24:19

Modified files:
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_CairoSurface.c 

Log message:
	2006-06-01  Sven de Marothy  <sven@physto.se>
	
	* gnu/java/awt/peer/gtk/BufferedImageGraphics.java
	(updateBufferedImage): Simplify.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
	(getPixels): Don't swap.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 00:26:44 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Flelg-00019Z-EN
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 00:26:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Flelf-00018A-Ap
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 00:26:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Flele-00017U-Fh
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 00:26:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Flele-00017P-Ag
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 00:26:42 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Flero-0001t5-MW
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 00:33:04 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fleld-0000IO-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 00:26:41 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1Flelc-0000IK-EC
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 04:26:41 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Flelc-0000IK-EC@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Thu, 01 Jun 2006 04:26:40 +0000
Subject: [commit-cp] classpath ./ChangeLog native/jni/gtk-peer/gnu_j...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 04:26:43 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Sven de Marothy <smarothy@savannah.gnu.org>	06/06/01 04:26:40

Modified files:
	.              : ChangeLog 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_CairoSurface.c 

Log message:
	2006-06-01  Sven de Marothy  <sven@physto.se>
	
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
	(setPixels): Don't swap, correct size.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7612&tr2=1.7613&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 00:38:55 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FlexT-0004BY-8u
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 00:38:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FlexR-0004Au-0N
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 00:38:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FlexP-0004AR-V6
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 00:38:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FlexP-0004AO-Pg
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 00:38:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Flf3a-0002aZ-7d
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 00:45:14 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FlexO-0001hK-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 00:38:50 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FlexN-0001hH-Ca
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 04:38:50 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FlexN-0001hH-Ca@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Thu, 01 Jun 2006 04:38:49 +0000
Subject: [commit-cp] classpath ./ChangeLog javax/swing/JComboBox.jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 04:38:53 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	David Gilbert <trebligd@savannah.gnu.org>	06/06/01 04:38:49

Modified files:
	.              : ChangeLog 
	javax/swing    : JComboBox.java JEditorPane.java 
	                 JFormattedTextField.java JLayeredPane.java 
	                 JScrollPane.java JSlider.java JSpinner.java 
	                 JTree.java JViewport.java UIDefaults.java 
	                 UIManager.java 

Log message:
	2006-06-01  David Gilbert  <david.gilbert@object-refinery.com>
	
	* javax/swing/JComboBox.java: Minor source code formatting fixes,
	* javax/swing/JEditorPane.java: Likewise,
	* javax/swing/JFormattedTextField.java: Likewise,
	* javax/swing/JLayeredPane.java: Likewise,
	* javax/swing/JScrollPane.java: Likewise,
	* javax/swing/JSlider.java: Likewise,
	* javax/swing/JSpinner.java: Likewise,
	* javax/swing/JTree.java: Likewise,
	* javax/swing/JViewport.java: Likewise,
	* javax/swing/UIDefaults.java: Likewise,
	* javax/swing/UIManager.java: Likewise.
	----------------------------------------------------------------------

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7613&tr2=1.7614&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/JComboBox.java.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/JEditorPane.java.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/JFormattedTextField.java.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/JLayeredPane.java.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/JScrollPane.java.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/JSlider.java.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/JSpinner.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/JTree.java.diff?tr1=1.66&tr2=1.67&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/JViewport.java.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/UIDefaults.java.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/UIManager.java.diff?tr1=1.34&tr2=1.35&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 01:06:04 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FlfNk-0003dG-G0
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 01:06:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FlfNi-0003cw-AY
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 01:06:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FlfNg-0003ck-G5
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 01:06:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FlfNg-0003ch-AK
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 01:06:00 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FlfTq-0004cJ-Ti
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 01:12:22 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FlfNe-0001yd-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 01:05:58 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FlfNd-0001ya-KG
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 05:05:58 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FlfNd-0001ya-KG@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Thu, 01 Jun 2006 05:05:57 +0000
Subject: [commit-cp] classpath ./ChangeLog gnu/java/awt/peer/gtk/Buf...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 05:06:03 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Sven de Marothy <smarothy@savannah.gnu.org>	06/06/01 05:05:57

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: BufferedImageGraphics.java 
	                       CairoGraphics2D.java 

Log message:
	2006-06-01  Sven de Marothy  <sven@physto.se>
	
	* gnu/java/awt/peer/gtk/BufferedImageGraphics.java
	(BufferedImageGraphics): Cache surfaces.
	(updateBufferedImage): Copy directly for certain color models.
	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
	(drawImage): Reimplement.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7614&tr2=1.7615&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 01:17:06 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FlfYQ-0006cb-AH
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 01:17:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FlfYP-0006cI-DW
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 01:17:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FlfYO-0006bz-Ql
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 01:17:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FlfYO-0006bw-M8
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 01:17:04 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FlfeZ-0005Gu-GV
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 01:23:27 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FlfYN-00025B-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 01:17:03 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FlfYM-000257-QX
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 05:17:03 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FlfYM-000257-QX@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Thu, 01 Jun 2006 05:17:02 +0000
Subject: [commit-cp] classpath ./ChangeLog javax/swing/plaf/basic/Ba...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 05:17:05 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	David Gilbert <trebligd@savannah.gnu.org>	06/06/01 05:17:02

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicButtonUI.java 
	                        BasicDirectoryModel.java 
	                        BasicFileChooserUI.java 
	                        BasicIconFactory.java BasicListUI.java 
	                        BasicOptionPaneUI.java 
	                        BasicRootPaneUI.java 
	                        BasicScrollPaneUI.java 
	                        BasicSpinnerUI.java 
	                        BasicTabbedPaneUI.java 
	                        BasicTextAreaUI.java 

Log message:
	2006-06-01  David Gilbert  <david.gilbert@object-refinery.com>
	
	* javax/swing/plaf/basic/BasicButtonUI.java: Minor source code style
	fixes,
	* javax/swing/plaf/basic/BasicDirectoryModel.java: Likewise,
	* javax/swing/plaf/basic/BasicFileChooserUI.java: Likewise,
	* javax/swing/plaf/basic/BasicIconFactory.java: Likewise,
	* javax/swing/plaf/basic/BasicListUI.java: Likewise,
	* javax/swing/plaf/basic/BasicOptionPaneUI.java: Likewise,
	* javax/swing/plaf/basic/BasicRootPaneUI.java: Likewise,
	* javax/swing/plaf/basic/BasicScrollPaneUI.java: Likewise,
	* javax/swing/plaf/basic/BasicSpinnerUI.java: Likewise,
	* javax/swing/plaf/basic/BasicTabbedPaneUI.java: Likewise,
	* javax/swing/plaf/basic/BasicTextAreaUI.java: Likewise.
	----------------------------------------------------------------------

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7615&tr2=1.7616&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/plaf/basic/BasicButtonUI.java.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/plaf/basic/BasicIconFactory.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/plaf/basic/BasicListUI.java.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/plaf/basic/BasicRootPaneUI.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/plaf/basic/BasicSpinnerUI.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/plaf/basic/BasicTextAreaUI.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 03:43:19 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Flhpv-00064M-Oz
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 03:43:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Flhpu-00063S-BT
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 03:43:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Flhpt-00062v-Ic
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 03:43:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Flhpt-00062o-5z
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 03:43:17 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Flhw5-00070V-D9
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 03:49:41 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Flhpr-000830-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 03:43:15 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1Flhpq-00082w-5t
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 07:43:15 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Flhpq-00082w-5t@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Thu, 01 Jun 2006 07:43:14 +0000
Subject: [commit-cp] classpath ./ChangeLog gnu/java/awt/peer/gtk/Buf...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 07:43:18 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Sven de Marothy <smarothy@savannah.gnu.org>	06/06/01 07:43:14

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: BufferedImageGraphics.java 

Log message:
	2006-06-01  Sven de Marothy  <sven@physto.se>
	
	* gnu/java/awt/peer/gtk/BufferedImageGraphics.java
	(updateBufferedImage): Fix some errors.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7616&tr2=1.7617&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 06:51:23 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Flklv-0004Ls-5S
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 06:51:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Flklt-0004Lg-Hs
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 06:51:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Flkls-0004LM-KV
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 06:51:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Flkls-0004LJ-Hu
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 06:51:20 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Flks6-0006dS-E0
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 06:57:46 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Flklr-0006aG-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 06:51:19 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1Flklp-0006aB-RC
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 10:51:18 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Flklp-0006aB-RC@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Thu, 01 Jun 2006 10:51:17 +0000
Subject: [commit-cp] classpath ./ChangeLog gnu/java/awt/peer/gtk/Cai...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 10:51:21 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Sven de Marothy <smarothy@savannah.gnu.org>	06/06/01 10:51:17

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java GdkTextLayout.java 
	include        : gnu_java_awt_peer_gtk_GdkTextLayout.h 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_GdkTextLayout.c 

Log message:
	2006-06-01  Sven de Marothy  <sven@physto.se>
	
	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
	(drawImage): Check for zero size.
	* gnu/java/awt/peer/gtk/GdkTextLayout.java:
	(setFont): Declare new native method.
	(GdkTextLayout): Read some attributes.
	* include/gnu_java_awt_peer_gtk_GdkTextLayout.h
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
	(setFont): New native method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7617&tr2=1.7618&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c.diff?tr1=1.13&tr2=1.14&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 06:53:52 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FlkoK-0004p0-Kz
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 06:53:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FlkoI-0004oH-TL
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 06:53:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FlkoH-0004o3-Fc
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 06:53:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FlkoH-0004o0-CB
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 06:53:49 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FlkuV-00073k-Bm
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 07:00:15 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FlkoG-0006e4-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 06:53:48 -0400
Received: from audriusa by savannah.gnu.org with local (Exim 4.50)
	id 1FlkoF-0006e1-He
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 10:53:47 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FlkoF-0006e1-He@savannah.gnu.org>
From: Audrius Meskauskas <audriusa@bluewin.ch>
Date: Thu, 01 Jun 2006 10:53:47 +0000
Subject: [commit-cp] classpath ./ChangeLog gnu/javax/swing/text/html...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 10:53:51 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Audrius Meskauskas <audriusa@savannah.gnu.org>	06/06/01 10:53:47

Modified files:
	.              : ChangeLog 
Added files:
	gnu/javax/swing/text/html: ImageViewIconFactory.java 

Log message:
	2006-06-01  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
	
	* gnu/javax/swing/text/html/ImageViewIconFactory.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7618&tr2=1.7619&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 09:57:44 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FlngG-0000UY-D7
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 09:57:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FlngF-0000Tp-0m
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 09:57:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FlngD-0000TB-V8
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 09:57:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FlngD-0000T3-Oc
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 09:57:41 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FlnmT-0007pH-GN
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 10:04:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FlngC-0008I3-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 09:57:40 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FlngB-0008I0-9Z
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 13:57:39 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FlngB-0008I0-9Z@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Thu, 01 Jun 2006 13:57:39 +0000
Subject: [commit-cp] classpath ./ChangeLog gnu/java/awt/Buffers.java...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 13:57:43 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Sven de Marothy <smarothy@savannah.gnu.org>	06/06/01 13:57:39

Modified files:
	.              : ChangeLog 
	gnu/java/awt   : Buffers.java 
	gnu/java/awt/peer/gtk: CairoSurface.java 

Log message:
	2006-06-01  Sven de Marothy  <sven@physto.se>
	
	PR 27854
	* gnu/java/awt/Buffers.java (getData): Reimplement.
	* gnu/java/awt/peer/gtk/CairoSurface.java
	(getElem, setElem): Call native methods.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7619&tr2=1.7620&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/Buffers.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/CairoSurface.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 10:02:56 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FlnlH-0003lQ-Vc
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 10:02:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FlnlG-0003jD-Hk
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 10:02:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FlnlF-0003iL-Tg
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 10:02:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FlnlF-0003i1-Ma
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 10:02:53 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FlnrV-0000Tx-HJ
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 10:09:21 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FlnlE-0008QK-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 10:02:52 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FlnlE-0008QH-8r
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 14:02:52 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FlnlE-0008QH-8r@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Thu, 01 Jun 2006 14:02:52 +0000
Subject: [commit-cp] classpath ./ChangeLog gnu/java/awt/peer/gtk/Cai...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 14:02:54 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Sven de Marothy <smarothy@savannah.gnu.org>	06/06/01 14:02:52

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 

Log message:
	2006-06-01  Sven de Marothy  <sven@physto.se>
	
	* gnu/java/awt/peer/gtk/CairoGraphics2D.java:
	(setPaint): Scale +1 pixel larger.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7620&tr2=1.7621&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 10:17:26 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FlnzK-0001LF-MP
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 10:17:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FlnzI-0001Kw-V5
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 10:17:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FlnzH-0001Kk-Jl
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 10:17:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FlnzH-0001Kh-GN
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 10:17:23 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Flo5X-0001nR-IF
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 10:23:51 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FlnzF-0000Kr-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 10:17:21 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FlnzF-0000Ko-Dc
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 14:17:21 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FlnzF-0000Ko-Dc@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Thu, 01 Jun 2006 14:17:21 +0000
Subject: [commit-cp] classpath javax/swing/JTable.java ./ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 14:17:25 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	
Changes by:	Roman Kennke <rabbit78@savannah.gnu.org>	06/06/01 14:17:21

Modified files:
	javax/swing    : JTable.java 
	.              : ChangeLog 

Log message:
	2006-06-01  Roman Kennke <kennke@aicas.com>
	
	* javax/swing/JTable.java
	(AccessibleJTableCell.getAccessibleRow): Added comment explaining
	why the behaviour is like it is.
	(AccessibleJTableCell.getAccessibleStateSet): Implemented.
	(AccessibleJTableHeader): New inner class.
	(AccessibleJTableHeaderCell): New inner class.
	(AccessibleJTable.lastSelectedRow): New field.
	(AccessibleJTable.lastSelectedColumn): New field.
	(AccessibleJTable.caption): New field.
	(AccessibleJTable.summary): New field.
	(AccessibleJTable.rowDescriptions): New field.
	(AccessibleJTable.columnDescriptions): New field.
	(AccessibleJTable): Initialize lastSelectedRow and lastSelectedColumn.
	(AccessibleJTable.getAccessibleSelection(int)): Implemented.
	(AccessibleJTable.isAccessibleChildSelected): Implemented.
	(AccessibleJTable.addAccessibleSelection): Implemented.
	(AccessibleJTable.removeAccessibleSelection): Implemented.
	(AccessibleJTable.clearAccessibleSelection): Implemented.
	(AccessibleJTable.selectAllAccessibleSelection): Implemented.
	(AccessibleJTable.valueChange): Implemented.
	(AccessibleJTable.tableRowsInserted): Implemented.
	(AccessibleJTable.tableRowsDeleted): Implemented.
	(AccessibleJTable.handleRowChange): New helper method.
	(AccessibleJTable.columnAdded): Implemented.
	(AccessibleJTable.columnMarginChanged): Implemented.
	(AccessibleJTable.columnMoved): Implemented.
	(AccessibleJTable.columnRemoved): Implemented.
	(AccessibleJTable.columnSelectionChanged): Implemented.
	(AccessibleJTable.handleColumnChange): New helper method.
	(AccessibleJTable.editingCanceled): Implemented.
	(AccessibleJTable.editingStopped): Implemented.
	(AccessibleJTable.getAccessibleRow): Implemented.
	(AccessibleJTable.getAccessibleColumn): Implemented.
	(AccessibleJTable.getAccessibleIndex): Implemented.
	(AccessibleJTable.getAccessibleCaption): Implemented.
	(AccessibleJTable.setAccessibleCaption): Implemented.
	(AccessibleJTable.getAccessibleSummary): Implemented.
	(AccessibleJTable.setAccessibleSummary): Implemented.
	(AccessibleJTable.getAccessibleRowCount): Implemented.
	(AccessibleJTable.getAccessibleColumnCount): Implemented.
	(AccessibleJTable.getAccessibleAt): Implemented.
	(AccessibleJTable.getAccessibleRowExtentAt): Implemented.
	(AccessibleJTable.getAccessibleColumnExtentAt): Implemented.
	(AccessibleJTable.getAccessibleRowHeader): Implemented.
	(AccessibleJTable.setAccessibleRowHeader): Implemented.
	(AccessibleJTable.getAccessibleColumnHeader): Implemented.
	(AccessibleJTable.setAccessibleColumnHeader): Implemented.
	(AccessibleJTable.getAccessibleRowDescription): Implemented.
	(AccessibleJTable.setAccessibleRowDescription): Implemented.
	(AccessibleJTable.getAccessibleColumnDescription): Implemented.
	(AccessibleJTable.setAccessibleColumnDescription): Implemented.
	(AccessibleJTable.isAccessibleSelected): Implemented.
	(AccessibleJTable.isAccessibleRowSelected): Implemented.
	(AccessibleJTable.isAccessibleColumnSelected): Implemented.
	(AccessibleJTable.getSelectedAccessibleRows): Implemented.
	(AccessibleJTable.getSelectedAccessibleColumns): Implemented.
	(getAccessibleContext): Register listeners for the accessibility
	class on the JTable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/JTable.java.diff?tr1=1.112&tr2=1.113&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7621&tr2=1.7622&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 11:38:04 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FlpFM-00088d-G6
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 11:38:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FlpFK-00087v-Fz
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 11:38:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FlpFI-00087C-U6
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 11:38:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FlpFI-00086u-ID
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 11:38:00 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FlpLZ-0001WA-Dq
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 11:44:29 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FlpFH-00056t-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 11:37:59 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FlpFG-00056k-PG
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 15:37:59 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FlpFG-00056k-PG@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Thu, 01 Jun 2006 15:37:58 +0000
Subject: [commit-cp] classpath ./ChangeLog native/jni/qt-peer/qtmenu...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 15:38:03 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Sven de Marothy <smarothy@savannah.gnu.org>	06/06/01 15:37:58

Modified files:
	.              : ChangeLog 
	native/jni/qt-peer: qtmenupeer.cpp 

Log message:
	2006-06-01  Sven de Marothy  <sven@physto.se>
	
	Patch submitted by Boris Dusek.
	* native/jni/qt-peer/qtmenupeer.cpp
	Fix segfault

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7622&tr2=1.7623&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/native/jni/qt-peer/qtmenupeer.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 12:40:16 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FlqDY-0003XI-NO
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 12:40:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FlqDW-0003VL-Lp
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 12:40:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FlqDV-0003V9-37
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 12:40:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FlqDU-0003V6-VT
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 12:40:12 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FlqJm-0007WZ-CD
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 12:46:42 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FlqDU-0008Jz-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 12:40:12 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FlqDT-0008Jw-Ti
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 16:40:12 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FlqDT-0008Jw-Ti@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Thu, 01 Jun 2006 16:40:11 +0000
Subject: [commit-cp] classpath ./ChangeLog tools/gnu/classpath/tools...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 16:40:14 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	
Changes by:	Lillian Angel <langel@savannah.gnu.org>	06/06/01 16:40:11

Modified files:
	.              : ChangeLog 
	tools/gnu/classpath/tools/appletviewer: AppletTag.java 

Log message:
	2006-06-01  Lillian Angel  <langel@redhat.com>
	
	* tools/gnu/classpath/tools/appletviewer/AppletTag.java
	(prependCodebase): Fixed check. No dirname was ever considered to
	be a file, so every applet fell into the if-statement causing a lot
	of classloading problems with the applets.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7623&tr2=1.7624&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/gnu/classpath/tools/appletviewer/AppletTag.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 13:08:24 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Flqem-0007h0-38
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 13:08:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Flqel-0007gc-9L
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 13:08:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Flqek-0007g7-HU
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 13:08:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Flqek-0007g4-D2
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 13:08:22 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Flql2-0002NG-45
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 13:14:52 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Flqej-0000mI-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 13:08:21 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1Flqej-0000mF-E5
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 17:08:21 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Flqej-0000mF-E5@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Thu, 01 Jun 2006 17:08:21 +0000
Subject: [commit-cp] classpath ./ChangeLog java/util/logging/LogMana...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 17:08:23 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	
Changes by:	Mark Wielaard <mark@savannah.gnu.org>	06/06/01 17:08:21

Modified files:
	.              : ChangeLog 
	java/util/logging: LogManager.java 

Log message:
	* java/util/logging/LogManager.java (createInstance): Always add
	original exception on warning.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7624&tr2=1.7625&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/java/util/logging/LogManager.java.diff?tr1=1.21&tr2=1.22&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 13:51:02 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FlrK2-00072u-Px
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 13:51:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FlrK1-00072b-B4
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 13:51:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FlrK0-00072P-L6
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 13:51:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FlrK0-00072M-Ib
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 13:51:00 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FlrQI-0006t6-LK
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 13:57:30 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FlrJz-0003Uq-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 13:50:59 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FlrJy-0003Um-PD
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 17:50:59 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FlrJy-0003Um-PD@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Thu, 01 Jun 2006 17:50:58 +0000
Subject: [commit-cp] classpath ./ChangeLog gnu/java/awt/peer/gtk/Cai...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 17:51:01 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Sven de Marothy <smarothy@savannah.gnu.org>	06/06/01 17:50:58

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 

Log message:
	2006-06-01  Sven de Marothy  <sven@physto.se>
	
	* gnu/java/awt/peer/gtk/CairoGraphics2D.java:
	(setColor): Update the cairo paint.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7625&tr2=1.7626&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 15:20:42 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Flsio-0008Pt-E7
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 15:20:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Flsil-0008Pe-Q1
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 15:20:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Flsik-0008PS-Su
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 15:20:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Flsik-0008PP-Mj
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 15:20:38 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Flsp3-0006hO-Py
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 15:27:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Flsii-0005wm-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 15:20:36 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1Flsii-0005wi-40
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 19:20:36 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Flsii-0005wi-40@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Thu, 01 Jun 2006 19:20:36 +0000
Subject: [commit-cp] classpath tools/keytool.in tools/jarsigner.in ....
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 19:20:40 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	
Changes by:	Raif S. Naffah <raif@savannah.gnu.org>	06/06/01 19:20:36

Modified files:
	tools          : keytool.in jarsigner.in 
	.              : ChangeLog 

Log message:
	2006-06-02  Raif S. Naffah  <raif@swiftdsl.com.au>
	
	* tools/jarsigner.in: Use @VM_BINARY@.
	* tools/keytool.in: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/keytool.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/jarsigner.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7626&tr2=1.7627&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 15:31:49 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FlstZ-0005CB-H5
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 15:31:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FlstY-0005C4-8X
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 15:31:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FlstX-0005Bs-SV
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 15:31:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FlstX-0005Bp-MX
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 15:31:47 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Flszq-0007j1-Ps
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 15:38:18 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FlstX-0006Ov-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 15:31:47 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FlstW-0006Ok-OD
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 19:31:47 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FlstW-0006Ok-OD@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Thu, 01 Jun 2006 19:31:46 +0000
Subject: [commit-cp] classpath ./ChangeLog tools/gnu/classpath/tools...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 19:31:49 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	
Changes by:	Raif S. Naffah <raif@savannah.gnu.org>	06/06/01 19:31:46

Modified files:
	.              : ChangeLog 
	tools/gnu/classpath/tools/keytool: Command.java 

Log message:
	2006-06-02  Raif S. Naffah  <raif@swiftdsl.com.au>
	
	* tools/gnu/classpath/tools/keytool/Command.java (shutdownThread): New field.
	(Command): Add the shutdown hook.
	(doCommand): Remove the shutdown hook.
	(ShutdownHook): New class.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7627&tr2=1.7628&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/gnu/classpath/tools/keytool/Command.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 15:50:40 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FltBn-0004b0-P2
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 15:50:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FltBn-0004ao-2N
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 15:50:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FltBm-0004aQ-DD
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 15:50:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FltBm-0004aM-8y
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 15:50:38 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FltI5-0000iJ-Fw
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 15:57:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FltBl-0007dg-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 15:50:37 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FltBl-0007dd-B3
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 19:50:37 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FltBl-0007dd-B3@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Thu, 01 Jun 2006 19:50:37 +0000
Subject: [commit-cp] classpath tools/gnu/classpath/tools/keytool/Ide...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 19:50:39 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	
Changes by:	Raif S. Naffah <raif@savannah.gnu.org>	06/06/01 19:50:37

Modified files:
	tools/gnu/classpath/tools/keytool: IdentityDBCmd.java 
	                                   KeyCloneCmd.java 
	                                   KeyPasswdCmd.java 
	                                   GenKeyCmd.java ListCmd.java 
	                                   ImportCmd.java ExportCmd.java 
	                                   SelfCertCmd.java 
	                                   StorePasswdCmd.java 
	                                   DeleteCmd.java 
	                                   CertReqCmd.java 
	.              : ChangeLog 

Log message:
	2006-06-02  Raif S. Naffah  <raif@swiftdsl.com.au>
	
	* tools/gnu/classpath/tools/keytool/StorePasswdCmd.java: Fixed typo.
	* tools/gnu/classpath/tools/keytool/CertReqCmd.java: Likewise.
	* tools/gnu/classpath/tools/keytool/DeleteCmd.java: Likewise.
	* tools/gnu/classpath/tools/keytool/ExportCmd.java: Likewise.
	* tools/gnu/classpath/tools/keytool/GenKeyCmd.java: Likewise.
	* tools/gnu/classpath/tools/keytool/IdentityDBCmd.java: Likewise.
	* tools/gnu/classpath/tools/keytool/ImportCmd.java: Likewise.
	* tools/gnu/classpath/tools/keytool/KeyCloneCmd.java: Likewise.
	* tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java: Likewise.
	* tools/gnu/classpath/tools/keytool/ListCmd.java: Likewise.
	* tools/gnu/classpath/tools/keytool/SelfCertCmd.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/gnu/classpath/tools/keytool/ListCmd.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/gnu/classpath/tools/keytool/SelfCertCmd.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/gnu/classpath/tools/keytool/DeleteCmd.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7628&tr2=1.7629&r1=text&r2=text



From MAILER-DAEMON Thu Jun 01 21:04:38 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fly5e-0002Si-BH
	for mharc-commit-classpath@gnu.org; Thu, 01 Jun 2006 21:04:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fly5d-0002Sd-KA
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 21:04:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fly5c-0002SJ-KO
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 21:04:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fly5c-0002SG-CG
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 21:04:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FlyBy-0004pI-Jz
	for commit-classpath@gnu.org; Thu, 01 Jun 2006 21:11:10 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fly5R-0000fW-00
	for <commit-classpath@gnu.org>; Thu, 01 Jun 2006 21:04:25 -0400
Received: from keiths by savannah.gnu.org with local (Exim 4.50)
	id 1Fly5Q-0000fS-Sy
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 01:04:25 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fly5Q-0000fS-Sy@savannah.gnu.org>
From: Keith Seitz <keiths@redhat.com>
Date: Fri, 02 Jun 2006 01:04:24 +0000
Subject: [commit-cp] classpath ./ChangeLog gnu/classpath/jdwp/proces...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jun 2006 01:04:37 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Keith Seitz <keiths@savannah.gnu.org>	06/06/02 01:04:24

Modified files:
	.              : ChangeLog 
	gnu/classpath/jdwp/processor: EventRequestCommandSet.java 
	                              ThreadGroupReferenceCommandSet.java 
	                              ClassTypeCommandSet.java 

Log message:
	From Martin Platter  <motse@complang.tuwien.ac.at>:
	* gnu/classpath/jdwp/processor/EventRequestCommandSet.java
	(executeSet): Fix buffer underflow reading reference ID.
	* gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.java
	(executeParent): Fix  NPE if ThreadGroup is top-level ThreadGroup.
	* gnu/classpath/jdwp/processor/ClassTypeCommandSet.java
	(executeSuperclass): Handle case of Object with ID zero.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7629&tr2=1.7630&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/classpath/jdwp/processor/EventRequestCommandSet.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/classpath/jdwp/processor/ClassTypeCommandSet.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text



From MAILER-DAEMON Fri Jun 02 09:32:35 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fm9lT-0004gy-CE
	for mharc-commit-classpath@gnu.org; Fri, 02 Jun 2006 09:32:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fm9lR-0004ga-UE
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 09:32:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fm9lQ-0004fx-GZ
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 09:32:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fm9lQ-0004ft-9v
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 09:32:32 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fm9rt-00030C-TC
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 09:39:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fm9lP-0004ux-00
	for <commit-classpath@gnu.org>; Fri, 02 Jun 2006 09:32:31 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fm9lP-0004up-Ag
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 13:32:31 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fm9lP-0004up-Ag@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Fri, 02 Jun 2006 13:32:31 +0000
Subject: [commit-cp] classpath javax/swing/JTable.java ./ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jun 2006 13:32:34 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	
Changes by:	Roman Kennke <rabbit78@savannah.gnu.org>	06/06/02 13:32:31

Modified files:
	javax/swing    : JTable.java 
	.              : ChangeLog 

Log message:
	2006-06-02  Roman Kennke <kennke@aicas.com>
	
	* javax/swing/JTable.java
	(columnSelectionChanged): Don't return when there's only one
	column (might still need repainting). Correctly calculate
	repaint rectangle.
	(valueChanged): Use return value of SwingUtilities.computeUnion
	as dirty region.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/JTable.java.diff?tr1=1.113&tr2=1.114&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7630&tr2=1.7631&r1=text&r2=text



From MAILER-DAEMON Fri Jun 02 12:01:40 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmC5k-0000Dt-GH
	for mharc-commit-classpath@gnu.org; Fri, 02 Jun 2006 12:01:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmC5h-0000D2-Ac
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 12:01:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmC5f-0000CP-VC
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 12:01:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmC5f-0000C9-7V
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 12:01:35 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmCCA-0008Ap-4S
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 12:08:18 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmC5e-0002m4-00
	for <commit-classpath@gnu.org>; Fri, 02 Jun 2006 12:01:34 -0400
Received: from fitzsim by savannah.gnu.org with local (Exim 4.50)
	id 1FmC5e-0002m1-5g
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 16:01:34 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmC5e-0002m1-5g@savannah.gnu.org>
From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Fri, 02 Jun 2006 16:01:34 +0000
Subject: [commit-cp] classpath ChangeLog configure.ac
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jun 2006 16:01:38 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Thomas Fitzsimmons <fitzsim@savannah.gnu.org>	06/06/02 16:01:34

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	2006-06-01  Miriam Schuster  <schmir11@web.de>
	
	* Makefile.am: Add fallback if "mozilla-plugin" is not available.
	Fallbacks used: "firefox-plugin" and "xulrunner-plugin".

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7631&tr2=1.7632&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/configure.ac.diff?tr1=1.154&tr2=1.155&r1=text&r2=text



From MAILER-DAEMON Fri Jun 02 12:17:59 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmCLX-0007gf-8a
	for mharc-commit-classpath@gnu.org; Fri, 02 Jun 2006 12:17:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmCLV-0007fp-Bd
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 12:17:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmCLS-0007fI-L6
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 12:17:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmCLS-0007fC-Dk
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 12:17:54 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmCRx-0000z2-LO
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 12:24:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmCLM-00032U-00
	for <commit-classpath@gnu.org>; Fri, 02 Jun 2006 12:17:48 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FmCLL-00032R-Te
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 16:17:48 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmCLL-00032R-Te@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Fri, 02 Jun 2006 16:17:47 +0000
Subject: [commit-cp] classpath ./ChangeLog java/awt/DefaultKeyboardF...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jun 2006 16:17:57 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	
Changes by:	Lillian Angel <langel@savannah.gnu.org>	06/06/02 16:17:47

Modified files:
	.              : ChangeLog 
	java/awt       : DefaultKeyboardFocusManager.java 

Log message:
	2006-06-01  Lillian Angel  <langel@redhat.com>
	
	PR 24458
	* java/awt/DefaultKeyboardFocusManager.java
	(dispatchEvent): Fixed to getFocusOwner, if that fails it tries
	to get the focused window.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7632&tr2=1.7633&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/java/awt/DefaultKeyboardFocusManager.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text



From MAILER-DAEMON Fri Jun 02 14:29:20 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmEOe-00064o-46
	for mharc-commit-classpath@gnu.org; Fri, 02 Jun 2006 14:29:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmEOc-00063x-6r
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 14:29:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmEOa-000631-Or
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 14:29:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmEOa-00062w-Ig
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 14:29:16 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmEV7-0004hN-0f
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 14:36:01 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmEOZ-0007JG-00
	for <commit-classpath@gnu.org>; Fri, 02 Jun 2006 14:29:15 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FmEOY-0007J8-32
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 18:29:15 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmEOY-0007J8-32@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Fri, 02 Jun 2006 18:29:14 +0000
Subject: [commit-cp] classpath ./ChangeLog gnu/java/awt/peer/gtk/Buf...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jun 2006 18:29:18 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Sven de Marothy <smarothy@savannah.gnu.org>	06/06/02 18:29:14

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: BufferedImageGraphics.java 
	                       CairoGraphics2D.java 
	                       CairoSurfaceGraphics.java 
	                       ComponentGraphics.java 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_CairoSurface.c 
	                     gnu_java_awt_peer_gtk_ComponentGraphics.c 

Log message:
	2006-06-01  Sven de Marothy  <sven@physto.se>
	
	* gnu/java/awt/peer/gtk/BufferedImageGraphics.java
	* gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
	(nativeCopyArea): Change stride parameter to use # of ints.
	(setPixels): Add checks.
	* gnu/java/awt/peer/gtk/ComponentGraphics.java
	(ComponentGraphics): Set background, clip.
	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
	(Cairographics2D): Don't set clip.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
	Add flush.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7633&tr2=1.7634&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text



From MAILER-DAEMON Fri Jun 02 15:06:49 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmEyv-0000KE-NZ
	for mharc-commit-classpath@gnu.org; Fri, 02 Jun 2006 15:06:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmEyt-0000I1-Cg
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 15:06:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmEyr-0000Hn-Nl
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 15:06:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmEyr-0000Hk-JY
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 15:06:45 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmF5O-0007YG-C0
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 15:13:30 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmEyp-0000qv-00
	for <commit-classpath@gnu.org>; Fri, 02 Jun 2006 15:06:43 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FmEyp-0000qr-6d
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 19:06:43 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmEyp-0000qr-6d@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Fri, 02 Jun 2006 19:06:43 +0000
Subject: [commit-cp] classpath ./ChangeLog javax/swing/text/PlainVie...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jun 2006 19:06:47 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	
Changes by:	Roman Kennke <rabbit78@savannah.gnu.org>	06/06/02 19:06:43

Modified files:
	.              : ChangeLog 
	javax/swing/text: PlainView.java 

Log message:
	2006-06-02  Roman Kennke <kennke@aicas.com>
	
	PR 26738
	* javax/swing/text/PlainView.java
	(updateDamage): Rewritten for correct repainting and revalidating.
	(findLongestLine): New helper method.
	(getLineLength): New helper method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7634&tr2=1.7635&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/text/PlainView.java.diff?tr1=1.42&tr2=1.43&r1=text&r2=text



From MAILER-DAEMON Fri Jun 02 16:47:11 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmGY3-0004GX-Ml
	for mharc-commit-classpath@gnu.org; Fri, 02 Jun 2006 16:47:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmGY1-0004EY-NZ
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 16:47:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmGY0-0004E2-E1
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 16:47:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmGY0-0004Dz-7Z
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 16:47:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmGeX-0006nx-V3
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 16:53:54 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmGXy-0005F0-00
	for <commit-classpath@gnu.org>; Fri, 02 Jun 2006 16:47:06 -0400
Received: from andreast by savannah.gnu.org with local (Exim 4.50)
	id 1FmGXx-0005Ew-DE
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 20:47:06 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmGXx-0005Ew-DE@savannah.gnu.org>
From: Andreas Tobler <toa@pop.agri.ch>
Date: Fri, 02 Jun 2006 20:47:05 +0000
Subject: [commit-cp] classpath ./ChangeLog ./configure.ac native/jni...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jun 2006 20:47:09 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	
Changes by:	Andreas Tobler <andreast@savannah.gnu.org>	06/06/02 20:47:05

Modified files:
	.              : ChangeLog configure.ac 
	native/jni/gtk-peer: Makefile.am 

Log message:
	2006-06-02  Andreas Tobler  <a.tobler@schweiz.ch>
	
	* configure.ac: Add -lX11 and -lXtst to XTEST_LIBS.
	(XTEST_LIBS): New, substitute.
	* native/jni/gtk-peer/Makefile.am (AM_LDFLAGS): Add XTEST_LIBS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7635&tr2=1.7636&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/configure.ac.diff?tr1=1.155&tr2=1.156&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/native/jni/gtk-peer/Makefile.am.diff?tr1=1.41&tr2=1.42&r1=text&r2=text



From MAILER-DAEMON Fri Jun 02 18:57:36 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmIaG-0004BX-7W
	for mharc-commit-classpath@gnu.org; Fri, 02 Jun 2006 18:57:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmIaE-0004AM-PT
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 18:57:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmIaC-00049y-D5
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 18:57:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmIaC-00049v-9Y
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 18:57:32 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmIgl-0007fb-8a
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 19:04:19 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmIaB-0001GV-00
	for <commit-classpath@gnu.org>; Fri, 02 Jun 2006 18:57:31 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FmIaB-0001GS-9W
	for commit-classpath@gnu.org; Fri, 02 Jun 2006 22:57:31 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmIaB-0001GS-9W@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Fri, 02 Jun 2006 22:57:31 +0000
Subject: [commit-cp] classpath ./ChangeLog gnu/java/awt/peer/gtk/Buf...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jun 2006 22:57:34 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Branch: 	
Changes by:	Sven de Marothy <smarothy@savannah.gnu.org>	06/06/02 22:57:31

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: BufferedImageGraphics.java 
	                       CairoGraphics2D.java 
	                       CairoSurfaceGraphics.java 
	                       ComponentGraphics.java 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_CairoSurface.c 

Log message:
	2006-06-02  Sven de Marothy  <sven@physto.se>
	
	PR 27879
	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
	(copyArea): Implement.
	(copyAreaImpl, getRealBounds): New methods.
	* gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java
	* gnu/java/awt/peer/gtk/ComponentGraphics.java
	* gnu/java/awt/peer/gtk/BufferedImageGraphics.java
	(copyAreaImpl, getRealBounds): Implement.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
	(nativeCopyArea): Reimplement.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7636&tr2=1.7637&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text



From MAILER-DAEMON Sat Jun 03 01:21:11 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmOZT-0005Ot-Cv
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 01:21:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmOZR-0005Oo-VH
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 01:21:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmOZQ-0005Mo-Fk
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 01:21:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmOZQ-0005Mb-A3
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 01:21:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmOg3-0005IO-5k
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 01:27:59 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmOZO-0004sS-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 01:21:06 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FmOZO-0004sP-0x
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 05:21:06 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmOZO-0004sP-0x@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Sat, 03 Jun 2006 05:21:06 +0000
Subject: [commit-cp] classpath ./ChangeLog native/jni/gtk-peer/gnu_j...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 05:21:10 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	
Changes by:	Mark Wielaard <mark@savannah.gnu.org>	06/06/03 05:21:06

Modified files:
	.              : ChangeLog 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_CairoSurface.c 

Log message:
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c: Use C
	comments, not C++.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7637&tr2=1.7638&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c.diff?tr1=1.13&tr2=1.14&r1=text&r2=text



From MAILER-DAEMON Sat Jun 03 03:36:53 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmQgn-0003ZH-IL
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 03:36:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmQgl-0003Ym-MK
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:36:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmQgl-0003YS-9b
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:36:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmQgl-0003YP-4g
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:36:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmQnP-0004pc-8P
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:43:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmQgk-0001Tn-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 03:36:50 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FmQgk-0001Tk-9l
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 07:36:50 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmQgk-0001Tk-9l@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Sat, 03 Jun 2006 07:36:50 +0000
Subject: [commit-cp] classpath/javax/crypto Mac.java MacSpi.java
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 07:36:52 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	ssl-nio-branch
Changes by:	Casey Marshall <rsdio@savannah.gnu.org>	06/06/03 07:36:50

Modified files:
	javax/crypto   : Mac.java MacSpi.java 

Log message:
	2006-06-03  Casey Marshall  <csm@gnu.org>
	
	* javax/crypto/Mac.java (update): new method.
	* javax/crypto/MacSpi.java (engineUpdate): new method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/crypto/Mac.java.diff?only_with_tag=ssl-nio-branch&tr1=1.3.2.4&tr2=1.3.2.4.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/crypto/MacSpi.java.diff?only_with_tag=ssl-nio-branch&tr1=1.3.2.2&tr2=1.3.2.2.2.1&r1=text&r2=text



From MAILER-DAEMON Sat Jun 03 03:39:19 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmQj9-0004hr-Oa
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 03:39:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmQj7-0004hm-RC
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:39:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmQj7-0004ha-9i
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:39:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmQj7-0004hU-1Q
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:39:17 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmQpl-0004uS-5E
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:46:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmQj6-0001X5-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 03:39:16 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FmQj6-0001X1-8M
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 07:39:16 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmQj6-0001X1-8M@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Sat, 03 Jun 2006 07:39:16 +0000
Subject: [commit-cp] classpath/javax/net/ssl SSLContextSpi.java SSLC...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 07:39:18 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	ssl-nio-branch
Changes by:	Casey Marshall <rsdio@savannah.gnu.org>	06/06/03 07:39:16

Modified files:
	javax/net/ssl  : SSLContextSpi.java SSLContext.java 
	                 HttpsURLConnection.java SSLSession.java 
	                 HandshakeCompletedEvent.java 
Added files:
	javax/net/ssl  : SSLEngine.java KeyStoreBuilderParameters.java 
	                 CertPathTrustManagerParameters.java 
	                 X509ExtendedKeyManager.java 
	                 SSLEngineResult.java 

Log message:
	2006-06-03  Casey Marshall  <csm@gnu.org>

	Update javax/net/ssl to support 1.5 API.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/net/ssl/SSLEngine.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/net/ssl/KeyStoreBuilderParameters.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/net/ssl/SSLContextSpi.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.2.2&tr2=1.1.2.2.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/net/ssl/SSLContext.java.diff?only_with_tag=ssl-nio-branch&tr1=1.2.2.4&tr2=1.2.2.4.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/net/ssl/HttpsURLConnection.java.diff?only_with_tag=ssl-nio-branch&tr1=1.2.2.4&tr2=1.2.2.4.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/net/ssl/CertPathTrustManagerParameters.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/net/ssl/SSLSession.java.diff?only_with_tag=ssl-nio-branch&tr1=1.2.2.3&tr2=1.2.2.3.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/net/ssl/X509ExtendedKeyManager.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/net/ssl/SSLEngineResult.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/net/ssl/HandshakeCompletedEvent.java.diff?only_with_tag=ssl-nio-branch&tr1=1.3.2.3&tr2=1.3.2.3.2.1&r1=text&r2=text



From MAILER-DAEMON Sat Jun 03 03:44:44 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmQoO-0006hS-DH
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 03:44:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmQoM-0006hN-Tz
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:44:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmQoM-0006hB-C8
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:44:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmQoM-0006h8-5q
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:44:42 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmQv0-0005HV-9h
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:51:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmQoL-0001ef-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 03:44:41 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FmQoL-0001ec-BJ
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 07:44:41 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmQoL-0001ec-BJ@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Sat, 03 Jun 2006 07:44:41 +0000
Subject: [commit-cp] classpath/jessie-tests run-tests.sh testAlert.j...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 07:44:43 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	ssl-nio-branch
Changes by:	Casey Marshall <rsdio@savannah.gnu.org>	06/06/03 07:44:41

Added files:
	jessie-tests   : run-tests.sh testAlert.java 
	                 testCertificate.java 
	                 testCertificateRequest.java 
	                 testCipherSuiteList.java testClientHello.java 
	                 testCompressionMethodList.java 
	                 testHelloRequest.java testRecord.java 
	                 testServerDHParams.java testServerHello.java 
	                 testServerKeyExchange.java 
	                 testServerRSAParams.java testSignature.java 

Log message:
	Add test files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/run-tests.sh?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/testAlert.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/testCertificate.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/testCertificateRequest.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/testCipherSuiteList.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/testClientHello.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/testCompressionMethodList.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/testHelloRequest.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/testRecord.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/testServerDHParams.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/testServerHello.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/testServerKeyExchange.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/testServerRSAParams.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/jessie-tests/testSignature.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1



From MAILER-DAEMON Sat Jun 03 03:46:47 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmQqN-0007Cn-RN
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 03:46:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmQqM-0007Cg-C6
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:46:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmQqL-0007Bp-74
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:46:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmQqL-0007Bb-2l
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:46:45 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmQwz-0005Pj-7h
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:53:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmQqK-0001gu-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 03:46:44 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FmQqK-0001gr-87
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 07:46:44 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmQqK-0001gr-87@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Sat, 03 Jun 2006 07:46:44 +0000
Subject: [commit-cp] classpath/gnu/javax/net/ssl SessionStoreExcepti...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 07:46:46 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	ssl-nio-branch
Changes by:	Casey Marshall <rsdio@savannah.gnu.org>	06/06/03 07:46:44

Added files:
	gnu/javax/net/ssl: SessionStoreException.java Session.java 
	                   SessionStore.java SSLRecordHandler.java 
	                   SSLProtocolVersion.java SSLCipherSuite.java 

Log message:
	2006-06-03  Casey Marshall  <csm@gnu.org>

	New files for public GNU extension API.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/SessionStoreException.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/Session.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/SessionStore.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/SSLRecordHandler.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/SSLProtocolVersion.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/SSLCipherSuite.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1



From MAILER-DAEMON Sat Jun 03 03:49:57 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmQtR-0008QQ-Lj
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 03:49:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmQtP-0008Pg-HN
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:49:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmQtO-0008PS-HL
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:49:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmQtO-0008PO-BV
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:49:54 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmR02-0005aB-DA
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:56:46 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmQtN-0001il-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 03:49:53 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FmQtN-0001ii-Aq
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 07:49:53 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmQtN-0001ii-Aq@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Sat, 03 Jun 2006 07:49:53 +0000
Subject: [commit-cp] classpath/gnu/javax/net/ssl/provider Certificat...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 07:49:55 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	ssl-nio-branch
Changes by:	Casey Marshall <rsdio@savannah.gnu.org>	06/06/03 07:49:53

Modified files:
	gnu/javax/net/ssl/provider: CertificateVerify.java Finished.java 
	                            ClientKeyExchange.java 
	                            ServerKeyExchange.java 
	                            CompressionMethod.java 
	                            Certificate.java Constructed.java 
	                            Random.java Signature.java 
	                            CertificateRequest.java 
	                            Handshake.java CipherSuite.java 
	                            ContentType.java Alert.java 
	                            Util.java ProtocolVersion.java 
	                            ServerHello.java Extension.java 
	                            ClientHello.java AlertException.java 
	                            CertificateType.java 
Added files:
	gnu/javax/net/ssl/provider: ServerDHParams.java 
	                            SSLv3BlockCipherSuiteImpl.java 
	                            ServerHandshake.java 
	                            ServerKeyExchangeParams.java 
	                            CipherAlgorithm.java 
	                            GenericBlockCipher.java 
	                            AbstractHandshake.java 
	                            ServerHelloDone.java 
	                            HelloRequest.java 
	                            X500PrincipalList.java 
	                            ClientHelloV2.java 
	                            ServerRSAParams.java 
	                            SessionImpl.java 
	                            ClientDiffieHellmanPublic.java 
	                            MacAlgorithm.java 
	                            SignatureAlgorithm.java 
	                            CompressionMethodList.java 
	                            SSLEngineImpl.java 
	                            CipheredStruct.java Record.java 
	                            ExchangeKeys.java 
	                            EncryptedPreMasterSecret.java 
	                            GenericStreamCipher.java 
	                            InputSecurityParameters.java 
	                            OutputSecurityParameters.java 
	                            CipherSuiteList.java 
	                            ClientCertificateTypeList.java 
	                            KeyExchangeAlgorithm.java 

Log message:
	Added new objects; updated others to use NIO classes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/CertificateVerify.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/Finished.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ServerDHParams.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/SSLv3BlockCipherSuiteImpl.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ServerHandshake.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ServerKeyExchangeParams.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ClientKeyExchange.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/CipherAlgorithm.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/GenericBlockCipher.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ServerKeyExchange.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/CompressionMethod.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/AbstractHandshake.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ServerHelloDone.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/HelloRequest.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/X500PrincipalList.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/Certificate.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/Constructed.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ClientHelloV2.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/Random.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ServerRSAParams.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/SessionImpl.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/Signature.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/MacAlgorithm.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/SignatureAlgorithm.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/CertificateRequest.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/Handshake.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/CompressionMethodList.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/CipherSuite.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/SSLEngineImpl.java?only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/CipheredStruct.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ContentType.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/Record.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ExchangeKeys.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/Alert.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/Util.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ProtocolVersion.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/GenericStreamCipher.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/InputSecurityParameters.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/CipherSuiteList.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ClientCertificateTypeList.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/KeyExchangeAlgorithm.java?only_with_tag=ssl-nio-branch&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ServerHello.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/Extension.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/ClientHello.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/AlertException.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/gnu/javax/net/ssl/provider/CertificateType.java.diff?only_with_tag=ssl-nio-branch&tr1=1.1.4.1&tr2=1.1.4.1.2.1&r1=text&r2=text



From MAILER-DAEMON Sat Jun 03 03:52:00 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmQvQ-0000jZ-3T
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 03:52:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmQvO-0000iv-Fi
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:51:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmQvN-0000ih-U9
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:51:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmQvN-0000ie-PH
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:51:57 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmR21-0005n0-UA
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 03:58:50 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmQvN-0001kM-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 03:51:57 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FmQvM-0001kJ-TO
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 07:51:57 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmQvM-0001kJ-TO@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Sat, 03 Jun 2006 07:51:56 +0000
Subject: [commit-cp] classpath ./.classpath .externalToolBuilders/Au...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 07:51:58 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	ssl-nio-branch
Changes by:	Casey Marshall <rsdio@savannah.gnu.org>	06/06/03 07:51:56

Modified files:
	.              : .classpath 
	.externalToolBuilders: Autogen.launch ClasspathHeaders.launch 
	                       ClasspathJar.launch Configure.launch 

Log message:
	Updating Eclipse configuration to install classpath in `install-root,' not `install.'
	Also, omit obsolete Jessie files from the build for now.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/.classpath.diff?only_with_tag=ssl-nio-branch&tr1=1.1.2.6&tr2=1.1.2.6.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/.externalToolBuilders/Autogen.launch.diff?only_with_tag=ssl-nio-branch&tr1=1.1.2.2&tr2=1.1.2.2.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/.externalToolBuilders/ClasspathHeaders.launch.diff?only_with_tag=ssl-nio-branch&tr1=1.1.2.1&tr2=1.1.2.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/.externalToolBuilders/ClasspathJar.launch.diff?only_with_tag=ssl-nio-branch&tr1=1.1.2.1&tr2=1.1.2.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/.externalToolBuilders/Configure.launch.diff?only_with_tag=ssl-nio-branch&tr1=1.1.2.4&tr2=1.1.2.4.2.1&r1=text&r2=text



From MAILER-DAEMON Sat Jun 03 11:18:33 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmXtZ-0005AX-Bo
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 11:18:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmXtX-00059q-Nw
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 11:18:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmXtW-00059e-97
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 11:18:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmXtW-00059b-76
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 11:18:30 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmY0E-0004XW-Ss
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 11:25:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmXtV-000841-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 11:18:29 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FmXtV-00083y-84
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 15:18:29 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmXtV-00083y-84@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Sat, 03 Jun 2006 15:18:29 +0000
Subject: [commit-cp] classpath javax/swing/text/PlainView.java ./Cha...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 15:18:31 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch: 	
Changes by:	Roman Kennke <rabbit78@savannah.gnu.org>	06/06/03 15:18:29

Modified files:
	javax/swing/text: PlainView.java 
	.              : ChangeLog 

Log message:
	2006-06-03  Roman Kennke  <kennke@aicas.com>
	
	* javax/swing/text/PlainView.java
	(updateDamage): Check for valid longestLine and initialize if
	necessary.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/javax/swing/text/PlainView.java.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.7638&tr2=1.7639&r1=text&r2=text



From MAILER-DAEMON Sat Jun 03 12:02:12 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmYZn-0003cl-Rt
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 12:02:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmYZm-0003bq-5z
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:02:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmYZl-0003bU-Bi
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:02:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmYZk-0003bP-VG
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:02:09 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmYgT-0007aK-Nf
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:09:05 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmYZk-0001Z8-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 12:02:08 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FmYZj-0001Z5-Rb
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 16:02:08 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmYZj-0001Z5-Rb@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sat, 03 Jun 2006 16:02:07 +0000
Subject: [commit-cp] classpath ChangeLog [generics]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 16:02:10 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/03 16:02:06

Modified files:
	.              : ChangeLog 

Log message:
	2006-06-03  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/ProcessBuilder.java:
		Documented.
		(environment): Create as a copy.
		* java/lang/System.java:
		(EnvironmentMap.EnvironmentMap(Map<String,String>)):
		New constructor.
		(EnvironmentMap.put(String,String)): Override superclass
		method with checks for nulls and non-Strings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics&r1=1.2386.2.259&r2=1.2386.2.260

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.259
retrieving revision 1.2386.2.260
diff -u -b -r1.2386.2.259 -r1.2386.2.260
--- ChangeLog	29 May 2006 16:19:43 -0000	1.2386.2.259
+++ ChangeLog	3 Jun 2006 16:02:04 -0000	1.2386.2.260
@@ -1,3 +1,14 @@
+2006-06-03  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/lang/ProcessBuilder.java:
+	Documented.
+	(environment): Create as a copy.
+	* java/lang/System.java:
+	(EnvironmentMap.EnvironmentMap(Map<String,String>)):
+	New constructor.
+	(EnvironmentMap.put(String,String)): Override superclass
+	method with checks for nulls and non-Strings.
+	
 2006-05-29  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	* gnu/java/awt/peer/gtk/GdkGraphics2D.java (copying constructor):



From MAILER-DAEMON Sat Jun 03 12:02:16 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmYZs-0003dw-CT
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 12:02:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmYZo-0003dN-Hb
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:02:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmYZn-0003ce-LU
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:02:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmYZn-0003cN-6B
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:02:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmYgV-0007aV-LG
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:09:08 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmYZm-0001ZI-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 12:02:10 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FmYZl-0001ZF-Uf
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 16:02:10 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmYZl-0001ZF-Uf@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sat, 03 Jun 2006 16:02:09 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/ProcessBuilder.ja...
	[generics]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 16:02:13 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/03 16:02:08

Modified files:
	.              : ChangeLog 
	java/lang      : ProcessBuilder.java System.java 

Log message:
	2006-06-03  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/ProcessBuilder.java:
		Documented.
		(environment): Create as a copy.
		* java/lang/System.java:
		(EnvironmentMap.EnvironmentMap(Map<String,String>)):
		New constructor.
		(EnvironmentMap.put(String,String)): Override superclass
		method with checks for nulls and non-Strings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics&r1=1.2386.2.259&r2=1.2386.2.260
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/ProcessBuilder.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/System.java?cvsroot=classpath&only_with_tag=generics&r1=1.38.2.18&r2=1.38.2.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.259
retrieving revision 1.2386.2.260
diff -u -b -r1.2386.2.259 -r1.2386.2.260
--- ChangeLog	29 May 2006 16:19:43 -0000	1.2386.2.259
+++ ChangeLog	3 Jun 2006 16:02:04 -0000	1.2386.2.260
@@ -1,3 +1,14 @@
+2006-06-03  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/lang/ProcessBuilder.java:
+	Documented.
+	(environment): Create as a copy.
+	* java/lang/System.java:
+	(EnvironmentMap.EnvironmentMap(Map<String,String>)):
+	New constructor.
+	(EnvironmentMap.put(String,String)): Override superclass
+	method with checks for nulls and non-Strings.
+	
 2006-05-29  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	* gnu/java/awt/peer/gtk/GdkGraphics2D.java (copying constructor):

Index: java/lang/ProcessBuilder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Attic/ProcessBuilder.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- java/lang/ProcessBuilder.java	26 Mar 2006 23:47:30 -0000	1.1.2.3
+++ java/lang/ProcessBuilder.java	3 Jun 2006 16:02:08 -0000	1.1.2.4
@@ -40,72 +40,293 @@
 
 import java.io.File;
 import java.io.IOException;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * <p>
+ * This class is used to construct new operating system processes.
+ * A <code>ProcessBuilder</code> instance basically represent a
+ * template for a new process.  Actual processes are generated from
+ * this template via use of the <code>start()</code> method, which
+ * may be invoked multiple times, with each invocation spawning a
+ * new process with the current attributes of the
+ * <code>ProcessBuilder</code> object.  Each spawned process is
+ * independent of the <code>ProcessBuilder</code> object, and is
+ * unaffected by changes in its attributes.
+ * </p>
+ * <p>
+ * The following attributes define a process:
+ * </p>
+ * <ul>
+ * <li>The <emphasis>working directory</emphasis>; the activities of a
+ * process begin with the current directory set to this.  By default,
+ * this is the working directory of the current process, as defined
+ * by the <code>user.dir</code> property.</li>
+ * <li>The <emphasis>command</emphasis> which invokes the process.  This
+ * usually consists of the name of the program binary followed by an
+ * arbitrary number of arguments.  For example, <code>find -type f</code>
+ * invokes the <code>find</code> binary with the arguments "-type" and "f".
+ * The command is provided a list, the elements of which are defined in a
+ * system dependent manner; the layout is affected by expected operating
+ * system conventions.  A common method is to split the command on each
+ * space within the string.  Thus, <code>find -type f</code> forms a
+ * three element list.  However, in some cases, the expectation is that
+ * this split is performed by the program itself; thus, the list consists
+ * of only two elements (the program name and its arguments).</li>
+ * <li>The <emphasis>environment map</emphasis>, which links environment
+ * variables to their corresponding values.  The initial contents of the map
+ * are the current environment values i.e. it contains the contents of the
+ * map returned by <code>System.getenv()</code>.</li>
+ * <li>The <emphasis>redirection flag</emphasis>, which specifies whether
+ * or not the contents of the error stream should be redirected to standard
+ * output.  By default, this is false, and there are two output streams, one
+ * for normal data ({@link Process#getOutputStream()}) and one for error data
+ * ({@link Process#getErrorStream()}).  When set to true, the two are merged,
+ * which simplifies the interleaving of the two streams.  Data is read using
+ * the stream returned by {@link Process#getOutputStream()}, and the
+ * stream returned by {@link Process#getErrorStream()} throws an immediate
+ * end-of-file exception.</li>
+ * </ul>
+ * <p>
+ * All checks on attribute validity are delayed until <code>start()</code>
+ * is called. <code>ProcessBuilder</code> objects are <strong>not
+ * synchronized</strong>; the user must provide external synchronization
+ * where multiple threads may interact with the same
+ * <code>ProcessBuilder</code> object.
+ * </p>
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @see Process
+ * @see System#getenv()
+ * @since 1.5
+ */
 public final class ProcessBuilder
 {
+
+  /**
+   * The working directory of the process.
+   */
   private File directory = new File(System.getProperty("user.dir"));
+
+  /**
+   * The command line syntax for invoking the process.
+   */
   private List<String> command;
-  // FIXME: make a copy.
-  private Map<String, String> environment = System.getenv();
+
+  /**
+   * The mapping of environment variables to values.
+   */
+  private Map<String, String> environment =
+    new System.EnvironmentMap(System.getenv());
+
+  /**
+   * A flag indicating whether to redirect the error stream to standard
+   * output.
+   */
   private boolean redirect = false;
 
+  /**
+   * Constructs a new <code>ProcessBuilder</code> with the specified
+   * command being used to invoke the process.  The list is used directly;
+   * external changes are reflected in the <code>ProcessBuilder</code>.
+   *
+   * @param command the name of the program followed by its arguments.
+   */
   public ProcessBuilder(List<String> command)
   {
     this.command = command;
   }
 
+  /**
+   * Constructs a new <code>ProcessBuilder</code> with the specified
+   * command being used to invoke the process.  This constructor
+   * simplifies creating a new <code>ProcessBuilder</code> by
+   * converting the provided series of constructor arguments into a
+   * list of command-line arguments.
+   *
+   * @param command the name of the program followed by its arguments.
+   */
   public ProcessBuilder(String... command)
   {
     this.command = Arrays.asList(command);
   }
 
+  /**
+   * Returns the current command line, used to invoke the process.
+   * The return value is simply a reference to the list of command
+   * line arguments used by the <code>ProcessBuilder</code> object;
+   * any changes made to it will be reflected in the operation of
+   * the <code>ProcessBuilder</code>.
+   *
+   * @return the list of command-line arguments.
+   */
   public List<String> command()
   {
     return command;
   }
 
+  /**
+   * Sets the command-line arguments to those specified.  The list is
+   * used directly; external changes are reflected in the
+   * <code>ProcessBuilder</code>.
+   *
+   * @param command the name of the program followed by its arguments.
+   * @return a reference to this process builder.
+   */
   public ProcessBuilder command(List<String> command)
   {
     this.command = command;
     return this;
   }
 
+  /**
+   * Sets the command-line arguments to those specified.
+   * This simplifies modifying the arguments by converting
+   * the provided series of constructor arguments into a
+   * list of command-line arguments.
+   *
+   * @param command the name of the program followed by its arguments.
+   * @return a reference to this process builder.
+   */
   public ProcessBuilder command(String... command)
   {
     this.command = Arrays.asList(command);
     return this;
   }
 
+  /**
+   * Returns the working directory of the process.  The
+   * returned value may be <code>null</code>; this
+   * indicates that the default behaviour of using the
+   * working directory of the current process should
+   * be adopted.
+   * 
+   * @return the working directory.
+   */
   public File directory()
   {
     return directory;
   }
 
+  /**
+   * Sets the working directory to that specified.
+   * The supplied argument may be <code>null</code>,
+   * which indicates the default value should be used.
+   * The default is the working directory of the current
+   * process.
+   * 
+   * @param directory the new working directory.
+   * @return a reference to this process builder.
+   */
   public ProcessBuilder directory(File directory)
   {
     this.directory = directory;
     return this;
   }
 
+  /**
+   * <p>
+   * Returns the system environment variables of the process.
+   * If the underlying system does not support environment variables,
+   * an empty map is returned.
+   * </p>
+   * <p>
+   * The returned map does not accept queries using
+   * null keys or values, or those of a type other than
+   * <code>String</code>.  Attempts to pass in a null value will
+   * throw a <code>NullPointerException</code>.  Types other than
+   * <code>String</code> throw a <code>ClassCastException</code>.
+   * </p>
+   * <p>
+   * As the returned map is generated using data from the underlying
+   * platform, it may not comply with the <code>equals()</code>
+   * and <code>hashCode()</code> contracts.  It is also likely that
+   * the keys of this map will be case-sensitive.
+   * </p>
+   * <p>
+   * Modification of the map is reliant on the underlying platform;
+   * some may not allow any changes to the environment variables or
+   * may prevent certain values being used.  Attempts to do so will
+   * throw an <code>UnsupportedOperationException</code> or
+   * <code>IllegalArgumentException</code>, respectively. 
+   * </p>
+   * <p>
+   * Use of this method may require a security check for the
+   * RuntimePermission "getenv.*".
+   * </p>
+   *
+   * @return a map of the system environment variables for the process.
+   * @throws SecurityException if the checkPermission method of
+   *         an installed security manager prevents access to
+   *         the system environment variables.
+   * @since 1.5
+   */
   public Map<String, String> environment()
   {
     return environment;
   }
 
+  /**
+   * Returns true if the output stream and error stream of the
+   * process will be merged to form one composite stream.  The
+   * default return value is <code>false</code>.
+   *
+   * @return true if the output stream and error stream are to
+   *         be merged.
+   */
   public boolean redirectErrorStream()
   {
     return redirect;
   }
 
+  /**
+   * Sets the error stream redirection flag.  If set, the output
+   * and error streams are merged to form one composite stream.
+   *
+   * @param redirect the new value of the redirection flag.
+   * @return a reference to this process builder.
+   */
   public ProcessBuilder redirectErrorStream(boolean redirect)
   {
     this.redirect = redirect;
     return this;
   }
 
+  /**
+   * <p>
+   * Starts execution of a new process, based on the attributes of
+   * this <code>ProcessBuilder</code> object.  This is the point
+   * at which the command-line arguments are checked.  The list
+   * must be non-empty and contain only non-null string objects.
+   * The other attributes have default values which are used in
+   * cases where their values are not explicitly specified.
+   * </p>
+   * <p>
+   * If a security manager is in place, then the
+   * {@link SecurityManager#checkExec()} method is called to
+   * ensure that permission is given to execute the process.
+   * </p>
+   * <p>
+   * The execution of the process is system-dependent.  Various
+   * exceptions may result, due to problems at the operating system
+   * level.  These are all returned as a form of {@link IOException}.
+   * </p>
+   *
+   * @return a <code>Process</code> object, representing the spawned
+   *         subprocess.
+   * @throws IOException if a problem occurs with executing the process
+   *                     at the operating system level.
+   * @throws IndexOutOfBoundsException if the command to execute is
+   *                                   actually an empty list.
+   * @throws NullPointerException if the command to execute is null
+   *                              or the list contains null elements.
+   * @throws SecurityException if a security manager exists and prevents
+   *                           execution of the subprocess.
+   */
   public Process start() throws IOException
   {
     SecurityManager sm = SecurityManager.current; // Be thread-safe!

Index: java/lang/System.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/System.java,v
retrieving revision 1.38.2.18
retrieving revision 1.38.2.19
diff -u -b -r1.38.2.18 -r1.38.2.19
--- java/lang/System.java	20 May 2006 22:55:04 -0000	1.38.2.18
+++ java/lang/System.java	3 Jun 2006 16:02:08 -0000	1.38.2.19
@@ -847,7 +847,7 @@
    *
    * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
    */
-  private static class EnvironmentMap
+  static class EnvironmentMap
     extends HashMap<String,String>
   {
     
@@ -875,6 +875,19 @@
     }
     
     /**
+     * Constructs a new <code>EnvironmentMap</code> containing
+     * the contents of the specified map.
+     *
+     * @param m the map to be added to this.
+     * @throws NullPointerException if a key or value is null.
+     * @throws ClassCastException if a key or value is not a String.
+     */    
+    EnvironmentMap(Map<String,String> m)
+    {
+      super(m);
+    }
+
+    /**
      * Blocks queries containing a null key or one which is not
      * of type <code>String</code>.  All other queries
      * are forwarded to the superclass.
@@ -960,6 +973,31 @@
     }
     
     /**
+     * Associates the given key to the given value. If the
+     * map already contains the key, its value is replaced.
+     * The map does not accept null keys or values, or keys
+     * and values not of type {@link String}.
+     *
+     * @param key the key to map.
+     * @param value the value to be mapped.
+     * @return the previous value of the key, or null if there was no mapping
+     * @throws NullPointerException if a key or value is null.
+     * @throws ClassCastException if a key or value is not a String.
+     */
+    public String put(String key, String value)
+    {
+      if (key == null)
+	throw new NullPointerException("A new key is null.");
+      if (value == null)
+	throw new NullPointerException("A new value is null.");
+      if (!(key instanceof String))
+	throw new ClassCastException("A new key is not a String.");
+      if (!(value instanceof String))
+	throw new ClassCastException("A new value is not a String.");
+      return super.put(key, value);
+    }
+
+    /**
      * Removes a key-value pair from the map.  The queried key may not
      * be null or of a type other than a <code>String</code>.
      *



From MAILER-DAEMON Sat Jun 03 12:08:03 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmYfT-0006fC-Aa
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 12:08:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmYfQ-0006eY-Tw
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:08:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmYfQ-0006e2-8v
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:08:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmYfQ-0006dz-6Q
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:08:00 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmYm9-0007y8-6G
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:14:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmYfO-0001dJ-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 12:07:58 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FmYfO-0001dG-AM
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 16:07:58 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmYfO-0001dG-AM@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Sat, 03 Jun 2006 16:07:58 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/basic BasicTextUI.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 16:08:01 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/03 16:07:58

Modified files:
	javax/swing/plaf/basic: BasicTextUI.java 

Log message:
	2006-06-03  Roman Kennke  <kennke@aicas.com>
	
		PR 27418
		* javax/swing/plaf/basic/BasicTextUI.java
		(damageRange): Added null check to avoid NPE.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTextUI.java?cvsroot=classpath&r1=1.83&r2=1.84

Patches:
Index: BasicTextUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTextUI.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- BasicTextUI.java	16 May 2006 18:57:33 -0000	1.83
+++ BasicTextUI.java	3 Jun 2006 16:07:58 -0000	1.84
@@ -1039,7 +1039,12 @@
 
         Rectangle l1 = modelToView(t, p0, firstBias);
         Rectangle l2 = modelToView(t, p1, secondBias);
-        if (l1.y == l2.y)
+        if (l1 == null || l2 == null)
+          {
+            // Unable to determine the start or end of the selection.
+            t.repaint();
+          }
+        else if (l1.y == l2.y)
           {
             SwingUtilities.computeUnion(l2.x, l2.y, l2.width, l2.height, l1);
             t.repaint(l1);



From MAILER-DAEMON Sat Jun 03 12:08:03 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmYfT-0006fF-Eo
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 12:08:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmYfR-0006el-6V
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:08:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmYfQ-0006eF-Ne
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:08:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmYfQ-0006eB-Fb
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:08:00 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmYm9-0007yA-Df
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 12:14:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmYfP-0001dS-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 12:07:59 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FmYfP-0001dO-1y
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 16:07:59 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmYfP-0001dO-1y@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Sat, 03 Jun 2006 16:07:59 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/basic BasicTextUI.ja...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 16:08:01 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/03 16:07:58

Modified files:
	javax/swing/plaf/basic: BasicTextUI.java 
	.              : ChangeLog 

Log message:
	2006-06-03  Roman Kennke  <kennke@aicas.com>
	
		PR 27418
		* javax/swing/plaf/basic/BasicTextUI.java
		(damageRange): Added null check to avoid NPE.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTextUI.java?cvsroot=classpath&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7639&r2=1.7640

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7639
retrieving revision 1.7640
diff -u -b -r1.7639 -r1.7640
--- ChangeLog	3 Jun 2006 15:18:28 -0000	1.7639
+++ ChangeLog	3 Jun 2006 16:07:58 -0000	1.7640
@@ -1,5 +1,11 @@
 2006-06-03  Roman Kennke  <kennke@aicas.com>
 
+	PR 27418
+	* javax/swing/plaf/basic/BasicTextUI.java
+	(damageRange): Added null check to avoid NPE.
+
+2006-06-03  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/text/PlainView.java
 	(updateDamage): Check for valid longestLine and initialize if
 	necessary.



From MAILER-DAEMON Sat Jun 03 15:52:56 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmcB6-0002CI-4K
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 15:52:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmcB4-0002CD-GF
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 15:52:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmcB3-0002Bb-8y
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 15:52:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmcB3-0002BW-4l
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 15:52:53 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmcHo-0006D2-6s
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 15:59:52 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmcB2-0000cj-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 15:52:52 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FmcB2-0000cg-7N
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 19:52:52 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmcB2-0000cg-7N@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Sat, 03 Jun 2006 19:52:52 +0000
Subject: [commit-cp] classpath gnu/javax/net/ssl/providerServerHello... [ssl]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 19:52:55 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl
Changes by:	Casey Marshall <rsdio>	06/06/03 19:52:52

Modified files:
	gnu/javax/net/ssl/provider: ServerHelloDone.java 
	jessie-tests   : run-tests.sh 
Added files:
	.              : ChangeLog-ssl-nio 
	jessie-tests   : testServerHelloDone.java 

Log message:
	2006-06-03  C. Scott Marshall  <csm@gnu.org>
	
		* gnu/javax/net/ssl/provider/ServerHelloDone.java: made public.
		* jessie-tests/run-tests.sh: add `testServerHelloDone.'
		* jessie-tests/testServerHelloDone.java: new test.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerHelloDone.java?cvsroot=classpath&only_with_tag=ssl&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/jessie-tests/run-tests.sh?cvsroot=classpath&only_with_tag=ssl&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/jessie-tests/testServerHelloDone.java?cvsroot=classpath&only_with_tag=ssl&rev=1.1.2.1

Patches:
Index: gnu/javax/net/ssl/provider/ServerHelloDone.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/Attic/ServerHelloDone.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -b -r1.1.4.1 -r1.1.4.2
--- gnu/javax/net/ssl/provider/ServerHelloDone.java	3 Jun 2006 07:49:53 -0000	1.1.4.1
+++ gnu/javax/net/ssl/provider/ServerHelloDone.java	3 Jun 2006 19:52:51 -0000	1.1.4.2
@@ -44,9 +44,9 @@
  *
  * <pre>struct { } ServerHelloDone;</pre>
  */
-class ServerHelloDone implements Handshake.Body
+public class ServerHelloDone implements Handshake.Body
 {
-  ServerHelloDone () { }
+  public ServerHelloDone () { }
 
   public int length ()
   {

Index: jessie-tests/run-tests.sh
===================================================================
RCS file: /cvsroot/classpath/classpath/jessie-tests/Attic/run-tests.sh,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -b -r1.1.4.1 -r1.1.4.2
--- jessie-tests/run-tests.sh	3 Jun 2006 07:44:41 -0000	1.1.4.1
+++ jessie-tests/run-tests.sh	3 Jun 2006 19:52:52 -0000	1.1.4.2
@@ -8,8 +8,8 @@
 tests="testAlert testCertificate testCertificateRequest \
        testCipherSuiteList testClientHello testCompressionMethodList \
        testHelloRequest testRecord testServerDHParams \
-       testServerHello testServerKeyExchange testServerRSAParams \
-       testSignature"
+       testServerHello testServerHelloDone testServerKeyExchange \
+       testServerRSAParams testSignature"
 
 rm -rf test-classes
 mkdir test-classes

Index: ChangeLog-ssl-nio
===================================================================
RCS file: ChangeLog-ssl-nio
diff -N ChangeLog-ssl-nio
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ChangeLog-ssl-nio	3 Jun 2006 19:52:51 -0000	1.1.2.1
@@ -0,0 +1,6 @@
+2006-06-03  C. Scott Marshall  <csm@gnu.org>
+
+	* gnu/javax/net/ssl/provider/ServerHelloDone.java: made public.
+	* jessie-tests/run-tests.sh: add `testServerHelloDone.'
+	* jessie-tests/testServerHelloDone.java: new test.
+

Index: jessie-tests/testServerHelloDone.java
===================================================================
RCS file: jessie-tests/testServerHelloDone.java
diff -N jessie-tests/testServerHelloDone.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ jessie-tests/testServerHelloDone.java	3 Jun 2006 19:52:52 -0000	1.1.2.1
@@ -0,0 +1,35 @@
+import gnu.javax.net.ssl.provider.Handshake;
+import gnu.javax.net.ssl.provider.ServerHelloDone;
+
+import java.nio.ByteBuffer;
+
+class testServerHelloDone
+{
+  public static void main (String[] argv)
+  {
+    try
+      {
+        check ();
+      }
+    catch (Exception x)
+      {
+        System.out.println ("FAIL: caught exception " + x);
+        x.printStackTrace ();
+      }
+  }
+  
+  static void check () throws Exception
+  {
+    ByteBuffer buffer = ByteBuffer.allocate (4);
+    Handshake handshake = new Handshake (buffer);
+    handshake.setType (Handshake.Type.SERVER_HELLO_DONE);
+    handshake.setLength (0);
+    
+    // Should not throw ClassCastException
+    ServerHelloDone done = (ServerHelloDone) handshake.body ();
+    
+    System.out.println ("PASS: body()");
+    
+    System.err.println (handshake);
+  }
+}
\ No newline at end of file



From MAILER-DAEMON Sat Jun 03 17:54:49 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fme53-0002dn-GB
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 17:54:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fme51-0002dP-GA
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 17:54:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fme50-0002cx-EB
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 17:54:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fme50-0002cu-8w
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 17:54:46 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmeBm-0006O2-Gc
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 18:01:46 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fme4z-0004hN-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 17:54:45 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fme4x-0004hG-2N
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 21:54:44 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fme4x-0004hG-2N@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sat, 03 Jun 2006 21:54:43 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/annotation/Incomp...
	[generics]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 21:54:47 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/03 21:54:40

Modified files:
	.              : ChangeLog 
	java/lang/annotation: IncompleteAnnotationException.java 

Log message:
	2006-06-03  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/annotation/IncompleteAnnotationException.java:
		Documented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics&r1=1.2386.2.260&r2=1.2386.2.261
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/annotation/IncompleteAnnotationException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.2&r2=1.1.2.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.260
retrieving revision 1.2386.2.261
diff -u -b -r1.2386.2.260 -r1.2386.2.261
--- ChangeLog	3 Jun 2006 16:02:04 -0000	1.2386.2.260
+++ ChangeLog	3 Jun 2006 21:54:29 -0000	1.2386.2.261
@@ -1,5 +1,10 @@
 2006-06-03  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
+	* java/lang/annotation/IncompleteAnnotationException.java:
+	Documented.
+
+2006-06-03  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
 	* java/lang/ProcessBuilder.java:
 	Documented.
 	(environment): Create as a copy.

Index: java/lang/annotation/IncompleteAnnotationException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/annotation/Attic/IncompleteAnnotationException.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- java/lang/annotation/IncompleteAnnotationException.java	21 Sep 2005 21:32:39 -0000	1.1.2.2
+++ java/lang/annotation/IncompleteAnnotationException.java	3 Jun 2006 21:54:40 -0000	1.1.2.3
@@ -38,10 +38,26 @@
 package java.lang.annotation;
 
 /**
+ * Thrown when accessing an element within an annotation which
+ * was added since compilation or serialization took place, and
+ * does not have a default value.  
+ * 
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
  */
 public class IncompleteAnnotationException extends RuntimeException
 {
+
+  /**
+   * Constructs a new <code>IncompleteAnnotationException</code>
+   * which indicates that the element, <code>name</code>, was missing
+   * from the annotation, <code>type</code> at compile time and does
+   * not have a default value.
+   *
+   * @param type the type of annotation from which an element is missing.
+   * @param name the name of the missing element.
+   */
   public IncompleteAnnotationException(Class<? extends Annotation> type,
 				       String name)
   {
@@ -49,17 +65,43 @@
     this.elementName = name;
   }
 
+  /**
+   * Returns the class representing the type of annotation
+   * from which an element was missing.
+   *
+   * @return the type of annotation.
+   */
   public Class<? extends Annotation> annotationType()
   {
     return annotationType;
   }
 
+  /**
+   * Returns the name of the missing annotation element.
+   *
+   * @return the element name.
+   */
   public String elementName()
   {
     return elementName;
   }
 
   // Names are chosen from serialization spec.
+
+  /**
+   * The class representing the type of annotation from
+   * which an element was found to be missing.
+   *
+   * @serial the type of the annotation from which an
+   *         element was missing.
+   */
   private Class<? extends Annotation> annotationType;
+
+  /**
+   * The name of the missing element.
+   *
+   * @serial the name of the missing element. 
+   */
   private String elementName;
+
 }



From MAILER-DAEMON Sat Jun 03 18:41:49 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmeoX-0001P7-Gx
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 18:41:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmeoV-0001Nb-AB
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 18:41:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmeoT-0001Ld-Bn
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 18:41:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmeoT-0001LW-7c
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 18:41:45 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmevF-000108-Nf
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 18:48:46 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmeoQ-0006TG-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 18:41:42 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FmeoP-0006TD-Ms
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 22:41:42 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmeoP-0006TD-Ms@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Sat, 03 Jun 2006 22:41:41 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Compo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 22:41:47 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/03 22:41:41

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: ComponentGraphics.java 
	                       GtkVolatileImage.java 
	include        : Makefile.am 
	                 gnu_java_awt_peer_gtk_ComponentGraphics.h 
	native/jni/gtk-peer: Makefile.am 
	                     gnu_java_awt_peer_gtk_ComponentGraphics.c 
	                     gtkpeer.h 
Added files:
	gnu/java/awt/peer/gtk: VolatileImageGraphics.java 
	include        : gnu_java_awt_peer_gtk_GtkVolatileImage.h 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_GtkVolatileImage.c 

Log message:
	2006-06-02  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
		* include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
		New files.
		* gnu/java/awt/peer/gtk/ComponentGraphics.java
		(drawImage): Overloads for VolatileImage drawing.
		(drawVolatile): New method.
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
		* include/gnu_java_awt_peer_gtk_ComponentGraphics.h
		(drawVolatile): New method.
		* gnu/java/awt/peer/gtk/GtkVolatileImage.java
		Unstub implementation.
		* include/Makefile.am
		* native/jni/gtk-peer/Makefile.am
		Add new files.
		* native/jni/gtk-peer/gtkpeer.h
		New prototype.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7640&r2=1.7641
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/include/Makefile.am?cvsroot=classpath&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/Makefile.am?cvsroot=classpath&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c?cvsroot=classpath&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gtkpeer.h?cvsroot=classpath&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7640
retrieving revision 1.7641
diff -u -b -r1.7640 -r1.7641
--- ChangeLog	3 Jun 2006 16:07:58 -0000	1.7640
+++ ChangeLog	3 Jun 2006 22:41:40 -0000	1.7641
@@ -1,3 +1,23 @@
+2006-06-02  Sven de Marothy  <sven@physto.se>
+
+	* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
+	* include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
+	New files.
+	* gnu/java/awt/peer/gtk/ComponentGraphics.java
+	(drawImage): Overloads for VolatileImage drawing.
+	(drawVolatile): New method.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
+	* include/gnu_java_awt_peer_gtk_ComponentGraphics.h
+	(drawVolatile): New method.
+	* gnu/java/awt/peer/gtk/GtkVolatileImage.java
+	Unstub implementation.
+	* include/Makefile.am
+	* native/jni/gtk-peer/Makefile.am
+	Add new files.
+	* native/jni/gtk-peer/gtkpeer.h
+	New prototype.
+	
 2006-06-03  Roman Kennke  <kennke@aicas.com>
 
 	PR 27418

Index: gnu/java/awt/peer/gtk/ComponentGraphics.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnu/java/awt/peer/gtk/ComponentGraphics.java	2 Jun 2006 22:57:31 -0000	1.7
+++ gnu/java/awt/peer/gtk/ComponentGraphics.java	3 Jun 2006 22:41:41 -0000	1.8
@@ -110,6 +110,10 @@
   private native void copyAreaNative(GtkComponentPeer component, int x, int y, 
 				     int width, int height, int dx, int dy);
 
+  private native void drawVolatile(GtkComponentPeer component,
+				   Image vimg, int x, int y, 
+				   int width, int height);
+
   /**
    * Returns a Graphics2D object for a component, either an instance of this 
    * class (if xrender is supported), or a context which copies.
@@ -183,4 +187,32 @@
     super.drawGlyphVector(gv, x, y);
     end_gdk_drawing();
   }
+  
+  public boolean drawImage(Image img, int x, int y, ImageObserver observer)
+  {
+    if( img instanceof GtkVolatileImage )
+      {
+	((GtkVolatileImage)img).validate( null );
+	drawVolatile( component, img, x, y-20 ,
+		      ((GtkVolatileImage)img).width, 
+		      ((GtkVolatileImage)img).height );
+	return true;
+      }      
+    return super.drawImage( img, x, y, observer );
+  }
+  
+  public boolean drawImage(Image img, int x, int y, int width, int height,
+                           ImageObserver observer)
+  {
+    if( img instanceof GtkVolatileImage )
+      {
+	((GtkVolatileImage)img).validate( null );
+	drawVolatile( component, img, x, y-20, 
+		      width, height );
+	return true;
+      }      
+    return super.drawImage( img, x, y, width, height, observer );
+  }
+
 }
+

Index: gnu/java/awt/peer/gtk/GtkVolatileImage.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/java/awt/peer/gtk/GtkVolatileImage.java	2 Jul 2005 20:32:12 -0000	1.3
+++ gnu/java/awt/peer/gtk/GtkVolatileImage.java	3 Jun 2006 22:41:41 -0000	1.4
@@ -1,4 +1,4 @@
-/* GtkVolatileImage.java -- a hardware-accelerated image buffer
+/* GtkVolatileImage.java -- wraps an X pixmap
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,6 +38,7 @@
 package gnu.java.awt.peer.gtk;
 
 import java.awt.ImageCapabilities;
+import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.GraphicsConfiguration;
 import java.awt.image.BufferedImage;
@@ -46,54 +47,96 @@
 
 public class GtkVolatileImage extends VolatileImage
 {
-  private int width;
-  private int height;
+  int width, height;
   private ImageCapabilities caps;
 
-  public GtkVolatileImage(int width, int height)
-  {
-    this(width, height, null);
-  }
+  /**
+   * Don't touch, accessed from native code.
+   */
+  private long nativePointer;
 
-  public GtkVolatileImage(int width, int height, ImageCapabilities caps)
+  /**
+   * Offscreen image we draw to.
+   */
+  CairoSurface offScreen;
+
+  private boolean needsUpdate = false;
+
+  native long init(GtkComponentPeer component, int width, int height);
+
+  native void destroy();
+
+  native int[] getPixels();
+  
+  native void update(GtkImage image);
+
+  public GtkVolatileImage(GtkComponentPeer component, 
+			  int width, int height, ImageCapabilities caps)
   {
     this.width = width;
     this.height = height;
     this.caps = caps;
+    nativePointer = init( component, width, height );
+    offScreen = new CairoSurface( width, height );
   }
 
-  // FIXME: should return a buffered image snapshot of the accelerated
-  // visual
-  public BufferedImage getSnapshot()
+  public GtkVolatileImage(int width, int height, ImageCapabilities caps)
   {
-    return null;
+    this(null, width, height, caps);
   }
 
-  public int getWidth()
+  public GtkVolatileImage(int width, int height)
   {
-    return width;
+    this(null, width, height, null);
   }
 
-  public int getHeight()
+  public void finalize()
   {
-    return height;
+    dispose();
+  }
+
+  public void dispose()
+  {
+    destroy();
+  }
+
+  void invalidate()
+  {
+    needsUpdate = true;
+  }
+
+  public BufferedImage getSnapshot()
+  {
+    CairoSurface cs = new CairoSurface( width, height );
+    cs.setPixels( getPixels() );
+    return CairoSurface.getBufferedImage( cs );
+  }
+
+  public Graphics getGraphics()
+  {
+    return createGraphics();
   }
 
-  // FIXME: should return a graphics wrapper around this image's
-  // visual
   public Graphics2D createGraphics()
   {
-    return null;
+    invalidate();
+    return offScreen.getGraphics();
   }
 
   public int validate(GraphicsConfiguration gc)
   {
+    if( needsUpdate )
+      {
+	update( offScreen.getSharedGtkImage() );
+	needsUpdate = false;
+	return VolatileImage.IMAGE_RESTORED;
+      }
     return VolatileImage.IMAGE_OK;
   }
 
   public boolean contentsLost()
   {
-    return false;
+    return needsUpdate;
   }
 
   public ImageCapabilities getCapabilities()
@@ -101,18 +144,28 @@
     return caps;
   }
 
-  public synchronized Object getProperty (String name, ImageObserver observer)
+  public int getWidth()
   {
-    return null;
+    return width;
   }
 
-  public synchronized int getWidth (ImageObserver observer)
+  public int getHeight()
+  {
+    return height;
+  }
+
+  public int getWidth(java.awt.image.ImageObserver observer)
   {
     return width;
   }
   
-  public synchronized int getHeight (ImageObserver observer)
+  public int getHeight(java.awt.image.ImageObserver observer)
   {
     return height;
   }
+
+  public Object getProperty(String name, ImageObserver observer)
+  {
+    return null;
+  }
 }

Index: include/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/include/Makefile.am,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- include/Makefile.am	30 May 2006 10:14:12 -0000	1.61
+++ include/Makefile.am	3 Jun 2006 22:41:41 -0000	1.62
@@ -74,6 +74,7 @@
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkToolkit.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h \
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
 
 QTPEER_H_FILES = \

Index: include/gnu_java_awt_peer_gtk_ComponentGraphics.h
===================================================================
RCS file: /sources/classpath/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- include/gnu_java_awt_peer_gtk_ComponentGraphics.h	30 May 2006 19:16:56 -0000	1.2
+++ include/gnu_java_awt_peer_gtk_ComponentGraphics.h	3 Jun 2006 22:41:41 -0000	1.3
@@ -15,6 +15,7 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing (JNIEnv *env, jobject);
 JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender (JNIEnv *env, jclass);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative (JNIEnv *env, jobject, jobject, jint, jint, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile (JNIEnv *env, jobject, jobject, jobject, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }

Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- native/jni/gtk-peer/Makefile.am	2 Jun 2006 20:47:05 -0000	1.42
+++ native/jni/gtk-peer/Makefile.am	3 Jun 2006 22:41:41 -0000	1.43
@@ -39,6 +39,7 @@
 			gnu_java_awt_peer_gtk_GtkTextFieldPeer.c \
 			gnu_java_awt_peer_gtk_GtkToolkit.c \
 			gnu_java_awt_peer_gtk_GtkWindowPeer.c \
+			gnu_java_awt_peer_gtk_GtkVolatileImage.c \
 			cairographics2d.h \
 			gthread-jni.c \
 			gdkfont.h \

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	2 Jun 2006 18:29:14 -0000	1.9
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	3 Jun 2006 22:41:41 -0000	1.10
@@ -94,8 +94,6 @@
 
   *draw = *win;
   gdk_window_get_internal_paint_info (*win, draw, 0, 0); 
-  /*  g_object_ref (*draw); */
-  /* FIXME: Unref this. */
 }
 
 /**
@@ -211,3 +209,38 @@
   gdk_threads_leave();
 }
 
+JNIEXPORT void JNICALL 
+Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile
+(JNIEnv *env, jobject obj __attribute__ ((unused)), jobject peer, 
+ jobject img, jint x, jint y, jint w, jint h)
+{
+  GdkPixmap *pixmap;
+  GtkWidget *widget = NULL;
+  void *ptr = NULL;
+  GdkGC *gc;
+
+  gdk_threads_enter();
+
+  ptr = NSA_GET_PTR (env, peer);
+  g_assert (ptr != NULL);
+
+  widget = GTK_WIDGET (ptr);
+  g_assert (widget != NULL);
+
+  while(widget->window != NULL)
+    widget = widget->window;
+  pixmap = cp_gtk_get_pixmap( env, img );
+ 
+
+  gc = gdk_gc_new( widget );
+  gdk_draw_drawable(widget,
+		    gc,
+		    pixmap,
+		    0, 0,
+		    x, y,
+		    w, h);
+
+  schedule_flush ();
+
+  gdk_threads_leave();
+}

Index: native/jni/gtk-peer/gtkpeer.h
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/gtkpeer.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- native/jni/gtk-peer/gtkpeer.h	31 May 2006 21:29:48 -0000	1.46
+++ native/jni/gtk-peer/gtkpeer.h	3 Jun 2006 22:41:41 -0000	1.47
@@ -209,6 +209,8 @@
 /* Debugging */
 void cp_gtk_print_current_thread (void);
 
+GdkPixmap *cp_gtk_get_pixmap( JNIEnv *env, jobject obj);
+
 #define SYNCHRONIZE_GDK 0
 
 #define DEBUG_LOCKING 0

Index: gnu/java/awt/peer/gtk/VolatileImageGraphics.java
===================================================================
RCS file: gnu/java/awt/peer/gtk/VolatileImageGraphics.java
diff -N gnu/java/awt/peer/gtk/VolatileImageGraphics.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/awt/peer/gtk/VolatileImageGraphics.java	3 Jun 2006 22:41:41 -0000	1.1
@@ -0,0 +1,129 @@
+/* VolatileImageGraphics.java
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.java.awt.peer.gtk;
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.font.GlyphVector;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferInt;
+import java.awt.image.ColorModel;
+import java.awt.image.DirectColorModel;
+import java.awt.image.RenderedImage;
+import java.awt.image.ImageObserver;
+import java.util.WeakHashMap;
+
+public class VolatileImageGraphics extends CairoSurfaceGraphics
+{
+  private GtkVolatileImage owner;
+
+  public VolatileImageGraphics(GtkVolatileImage owner)
+  {
+    super( owner.offScreen );
+    this.owner = owner;
+  }
+  
+  VolatileImageGraphics(VolatileImageGraphics copyFrom)
+  {
+    super( copyFrom.owner.offScreen );
+    owner = copyFrom.owner;
+  }
+
+  /**
+   * Abstract methods.
+   */  
+  public Graphics create()
+  {
+    return new VolatileImageGraphics( this );
+  }
+  
+  public void copyAreaImpl(int x, int y, int width, int height, int dx, int dy)
+  {
+    surface.copyAreaNative(x, y, width, height, dx, dy, surface.width);
+    owner.invalidate();
+  }
+
+  /**
+   * Overloaded methods that do actual drawing need to enter the gdk threads 
+   * and also do certain things before and after.
+   */
+  public void draw(Shape s)
+  {
+    super.draw(s);
+    Rectangle r = s.getBounds();
+    owner.invalidate();
+  }
+
+  public void fill(Shape s)
+  {
+    super.fill(s);
+    Rectangle r = s.getBounds();
+    owner.invalidate();
+  }
+
+  public void drawRenderedImage(RenderedImage image, AffineTransform xform)
+  {
+    super.drawRenderedImage(image, xform);
+    owner.invalidate();
+  }
+
+  protected boolean drawImage(Image img, AffineTransform xform,
+			      Color bgcolor, ImageObserver obs)
+  {
+    boolean rv = super.drawImage(img, xform, bgcolor, obs);
+    owner.invalidate();
+    return rv;
+  }
+
+  public void drawGlyphVector(GlyphVector gv, float x, float y)
+  {
+    super.drawGlyphVector(gv, x, y);
+    owner.invalidate();
+  }
+}
+

Index: include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
===================================================================
RCS file: include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
diff -N include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/gnu_java_awt_peer_gtk_GtkVolatileImage.h	3 Jun 2006 22:41:41 -0000	1.1
@@ -0,0 +1,22 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_GtkVolatileImage__
+#define __gnu_java_awt_peer_gtk_GtkVolatileImage__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, jobject, jobject, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy (JNIEnv *env, jobject);
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_getPixels (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_update (JNIEnv *env, jobject, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gnu_java_awt_peer_gtk_GtkVolatileImage__ */

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
===================================================================
RCS file: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
diff -N native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c	3 Jun 2006 22:41:41 -0000	1.1
@@ -0,0 +1,188 @@
+/* gnu_java_awt_peer_gtk_VolatileImage.c
+   Copyright (C)  2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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 "jcl.h"
+#include "gtkpeer.h"
+#include <gdk/gdkx.h>
+#include <gdk/gdktypes.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk-pixbuf/gdk-pixdata.h>
+
+#include "gnu_java_awt_peer_gtk_GtkVolatileImage.h"
+#include "cairographics2d.h"
+
+/* prototypes */
+static void *getNativeObject( JNIEnv *env, jobject obj );
+static void setNativeObject( JNIEnv *env, jobject obj, void *ptr );
+
+GdkPixmap *cp_gtk_get_pixmap( JNIEnv *env, jobject obj);
+
+/**
+ * Creates a cairo surface, ARGB32, native ordering, premultiplied alpha.
+ */
+JNIEXPORT jlong JNICALL 
+Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, jobject obj, 
+						  jobject peer,
+						  jint width, jint height)
+{
+  GtkWidget *widget = NULL;
+  GdkPixmap* pixmap;
+  void *ptr = NULL;
+
+  gdk_threads_enter();
+
+  if( peer != NULL )
+    {
+      ptr = NSA_GET_PTR (env, peer);
+      g_assert (ptr != NULL);
+      
+      widget = GTK_WIDGET (ptr);
+      g_assert (widget != NULL);
+      pixmap = gdk_pixmap_new( widget->window, width, height, -1 );
+    }
+  else
+    pixmap = gdk_pixmap_new( NULL, width, height, 16 );
+
+  gdk_threads_leave();
+
+  g_assert( pixmap != NULL );
+
+  return PTR_TO_JLONG( pixmap );
+}
+
+/**
+ * Destroy the surface
+ */
+JNIEXPORT void JNICALL 
+Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy (JNIEnv *env, jobject obj)
+{
+  GdkPixmap* pixmap = getNativeObject(env, obj);
+  if( pixmap != NULL )
+    {
+      gdk_threads_enter();
+      g_object_unref( pixmap );
+      gdk_threads_leave();
+    }
+}
+
+/**
+ * Gets all pixels in an array
+ */
+JNIEXPORT jintArray JNICALL 
+Java_gnu_java_awt_peer_gtk_GtkVolatileImage_getPixels
+(JNIEnv *env, jobject obj)
+{
+  jint *pixeldata, *jpixdata;
+  GdkPixmap *pixmap;
+  jintArray jpixels;
+  int width, height, depth, size;
+  jclass cls;
+  jfieldID field;
+
+  cls = (*env)->GetObjectClass (env, obj);
+  field = (*env)->GetFieldID (env, cls, "width", "I");
+  g_assert (field != 0);
+  width = (*env)->GetIntField (env, obj, field);
+
+  field = (*env)->GetFieldID (env, cls, "height", "I");
+  g_assert (field != 0);
+  height = (*env)->GetIntField (env, obj, field);
+
+  pixmap = (jint *)getNativeObject(env, obj);
+  g_assert(pixmap != NULL);
+
+  gdk_threads_enter();
+
+  /* get depth in bytes */
+  depth = gdk_drawable_get_depth( pixmap ) >> 3;
+  size = width * height * 4;
+  jpixels = (*env)->NewIntArray ( env, size );
+  jpixdata = (*env)->GetIntArrayElements (env, jpixels, NULL);
+  /*  memcpy (jpixdata, pixeldata, size * sizeof( jint )); */
+
+  (*env)->ReleaseIntArrayElements (env, jpixels, jpixdata, 0);
+
+  gdk_threads_leave();
+
+  return jpixels;
+}
+
+/**
+ * Update the pixels.
+ */
+JNIEXPORT void JNICALL 
+Java_gnu_java_awt_peer_gtk_GtkVolatileImage_update
+(JNIEnv *env, jobject obj, jobject gtkimage)
+{
+  GdkPixmap *pixmap = getNativeObject(env, obj);
+  GdkPixbuf *pixbuf;
+
+  gdk_threads_enter();
+  g_assert( pixmap != NULL );
+
+  pixbuf = cp_gtk_image_get_pixbuf (env, gtkimage);
+  g_assert( pixbuf != NULL );
+
+  gdk_draw_pixbuf (pixmap, NULL, pixbuf,
+		   0, 0, 0, 0,  /* src and dest x, y */
+		   -1, -1, /* full width, height */
+		   GDK_RGB_DITHER_NORMAL, 0, 0);
+  gdk_threads_leave();
+}
+
+GdkPixmap *cp_gtk_get_pixmap( JNIEnv *env, jobject obj)
+{
+  return (GdkPixmap *)getNativeObject(env, obj);
+}
+
+/**
+ * Gets the native object field.
+ */
+static void *
+getNativeObject( JNIEnv *env, jobject obj )
+{
+  jclass cls;
+  jlong value;
+  jfieldID nofid;
+  cls = (*env)->GetObjectClass( env, obj );
+  nofid = (*env)->GetFieldID( env, cls, "nativePointer", "J" );
+  value = (*env)->GetLongField( env, obj, nofid );
+  (*env)->DeleteLocalRef( env, cls );
+  return JLONG_TO_PTR(void, value);
+}



From MAILER-DAEMON Sat Jun 03 18:47:08 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fmetg-0002qb-2y
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 18:47:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fmete-0002qS-Gs
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 18:47:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fmetd-0002qF-Vn
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 18:47:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fmetd-0002qC-QE
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 18:47:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fmf0Q-0001G2-Je
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 18:54:06 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fmetd-0006WZ-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 18:47:05 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1Fmetb-0006WW-VC
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 22:47:05 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fmetb-0006WW-VC@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Sat, 03 Jun 2006 22:47:03 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Cairo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 22:47:06 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/03 22:47:03

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 
	include        : gnu_java_awt_peer_gtk_CairoGraphics2D.h 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_CairoGraphics2D.c 

Log message:
	2006-06-02  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/CairoGraphics2D.java
		(cairoPreserveClip, cairoResetClip): New methods.
		(setClip, clip): Reimplement.
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
		* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
		(cairoPreserveClip, cairoResetClip): New methods.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7641&r2=1.7642
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c?cvsroot=classpath&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7641
retrieving revision 1.7642
diff -u -b -r1.7641 -r1.7642
--- ChangeLog	3 Jun 2006 22:41:40 -0000	1.7641
+++ ChangeLog	3 Jun 2006 22:47:03 -0000	1.7642
@@ -1,5 +1,14 @@
 2006-06-02  Sven de Marothy  <sven@physto.se>
 
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
+	(cairoPreserveClip, cairoResetClip): New methods.
+	(setClip, clip): Reimplement.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
+	* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
+	(cairoPreserveClip, cairoResetClip): New methods.
+	
+2006-06-02  Sven de Marothy  <sven@physto.se>
+
 	* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
 	* include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
 	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c

Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java	2 Jun 2006 22:57:31 -0000	1.13
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java	3 Jun 2006 22:47:03 -0000	1.14
@@ -411,6 +411,16 @@
   private native void cairoClip();
 
   /**
+   * Save clip
+   */
+  private native void cairoPreserveClip();
+
+  /** 
+   * Save clip
+   */
+  private native void cairoResetClip();
+
+  /**
    * Set interpolation types
    */
   private native void cairoSurfaceSetFilter(int filter);
@@ -518,32 +528,10 @@
 
   public void clip(Shape s)
   {
-    // update it
-    if (clip == null || s == null)
-      clip = s;
-    else if (s instanceof Rectangle2D && clip instanceof Rectangle2D)
-      {
-	Rectangle2D r = (Rectangle2D) s;
-	Rectangle2D curr = (Rectangle2D) clip;
-	clip = curr.createIntersection(r);
-      }
-    else
-      throw new UnsupportedOperationException();
-
-    // draw it
-    if (clip != null)
-      {
-	cairoNewPath();
-	if (clip instanceof Rectangle2D)
-	  {
-	    Rectangle2D r = (Rectangle2D) clip;
-	    cairoRectangle(r.getX(), r.getY(), r.getWidth(), r.getHeight());
-	  }
-	else
-	  walkPath(clip.getPathIterator(null), false);
+    if( s == null )
+      setClip( originalClip );
 
-	cairoClip();
-      }
+    setClip(s);
   }
 
   public Paint getPaint()
@@ -706,17 +694,18 @@
 
   public void setClip(int x, int y, int width, int height)
   {
-    setClip(new Rectangle2D.Double((double) x, (double) y, (double) width,
-                                   (double) height));
+    if( width < 0 || height < 0 )
+      return;
+
+    setClip(new Rectangle2D.Double(x, y, width, height));
   }
 
   public void setClip(Shape s)
   {    
-    clip = s;
-
-    // The first time the clip is set, save it as the original clip to reset to on
-    // s == null. We can rely on this being non-null because the constructor in 
-    // subclasses is expected to set the initial clip properly.
+    // The first time the clip is set, save it as the original clip 
+    // to reset to on s == null. We can rely on this being non-null 
+    // because the constructor in subclasses is expected to set the 
+    // initial clip properly.
     if( firstClip )
       {
 	originalClip = s;
@@ -725,6 +714,10 @@
 
     if (s == null)
       clip = originalClip;
+    else
+      clip = s;
+
+    cairoResetClip();
 
     cairoNewPath();
     if (clip instanceof Rectangle2D)
@@ -735,7 +728,6 @@
     else
       walkPath(clip.getPathIterator(null), false);
     
-    // cairoClosePath ();
     cairoClip();
   }
 

Index: include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
===================================================================
RCS file: /sources/classpath/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	29 May 2006 16:14:59 -0000	1.1
+++ include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	3 Jun 2006 22:47:03 -0000	1.2
@@ -34,6 +34,8 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter (JNIEnv *env, jobject, jint);
 
 #ifdef __cplusplus

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	31 May 2006 23:25:13 -0000	1.5
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	3 Jun 2006 22:47:03 -0000	1.6
@@ -590,11 +590,30 @@
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip 
    (JNIEnv *env, jobject obj)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = getPointer( env, obj );
+  g_assert( gr != NULL );
+
+  cairo_clip( gr->cr );
+}
+
+JNIEXPORT void JNICALL 
+Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip 
+  (JNIEnv *env, jobject obj)
+{
+  struct cairographics2d *gr = getPointer( env, obj );
+  g_assert (gr != NULL);
+
+  cairo_reset_clip( gr->cr );
+}
+
+JNIEXPORT void JNICALL 
+Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip 
+(JNIEnv *env, jobject obj)
+{
+  struct cairographics2d *gr = getPointer( env, obj );
   g_assert (gr != NULL);
 
-  cairo_reset_clip (gr->cr);
-  cairo_clip (gr->cr);
+  cairo_clip_preserve( gr->cr );
 }
 
 JNIEXPORT void JNICALL



From MAILER-DAEMON Sat Jun 03 19:09:56 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmfFk-0002sU-AP
	for mharc-commit-classpath@gnu.org; Sat, 03 Jun 2006 19:09:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmfFi-0002sA-L6
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 19:09:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmfFh-0002rp-QA
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 19:09:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmfFh-0002rm-Mm
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 19:09:53 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmfMU-0002Sv-PQ
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 19:16:54 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmfFh-0006n2-00
	for <commit-classpath@gnu.org>; Sat, 03 Jun 2006 19:09:53 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FmfFg-0006mz-Kn
	for commit-classpath@gnu.org; Sat, 03 Jun 2006 23:09:53 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmfFg-0006mz-Kn@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sat, 03 Jun 2006 23:09:52 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/annotation/Incomp...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jun 2006 23:09:54 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/03 23:09:52

Modified files:
	.              : ChangeLog 
Added files:
	java/lang/annotation: IncompleteAnnotationException.java 

Log message:
	2006-06-03  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/annotation/IncompleteAnnotationException.java:
		Documented.
	
	2004-08-07  Tom Tromey  <tromey@redhat.com>
	
		* java/lang/annotation/IncompleteAnnotationException.java: New
		file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7642&r2=1.7643
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/annotation/IncompleteAnnotationException.java?cvsroot=classpath&rev=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7642
retrieving revision 1.7643
diff -u -b -r1.7642 -r1.7643
--- ChangeLog	3 Jun 2006 22:47:03 -0000	1.7642
+++ ChangeLog	3 Jun 2006 23:09:52 -0000	1.7643
@@ -1,3 +1,13 @@
+2006-06-03  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/lang/annotation/IncompleteAnnotationException.java:
+	Documented.
+
+2004-08-07  Tom Tromey  <tromey@redhat.com>
+
+	* java/lang/annotation/IncompleteAnnotationException.java: New
+	file.
+
 2006-06-02  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/peer/gtk/CairoGraphics2D.java

Index: java/lang/annotation/IncompleteAnnotationException.java
===================================================================
RCS file: java/lang/annotation/IncompleteAnnotationException.java
diff -N java/lang/annotation/IncompleteAnnotationException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/lang/annotation/IncompleteAnnotationException.java	3 Jun 2006 23:09:52 -0000	1.2
@@ -0,0 +1,106 @@
+/* IncompleteAnnotationException.java - Thrown when annotation has changed
+   Copyright (C) 2004 Free Software Foundation
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.lang.annotation;
+
+/**
+ * Thrown when accessing an element within an annotation which
+ * was added since compilation or serialization took place, and
+ * does not have a default value.  
+ * 
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class IncompleteAnnotationException extends RuntimeException
+{
+
+  /**
+   * Constructs a new <code>IncompleteAnnotationException</code>
+   * which indicates that the element, <code>name</code>, was missing
+   * from the annotation, <code>type</code> at compile time and does
+   * not have a default value.
+   *
+   * @param type the type of annotation from which an element is missing.
+   * @param name the name of the missing element.
+   */
+  public IncompleteAnnotationException(Class type, String name)
+  {
+    this.annotationType = type;
+    this.elementName = name;
+  }
+
+  /**
+   * Returns the class representing the type of annotation
+   * from which an element was missing.
+   *
+   * @return the type of annotation.
+   */
+  public Class annotationType()
+  {
+    return annotationType;
+  }
+
+  /**
+   * Returns the name of the missing annotation element.
+   *
+   * @return the element name.
+   */
+  public String elementName()
+  {
+    return elementName;
+  }
+
+  // Names are chosen from serialization spec.
+
+  /**
+   * The class representing the type of annotation from
+   * which an element was found to be missing.
+   *
+   * @serial the type of the annotation from which an
+   *         element was missing.
+   */
+  private Class annotationType;
+
+  /**
+   * The name of the missing element.
+   *
+   * @serial the name of the missing element. 
+   */
+  private String elementName;
+
+}



From MAILER-DAEMON Sun Jun 04 01:30:00 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmlBX-0005Pv-PR
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 01:29:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmlBV-0005PJ-UP
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 01:29:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmlBU-0005Oi-HR
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 01:29:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmlBU-0005Oe-Ci
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 01:29:56 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmlIL-0005h5-4n
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 01:37:01 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmlBJ-0001NM-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 01:29:45 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FmlBJ-0001NJ-0A
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 05:29:45 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmlBJ-0001NJ-0A@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sun, 04 Jun 2006 05:29:45 +0000
Subject: [commit-cp] classpath/gnu/java/security sigISignature.java ...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jun 2006 05:29:58 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/04 05:29:44

Modified files:
	gnu/java/security/sig: ISignature.java 
	gnu/java/security: PolicyFile.java 
	gnu/java/security/util: ExpirableObject.java SimpleList.java 
	gnu/java/security/x509/ext: GeneralNames.java 
	gnu/java/security/x509: Util.java 
	.              : ChangeLog 
	gnu/java/security/sig/rsa: RSAPSSSignatureRawCodec.java 
	gnu/java/security/provider: PKIXCertPathValidatorImpl.java 

Log message:
	2006-06-04  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/java/security/PolicyFile.java: Updated copyright year.
		(logger): Increased visibility.
		* gnu/java/security/x509/Util.java: Updated copyright year.
		(hexDump): Fix javadoc @link.
		* gnu/java/security/x509/ext/GeneralNames.java: Updated copyright year.
		Removed unused import.
		* gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java: Fix javadoc @link.
		* gnu/java/security/sig/ISignature.java (SOURCE_OF_RANDOMNESS): Likewise.
		* gnu/java/security/util/ExpirableObject.java: Likewise.
		(destroy): Likewise.
		* gnu/java/security/util/SimpleList.java (SimpleList): Likewise.
		* gnu/java/security/provider/PKIXCertPathValidatorImpl.java:
		Updated copyright year.
		(checkCRL): Fix javadoc @param.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/ISignature.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/PolicyFile.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/ExpirableObject.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/SimpleList.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/ext/GeneralNames.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/Util.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7643&r2=1.7644
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java?cvsroot=classpath&r1=1.6&r2=1.7

Patches:
Index: sig/ISignature.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/sig/ISignature.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- sig/ISignature.java	26 Mar 2006 22:57:46 -0000	1.2
+++ sig/ISignature.java	4 Jun 2006 05:29:43 -0000	1.3
@@ -71,9 +71,9 @@
 
   /**
    * Property name of an optional {@link java.security.SecureRandom},
-   * {@link java.util.Random}, or {@link gnu.crypto.prng.IRandom} instance to
+   * {@link java.util.Random}, or {@link gnu.java.security.prng.IRandom} instance to
    * use. The default is to use a classloader singleton from
-   * {@link gnu.crypto.util.PRNG}.
+   * {@link gnu.java.security.util.PRNG}.
    */
   public static final String SOURCE_OF_RANDOMNESS = "gnu.crypto.sig.prng";
 

Index: PolicyFile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/PolicyFile.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- PolicyFile.java	18 Sep 2005 03:06:39 -0000	1.7
+++ PolicyFile.java	4 Jun 2006 05:29:43 -0000	1.8
@@ -1,5 +1,5 @@
 /* PolicyFile.java -- policy file reader
-   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -148,7 +148,7 @@
   // Constants and fields.
   // -------------------------------------------------------------------------
 
-  private static final Logger logger = SystemLogger.SYSTEM;
+  protected static final Logger logger = SystemLogger.SYSTEM;
 
   private static final String DEFAULT_POLICY =
     SystemProperties.getProperty("java.home")

Index: util/ExpirableObject.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/util/ExpirableObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- util/ExpirableObject.java	26 Jan 2006 02:25:11 -0000	1.1
+++ util/ExpirableObject.java	4 Jun 2006 05:29:43 -0000	1.2
@@ -51,7 +51,7 @@
  * once a timeout elapses, will automatically call the {@link
  * Destroyable#destroy()} method.
  *
- * <p>Concrete subclasses must implement the {@link doDestroy()} method
+ * <p>Concrete subclasses must implement the {@link #doDestroy()} method
  * instead of {@link Destroyable#destroy()}; the behavior of that method
  * should match exactly the behavior desired of <code>destroy()</code>.
  *
@@ -111,7 +111,7 @@
   // -------------------------------------------------------------------------
 
   /**
-   * Destroys this object. This method calls {@link doDestroy}, then, if
+   * Destroys this object. This method calls {@link #doDestroy}, then, if
    * no exception is thrown, cancels the task that would destroy this object
    * when the timeout is reached.
    *

Index: util/SimpleList.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/util/SimpleList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- util/SimpleList.java	26 Jan 2006 02:25:11 -0000	1.1
+++ util/SimpleList.java	4 Jun 2006 05:29:43 -0000	1.2
@@ -61,7 +61,7 @@
   /**
    * Create a singleton list.
    *
-   * @param e1 The first element.
+   * @param element The first element.
    */
   public SimpleList(final Object element)
   {

Index: x509/ext/GeneralNames.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/x509/ext/GeneralNames.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- x509/ext/GeneralNames.java	2 Feb 2006 07:16:22 -0000	1.4
+++ x509/ext/GeneralNames.java	4 Jun 2006 05:29:43 -0000	1.5
@@ -1,5 +1,5 @@
 /* GeneralNames.java -- the GeneralNames object
-   Copyright (C) 2004  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,7 +42,6 @@
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
-import gnu.java.security.x509.X500DistinguishedName;
 
 import java.io.IOException;
 import java.net.InetAddress;

Index: x509/Util.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/x509/Util.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- x509/Util.java	2 Jul 2005 20:32:14 -0000	1.2
+++ x509/Util.java	4 Jun 2006 05:29:44 -0000	1.3
@@ -1,5 +1,5 @@
 /* Util.java -- Miscellaneous utility methods.
-   Copyright (C) 2004  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -155,7 +155,7 @@
   }
 
   /**
-   * See {@link #hexDump(byte[],int,int)}.
+   * See {@link #hexDump(byte[],int,int,String)}.
    */
   public static String hexDump(byte[] buf, String prefix)
   {


Index: sig/rsa/RSAPSSSignatureRawCodec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- sig/rsa/RSAPSSSignatureRawCodec.java	26 Mar 2006 22:57:46 -0000	1.2
+++ sig/rsa/RSAPSSSignatureRawCodec.java	4 Jun 2006 05:29:44 -0000	1.3
@@ -44,7 +44,7 @@
 import java.io.ByteArrayOutputStream;
 
 /**
- * <p>An object that implements the {@link gnu.crypto.sig.ISignatureCodec}
+ * <p>An object that implements the {@link ISignatureCodec}
  * operations for the <i>Raw</i> format to use with RSA-PSS signatures.</p>
  */
 public class RSAPSSSignatureRawCodec implements ISignatureCodec

Index: provider/PKIXCertPathValidatorImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- provider/PKIXCertPathValidatorImpl.java	26 Feb 2006 04:49:18 -0000	1.6
+++ provider/PKIXCertPathValidatorImpl.java	4 Jun 2006 05:29:44 -0000	1.7
@@ -1,5 +1,5 @@
 /* PKIXCertPathValidatorImpl.java -- PKIX certificate path validator.
-   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -435,7 +435,7 @@
    * @param crl The CRL being checked.
    * @param path The path this CRL is being checked against.
    * @param now The value to use as 'now'.
-   * @param pubKeySubject The subject of the public key.
+   * @param pubKeyCert The certificate authenticating the public key.
    * @param pubKey The public key to check.
    * @return True if the CRL is acceptable.
    */



From MAILER-DAEMON Sun Jun 04 02:57:36 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmmYK-0008AV-2E
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 02:57:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmmYH-00088K-W9
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 02:57:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmmYF-000865-5y
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 02:57:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmmYE-00085r-Ux
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 02:57:31 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fmmf6-00028K-39
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 03:04:36 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmmYB-0005Am-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 02:57:27 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FmmYB-0005Aj-4k
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 06:57:27 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmmYB-0005Aj-4k@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sun, 04 Jun 2006 06:57:27 +0000
Subject: [commit-cp] classpath/gnu/javax/crypto jce/keySquareSecretK...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jun 2006 06:57:34 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/04 06:57:26

Modified files:
	gnu/javax/crypto/jce/key: SquareSecretKeyFactoryImpl.java 
	                          KhazadSecretKeyFactoryImpl.java 
	                          BlowfishSecretKeyFactoryImpl.java 
	                          TwofishSecretKeyFactoryImpl.java 
	                          AnubisSecretKeyFactoryImpl.java 
	                          RijndaelSecretKeyFactoryImpl.java 
	                          Cast5SecretKeyFactoryImpl.java 
	                          SerpentSecretKeyFactoryImpl.java 
	gnu/javax/crypto/jce/spec: TMMHParameterSpec.java 
	gnu/javax/crypto/keyring: CertPathEntry.java EncryptedEntry.java 
	                          PublicKeyEntry.java 
	                          AuthenticatedEntry.java 
	                          CertificateEntry.java 
	gnu/javax/crypto/pad: IPad.java PKCS7.java PKCS1_V1_5.java 
	                      TBC.java TLS1.java 
	gnu/javax/crypto/cipher: BaseCipher.java IBlockCipherSpi.java 
	gnu/javax/crypto/jce/prng: CSPRNGSpi.java 
	gnu/javax/crypto/assembly: Direction.java Transformer.java 
	                           Cascade.java 
	gnu/javax/crypto/sasl/srp: SRPRegistry.java PasswordFile.java 
	gnu/javax/crypto/prng: CSPRNG.java 
	.              : ChangeLog 
	gnu/javax/crypto/mac: OMAC.java 
	gnu/javax/crypto/jce/cipher: CipherAdapter.java 
	gnu/javax/crypto/mode: CTR.java BaseMode.java 
	gnu/javax/crypto/jce/mac: OMacImpl.java 
	gnu/javax/crypto/sasl: SaslUtil.java 
	gnu/javax/crypto/key/dh: GnuDHPrivateKey.java 

Log message:
	2006-06-04  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/javax/crypto/sasl/SaslUtil.java: Remove unused import.
		* gnu/javax/crypto/sasl/srp/SRPRegistry.java (PASSWORD_DB): Fix javadoc @link.
		* gnu/javax/crypto/sasl/srp/PasswordFile.java: Removed unused import.
		* gnu/javax/crypto/prng/CSPRNG.java (FILE_SOURCES): Fix javadoc @see.
		(getSystemInstance): Fix javadoc @link.
		(counter): Increased visibility.
		* gnu/javax/crypto/pad/TLS1.java: Remove unused import.
		* gnu/javax/crypto/pad/IPad.java: Fix javadoc @link.
		* gnu/javax/crypto/pad/PKCS1_V1_5.java (PKCS1_V1_5): Likewise.
		* gnu/javax/crypto/pad/PKCS7.java (PKCS7): Likewise.
		* gnu/javax/crypto/pad/TBC.java (TBC): Likewise.
		* gnu/javax/crypto/mode/CTR.java: Remove unused import.
		* gnu/javax/crypto/mode/BaseMode.java (defaultBlockSize): Fix javadoc @see.
		* gnu/javax/crypto/key/dh/GnuDHPrivateKey.java (getEncoded): Fix javadoc @see.
		* gnu/javax/crypto/jce/spec/TMMHParameterSpec.java: Fix javadoc @link.
		* gnu/javax/crypto/keyring/AuthenticatedEntry.java: Remove unused imports.
		* gnu/javax/crypto/keyring/CertificateEntry.java: Likewise.
		* gnu/javax/crypto/keyring/CertPathEntry.java: Likewise.
		* gnu/javax/crypto/keyring/EncryptedEntry.java: Likewise.
		* gnu/javax/crypto/keyring/PublicKeyEntry.java: Likewise.
		* gnu/javax/crypto/mac/OMAC.java: Likewise.
		* gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/mac/OMacImpl.java: Likewise.
		* gnu/javax/crypto/jce/prng/CSPRNGSpi.java: Likewise.
		* gnu/javax/crypto/cipher/IBlockCipherSpi.java: Fix javadoc @link.
		* gnu/javax/crypto/jce/cipher/CipherAdapter.java (CipherAdapter): Likewise.
		* gnu/javax/crypto/cipher/BaseCipher.java: Remove unused import.
		* gnu/javax/crypto/assembly/Cascade.java: Fix javadoc @link.
		* gnu/javax/crypto/assembly/Direction.java: Likewise.
		* gnu/javax/crypto/assembly/Transformer.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/CertPathEntry.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/EncryptedEntry.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PublicKeyEntry.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/CertificateEntry.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/IPad.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/PKCS7.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/TBC.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/TLS1.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/BaseCipher.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/CSPRNGSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Direction.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Transformer.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Cascade.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/srp/SRPRegistry.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/srp/PasswordFile.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/prng/CSPRNG.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7644&r2=1.7645
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mac/OMAC.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mode/CTR.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mode/BaseMode.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/SaslUtil.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java?cvsroot=classpath&r1=1.2&r2=1.3

Patches:
Index: jce/key/SquareSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- jce/key/SquareSecretKeyFactoryImpl.java	26 Jan 2006 02:25:08 -0000	1.1
+++ jce/key/SquareSecretKeyFactoryImpl.java	4 Jun 2006 06:57:24 -0000	1.2
@@ -37,13 +37,6 @@
 
 package gnu.javax.crypto.jce.key;
 
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
 public class SquareSecretKeyFactoryImpl extends SecretKeyFactoryImpl
 {
   public SquareSecretKeyFactoryImpl()

Index: jce/key/KhazadSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- jce/key/KhazadSecretKeyFactoryImpl.java	26 Jan 2006 02:25:08 -0000	1.1
+++ jce/key/KhazadSecretKeyFactoryImpl.java	4 Jun 2006 06:57:24 -0000	1.2
@@ -37,13 +37,6 @@
 
 package gnu.javax.crypto.jce.key;
 
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
 public class KhazadSecretKeyFactoryImpl extends SecretKeyFactoryImpl
 {
   public KhazadSecretKeyFactoryImpl()

Index: jce/key/BlowfishSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- jce/key/BlowfishSecretKeyFactoryImpl.java	26 Jan 2006 02:25:08 -0000	1.1
+++ jce/key/BlowfishSecretKeyFactoryImpl.java	4 Jun 2006 06:57:24 -0000	1.2
@@ -38,13 +38,6 @@
 
 package gnu.javax.crypto.jce.key;
 
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
 public class BlowfishSecretKeyFactoryImpl extends SecretKeyFactoryImpl
 {
   public BlowfishSecretKeyFactoryImpl()

Index: jce/key/TwofishSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- jce/key/TwofishSecretKeyFactoryImpl.java	26 Jan 2006 02:25:08 -0000	1.1
+++ jce/key/TwofishSecretKeyFactoryImpl.java	4 Jun 2006 06:57:24 -0000	1.2
@@ -37,13 +37,6 @@
 
 package gnu.javax.crypto.jce.key;
 
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
 public class TwofishSecretKeyFactoryImpl extends SecretKeyFactoryImpl
 {
   public TwofishSecretKeyFactoryImpl()

Index: jce/key/AnubisSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- jce/key/AnubisSecretKeyFactoryImpl.java	26 Jan 2006 02:25:08 -0000	1.1
+++ jce/key/AnubisSecretKeyFactoryImpl.java	4 Jun 2006 06:57:24 -0000	1.2
@@ -38,13 +38,6 @@
 
 package gnu.javax.crypto.jce.key;
 
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
 public class AnubisSecretKeyFactoryImpl extends SecretKeyFactoryImpl
 {
   public AnubisSecretKeyFactoryImpl()

Index: jce/key/RijndaelSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- jce/key/RijndaelSecretKeyFactoryImpl.java	26 Jan 2006 02:25:08 -0000	1.1
+++ jce/key/RijndaelSecretKeyFactoryImpl.java	4 Jun 2006 06:57:24 -0000	1.2
@@ -37,13 +37,6 @@
 
 package gnu.javax.crypto.jce.key;
 
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
 public class RijndaelSecretKeyFactoryImpl extends SecretKeyFactoryImpl
 {
   public RijndaelSecretKeyFactoryImpl()

Index: jce/key/Cast5SecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- jce/key/Cast5SecretKeyFactoryImpl.java	26 Jan 2006 02:25:08 -0000	1.1
+++ jce/key/Cast5SecretKeyFactoryImpl.java	4 Jun 2006 06:57:24 -0000	1.2
@@ -38,13 +38,6 @@
 
 package gnu.javax.crypto.jce.key;
 
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
 public class Cast5SecretKeyFactoryImpl extends SecretKeyFactoryImpl
 {
   public Cast5SecretKeyFactoryImpl()

Index: jce/key/SerpentSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- jce/key/SerpentSecretKeyFactoryImpl.java	26 Jan 2006 02:25:08 -0000	1.1
+++ jce/key/SerpentSecretKeyFactoryImpl.java	4 Jun 2006 06:57:24 -0000	1.2
@@ -37,13 +37,6 @@
 
 package gnu.javax.crypto.jce.key;
 
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
 public class SerpentSecretKeyFactoryImpl extends SecretKeyFactoryImpl
 {
   public SerpentSecretKeyFactoryImpl()

Index: jce/spec/TMMHParameterSpec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- jce/spec/TMMHParameterSpec.java	26 Jan 2006 02:25:09 -0000	1.1
+++ jce/spec/TMMHParameterSpec.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -45,7 +45,7 @@
 /**
  * This class represents the algorithm parameters for the Truncated
  * Multi-Modular Hash function for use with JCE-derived instances of
- * {@link gnu.crypto.mac.TMMH16}.
+ * {@link gnu.javax.crypto.mac.TMMH16}.
  *
  * <p>This class is little more than a container for the key stream, tag
  * length, and prefix parameters for the TMMH algorithm.

Index: keyring/CertPathEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/CertPathEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- keyring/CertPathEntry.java	26 Jan 2006 02:25:09 -0000	1.1
+++ keyring/CertPathEntry.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -40,14 +40,11 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
-
 import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
-
 import java.util.Date;
 
 /**

Index: keyring/EncryptedEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/EncryptedEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- keyring/EncryptedEntry.java	26 Jan 2006 02:25:09 -0000	1.1
+++ keyring/EncryptedEntry.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -38,21 +38,6 @@
 
 package gnu.javax.crypto.keyring;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import java.security.InvalidKeyException;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.HashMap;
-import java.util.List;
-
 import gnu.java.security.Registry;
 import gnu.javax.crypto.cipher.CipherFactory;
 import gnu.javax.crypto.cipher.IBlockCipher;
@@ -62,6 +47,15 @@
 import gnu.javax.crypto.pad.PadFactory;
 import gnu.javax.crypto.pad.WrongPaddingException;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.security.InvalidKeyException;
+import java.util.HashMap;
+import java.util.Iterator;
+
 public class EncryptedEntry extends MaskableEnvelopeEntry implements Registry
 {
 

Index: keyring/PublicKeyEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/PublicKeyEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- keyring/PublicKeyEntry.java	26 Jan 2006 02:25:09 -0000	1.1
+++ keyring/PublicKeyEntry.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -38,22 +38,19 @@
 
 package gnu.javax.crypto.keyring;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import java.security.PublicKey;
-import java.security.KeyFactory;
-import java.security.spec.X509EncodedKeySpec;
-
-import java.util.Date;
-
 import gnu.java.security.key.IKeyPairCodec;
 import gnu.java.security.key.KeyPairCodecFactory;
 import gnu.java.security.key.dss.DSSPublicKey;
 import gnu.java.security.key.rsa.GnuRSAPublicKey;
 import gnu.javax.crypto.key.dh.GnuDHPublicKey;
 
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.security.KeyFactory;
+import java.security.PublicKey;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Date;
+
 public final class PublicKeyEntry extends PrimitiveEntry
 {
 

Index: keyring/AuthenticatedEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- keyring/AuthenticatedEntry.java	26 Jan 2006 02:25:09 -0000	1.1
+++ keyring/AuthenticatedEntry.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -38,25 +38,20 @@
 
 package gnu.javax.crypto.keyring;
 
+import gnu.java.security.Registry;
+import gnu.javax.crypto.mac.IMac;
+import gnu.javax.crypto.mac.MacFactory;
+import gnu.javax.crypto.mac.MacOutputStream;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-
 import java.security.InvalidKeyException;
-
 import java.util.Arrays;
-import java.util.Date;
-import java.util.Iterator;
 import java.util.HashMap;
-import java.util.List;
-
-import gnu.java.security.Registry;
-import gnu.javax.crypto.mac.IMac;
-import gnu.javax.crypto.mac.MacFactory;
-import gnu.javax.crypto.mac.MacInputStream;
-import gnu.javax.crypto.mac.MacOutputStream;
+import java.util.Iterator;
 
 public final class AuthenticatedEntry extends MaskableEnvelopeEntry implements
     Registry

Index: keyring/CertificateEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/CertificateEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- keyring/CertificateEntry.java	26 Jan 2006 02:25:09 -0000	1.1
+++ keyring/CertificateEntry.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -39,13 +39,11 @@
 package gnu.javax.crypto.keyring;
 
 import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
 import java.util.Date;
 
 /**

Index: pad/IPad.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/IPad.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- pad/IPad.java	26 Jan 2006 02:25:09 -0000	1.1
+++ pad/IPad.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -44,7 +44,7 @@
  * <p>Padding algorithms serve to <i>pad</i> and <i>unpad</i> byte arrays usually
  * as the last step in an <i>encryption</i> or respectively a <i>decryption</i>
  * operation. Their input buffers are usually those processed by instances of
- * {@link gnu.crypto.mode.IMode} and/or {@link gnu.crypto.cipher.IBlockCipher}.</p>
+ * {@link gnu.javax.crypto.mode.IMode} and/or {@link gnu.javax.crypto.cipher.IBlockCipher}.</p>
  */
 public interface IPad
 {

Index: pad/PKCS7.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/PKCS7.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- pad/PKCS7.java	26 Jan 2006 02:25:09 -0000	1.1
+++ pad/PKCS7.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -86,7 +86,7 @@
   /**
    * Trivial package-private constructor for use by the <i>Factory</i> class.<p>
    *
-   * @see gnu.crypto.pad.PadFactory
+   * @see PadFactory
    */
   PKCS7()
   {

Index: pad/PKCS1_V1_5.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- pad/PKCS1_V1_5.java	3 Feb 2006 19:29:01 -0000	1.2
+++ pad/PKCS1_V1_5.java	4 Jun 2006 06:57:25 -0000	1.3
@@ -92,7 +92,7 @@
    * <p>Trivial package-private constructor for use by the <i>Factory</i> class.
    * </p>
    *
-   * @see gnu.crypto.pad.PadFactory
+   * @see PadFactory
    */
   PKCS1_V1_5()
   {

Index: pad/TBC.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/TBC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- pad/TBC.java	26 Jan 2006 02:25:09 -0000	1.1
+++ pad/TBC.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -85,7 +85,7 @@
   /**
    * Trivial package-private constructor for use by the <i>Factory</i> class.<p>
    *
-   * @see gnu.crypto.pad.PadFactory
+   * @see PadFactory
    */
   TBC()
   {

Index: pad/TLS1.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/TLS1.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- pad/TLS1.java	26 Jan 2006 02:25:09 -0000	1.1
+++ pad/TLS1.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -38,8 +38,6 @@
 
 package gnu.javax.crypto.pad;
 
-import gnu.java.security.util.Util;
-
 /**
  * The padding scheme used by the Transport Layer Security protocol,
  * version 1. This padding scheme is used in the block-ciphered struct,

Index: cipher/BaseCipher.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/BaseCipher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cipher/BaseCipher.java	26 Jan 2006 02:25:08 -0000	1.1
+++ cipher/BaseCipher.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -38,8 +38,6 @@
 
 package gnu.javax.crypto.cipher;
 
-import gnu.java.security.util.Util;
-
 import java.security.InvalidKeyException;
 import java.util.Arrays;
 import java.util.Iterator;

Index: cipher/IBlockCipherSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cipher/IBlockCipherSpi.java	26 Jan 2006 02:25:08 -0000	1.1
+++ cipher/IBlockCipherSpi.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -43,7 +43,7 @@
 
 /**
  * <p>Package-private interface exposing mandatory methods to be implemented by
- * concrete {@link gnu.crypto.cipher.BaseCipher} sub-classes.</p>
+ * concrete {@link gnu.javax.crypto.cipher.BaseCipher} sub-classes.</p>
  */
 interface IBlockCipherSpi extends Cloneable
 {

Index: jce/prng/CSPRNGSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/prng/CSPRNGSpi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- jce/prng/CSPRNGSpi.java	26 Jan 2006 02:25:09 -0000	1.1
+++ jce/prng/CSPRNGSpi.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -38,10 +38,9 @@
 
 package gnu.javax.crypto.jce.prng;
 
-import gnu.java.security.Registry;
-import gnu.javax.crypto.prng.CSPRNG;
 import gnu.java.security.prng.IRandom;
 import gnu.java.security.prng.LimitReachedException;
+import gnu.javax.crypto.prng.CSPRNG;
 
 import java.net.MalformedURLException;
 import java.security.SecureRandomSpi;

Index: assembly/Direction.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/assembly/Direction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- assembly/Direction.java	13 Apr 2006 21:07:02 -0000	1.2
+++ assembly/Direction.java	4 Jun 2006 06:57:25 -0000	1.3
@@ -45,9 +45,9 @@
  *
  * <p>The possible values for this type are two:</p>
  * <ol>
- *    <li>FORWARD: equivalent to {@link gnu.crypto.mode.IMode#ENCRYPTION}, and
+ *    <li>FORWARD: equivalent to {@link gnu.javax.crypto.mode.IMode#ENCRYPTION}, and
  *    its inverse value</li>
- *    <li>REVERSED: equivalent to {@link gnu.crypto.mode.IMode#DECRYPTION}.</li>
+ *    <li>REVERSED: equivalent to {@link gnu.javax.crypto.mode.IMode#DECRYPTION}.</li>
  * </ol>
  */
 public final class Direction

Index: assembly/Transformer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/assembly/Transformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- assembly/Transformer.java	13 Apr 2006 21:07:02 -0000	1.2
+++ assembly/Transformer.java	4 Jun 2006 06:57:25 -0000	1.3
@@ -47,7 +47,7 @@
  * <p>A <code>Transformer</code> is an abstract representation of a two-way
  * <i>transformation</i> that can be chained together with other instances of
  * this type. Examples of such transformations in this library are:
- * {@link Cascade} cipher, {@link gnu.crypto.pad.IPad} algorithm, and a
+ * {@link Cascade} cipher, {@link gnu.javax.crypto.pad.IPad} algorithm, and a
  * ZLib-based deflater/inflater algorithm. A special implementation of a
  * <code>Transformer</code> to close a chain is also provided.</p>
  *

Index: assembly/Cascade.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/assembly/Cascade.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- assembly/Cascade.java	13 Apr 2006 21:07:02 -0000	1.2
+++ assembly/Cascade.java	4 Jun 2006 06:57:25 -0000	1.3
@@ -60,7 +60,7 @@
  * of identical ciphers).</p>
  *
  * <p>The term "block ciphers" used above refers to implementations of
- * {@link gnu.crypto.mode.IMode}, including the {@link gnu.crypto.mode.ECB}
+ * {@link gnu.javax.crypto.mode.IMode}, including the {@link gnu.javax.crypto.mode.ECB}
  * mode which basically exposes a symmetric-key block cipher algorithm as a
  * <i>Mode</i> of Operations.</p>
  *

Index: sasl/srp/SRPRegistry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/sasl/srp/SRPRegistry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- sasl/srp/SRPRegistry.java	26 Jan 2006 02:25:10 -0000	1.1
+++ sasl/srp/SRPRegistry.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -140,7 +140,7 @@
 
   /**
    * Name of the SRP password database property --a reference to
-   * {@link gnu.crypto.sasl.srp.PasswordFile} object.
+   * {@link PasswordFile} object.
    */
   String PASSWORD_DB = "gnu.crypto.sasl.srp.password.db";
 

Index: sasl/srp/PasswordFile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/sasl/srp/PasswordFile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- sasl/srp/PasswordFile.java	26 Jan 2006 02:25:10 -0000	1.1
+++ sasl/srp/PasswordFile.java	4 Jun 2006 06:57:25 -0000	1.2
@@ -39,7 +39,6 @@
 package gnu.javax.crypto.sasl.srp;
 
 import gnu.java.security.Registry;
-import gnu.java.security.hash.IMessageDigest;
 import gnu.java.security.util.Util;
 import gnu.javax.crypto.key.srp6.SRPAlgorithm;
 import gnu.javax.crypto.sasl.NoSuchUserException;
@@ -50,9 +49,9 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;

Index: prng/CSPRNG.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/prng/CSPRNG.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- prng/CSPRNG.java	21 Apr 2006 10:52:26 -0000	1.2
+++ prng/CSPRNG.java	4 Jun 2006 06:57:25 -0000	1.3
@@ -48,7 +48,6 @@
 import gnu.java.security.prng.LimitReachedException;
 import gnu.java.security.util.SimpleList;
 import gnu.java.security.util.Util;
-
 import gnu.javax.crypto.cipher.CipherFactory;
 import gnu.javax.crypto.cipher.IBlockCipher;
 
@@ -56,15 +55,11 @@
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.PrintStream;
-
 import java.net.MalformedURLException;
 import java.net.URL;
-
 import java.security.AccessController;
 import java.security.InvalidKeyException;
 import java.security.PrivilegedAction;
-
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -114,7 +109,7 @@
    * <li>A {@link String}, indicating the path to the file.</li>
    * </ol>
    *
-   * @see gnu.crypto.util.SimpleList
+   * @see gnu.java.security.util.SimpleList
    */
   public static final String FILE_SOURCES = "gnu.crypto.prng.pool.files";
 
@@ -332,7 +327,7 @@
    * and its arguments.</p></dd>
    *
    * <dt>gnu.crypto.cspring.other</dt>
-   * <dd><p>These properties are other sources, passed as the {@link OTHER_SOURCES}
+   * <dd><p>These properties are other sources, passed as the {@link #OTHER_SOURCES}
    * parameter of the instance. The property value must be the full name
    * of a class that implements the {@link EntropySource} interface and has a
    * public no-argument constructor.</p></dd>
@@ -994,7 +989,7 @@
     // Field.
     // -----------------------------------------------------------------------
 
-    private byte counter;
+    protected byte counter;
 
     // Constructor.
     // -----------------------------------------------------------------------


Index: mac/OMAC.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mac/OMAC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- mac/OMAC.java	26 Jan 2006 02:25:09 -0000	1.1
+++ mac/OMAC.java	4 Jun 2006 06:57:26 -0000	1.2
@@ -43,10 +43,8 @@
 import gnu.javax.crypto.cipher.CipherFactory;
 import gnu.javax.crypto.cipher.IBlockCipher;
 import gnu.javax.crypto.mode.IMode;
-import gnu.javax.crypto.mode.ModeFactory;
 
 import java.security.InvalidKeyException;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;

Index: jce/cipher/CipherAdapter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- jce/cipher/CipherAdapter.java	13 Apr 2006 21:07:02 -0000	1.2
+++ jce/cipher/CipherAdapter.java	4 Jun 2006 06:57:26 -0000	1.3
@@ -118,9 +118,9 @@
 
   /**
    * <p>Protected constructor to be called by subclasses. The cipher name
-   * argument should be the appropriate one listed in {@link gnu.crypto.Registry}.
+   * argument should be the appropriate one listed in {@link gnu.java.security.Registry}.
    * The basic cipher instance is created, along with an instance of the
-   * {@link gnu.crypto.mode.ECB} mode and no padding.</p>
+   * {@link gnu.javax.crypto.mode.ECB} mode and no padding.</p>
    *
    * @param cipherName The cipher to instantiate.
    * @param blockLen The block length to use.

Index: mode/CTR.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mode/CTR.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- mode/CTR.java	26 Jan 2006 02:25:09 -0000	1.1
+++ mode/CTR.java	4 Jun 2006 06:57:26 -0000	1.2
@@ -40,10 +40,8 @@
 
 import gnu.java.security.Registry;
 import gnu.java.security.util.Sequence;
-
 import gnu.javax.crypto.cipher.IBlockCipher;
 
-import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Iterator;
 

Index: mode/BaseMode.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mode/BaseMode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- mode/BaseMode.java	26 Jan 2006 02:25:09 -0000	1.1
+++ mode/BaseMode.java	4 Jun 2006 06:57:26 -0000	1.2
@@ -146,7 +146,7 @@
    * of the method(s) available in the factory class.</p>
    *
    * @return the default value, in bytes, of the mode's block size.
-   * @see gnu.crypto.mode.ModeFactory
+   * @see ModeFactory
    */
   public int defaultBlockSize()
   {

Index: jce/mac/OMacImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/mac/OMacImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- jce/mac/OMacImpl.java	26 Jan 2006 02:25:09 -0000	1.1
+++ jce/mac/OMacImpl.java	4 Jun 2006 06:57:26 -0000	1.2
@@ -39,7 +39,6 @@
 package gnu.javax.crypto.jce.mac;
 
 import gnu.java.security.Registry;
-import javax.crypto.MacSpi;
 
 public abstract class OMacImpl extends MacAdapter
 {

Index: sasl/SaslUtil.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/sasl/SaslUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- sasl/SaslUtil.java	26 Jan 2006 02:25:09 -0000	1.1
+++ sasl/SaslUtil.java	4 Jun 2006 06:57:26 -0000	1.2
@@ -40,7 +40,6 @@
 
 import gnu.java.security.util.Util;
 
-import java.math.BigInteger;
 import java.security.MessageDigest;
 
 /**

Index: key/dh/GnuDHPrivateKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- key/dh/GnuDHPrivateKey.java	12 Feb 2006 08:57:57 -0000	1.2
+++ key/dh/GnuDHPrivateKey.java	4 Jun 2006 06:57:26 -0000	1.3
@@ -154,7 +154,7 @@
    * @return the byte sequence encoding this key according to the designated
    * format.
    * @exception IllegalArgumentException if the format is not supported.
-   * @see gnu.crypto.key.dh.DHKeyPairRawCodec
+   * @see DHKeyPairRawCodec
    */
   public byte[] getEncoded(int format)
   {



From MAILER-DAEMON Sun Jun 04 11:57:01 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmuyL-0006gr-AN
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 11:57:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmuyI-0006gR-Sl
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 11:56:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmuyI-0006g7-Dc
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 11:56:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmuyI-0006g4-6t
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 11:56:58 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fmv5E-0004kQ-Uf
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 12:04:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmuyH-0008Pu-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 11:56:57 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FmuyG-0008Pr-UV
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 15:56:57 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmuyG-0008Pr-UV@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 04 Jun 2006 15:56:56 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/System.java [generics]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jun 2006 15:56:59 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/04 15:56:55

Modified files:
	.              : ChangeLog 
	java/lang      : System.java 

Log message:
	2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/System.java:
		(getenv()): Handle cases where split only
		returns an array of size 1.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics&r1=1.2386.2.261&r2=1.2386.2.262
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/System.java?cvsroot=classpath&only_with_tag=generics&r1=1.38.2.19&r2=1.38.2.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.261
retrieving revision 1.2386.2.262
diff -u -b -r1.2386.2.261 -r1.2386.2.262
--- ChangeLog	3 Jun 2006 21:54:29 -0000	1.2386.2.261
+++ ChangeLog	4 Jun 2006 15:56:53 -0000	1.2386.2.262
@@ -1,3 +1,9 @@
+2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/lang/System.java:
+	(getenv()): Handle cases where split only
+	returns an array of size 1.
+	
 2006-06-03  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/lang/annotation/IncompleteAnnotationException.java:

Index: java/lang/System.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/System.java,v
retrieving revision 1.38.2.19
retrieving revision 1.38.2.20
diff -u -b -r1.38.2.19 -r1.38.2.20
--- java/lang/System.java	3 Jun 2006 16:02:08 -0000	1.38.2.19
+++ java/lang/System.java	4 Jun 2006 15:56:54 -0000	1.38.2.20
@@ -549,7 +549,10 @@
 	for (String pair : environ)
 	  {
 	    String[] parts = pair.split("=");
+	    if (parts.length == 2)
 	    variables.put(parts[0], parts[1]);
+	    else
+	      variables.put(parts[0], "");
 	  }
 	environmentMap = Collections.unmodifiableMap(variables);
       }



From MAILER-DAEMON Sun Jun 04 13:52:52 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmwmS-0004rx-0g
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 13:52:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmwmQ-0004rj-2v
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 13:52:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmwmO-0004rW-Ba
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 13:52:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmwmO-0004rT-69
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 13:52:48 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmwtL-0003P5-VI
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 14:00:00 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fmwli-0000OB-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 13:52:06 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fmwli-0000O8-0v
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 17:52:06 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fmwli-0000O8-0v@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 04 Jun 2006 17:52:06 +0000
Subject: [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jun 2006 17:52:50 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/04 17:52:05

Modified files:
	.              : ChangeLog 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_ComponentGraphics.c 
	                     gnu_java_awt_peer_gtk_GdkTextLayout.c 
	                     gnu_java_awt_peer_gtk_GtkVolatileImage.c 

Log message:
	2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c:
		(drawVolatile): Add casts.
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c:
		(getOutline): Add casts.
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
		Comment out unused prototype.
		(getPixels): Add appropriate cast and comment out unused variable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7645&r2=1.7646
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c?cvsroot=classpath&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c?cvsroot=classpath&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c?cvsroot=classpath&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7645
retrieving revision 1.7646
diff -u -b -r1.7645 -r1.7646
--- ChangeLog	4 Jun 2006 06:57:25 -0000	1.7645
+++ ChangeLog	4 Jun 2006 17:52:05 -0000	1.7646
@@ -1,3 +1,13 @@
+2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c:
+	(drawVolatile): Add casts.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c:
+	(getOutline): Add casts.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
+	Comment out unused prototype.
+	(getPixels): Add appropriate cast and comment out unused variable.
+	
 2006-06-04  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	* gnu/javax/crypto/sasl/SaslUtil.java: Remove unused import.

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	3 Jun 2006 22:41:41 -0000	1.10
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	4 Jun 2006 17:52:05 -0000	1.11
@@ -228,12 +228,12 @@
   g_assert (widget != NULL);
 
   while(widget->window != NULL)
-    widget = widget->window;
+    widget = GTK_WIDGET(widget->window);
   pixmap = cp_gtk_get_pixmap( env, img );
  
 
-  gc = gdk_gc_new( widget );
-  gdk_draw_drawable(widget,
+  gc = gdk_gc_new(GDK_DRAWABLE(widget));
+  gdk_draw_drawable(GDK_DRAWABLE(widget),
 		    gc,
 		    pixmap,
 		    0, 0,

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c	1 Jun 2006 10:51:17 -0000	1.14
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c	4 Jun 2006 17:52:05 -0000	1.15
@@ -444,10 +444,10 @@
   PangoLayoutLine *current_line;
   FT_Outline_Funcs ftCallbacks = 
     {
-      _moveTo,
-      _lineTo,
-      _quadTo,
-      _curveTo,
+      (FT_Outline_MoveToFunc) _moveTo,
+      (FT_Outline_LineToFunc) _lineTo,
+      (FT_Outline_ConicToFunc) _quadTo,
+      (FT_Outline_CubicToFunc) _curveTo,
       0,
       0
     };

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c	3 Jun 2006 22:41:41 -0000	1.1
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c	4 Jun 2006 17:52:05 -0000	1.2
@@ -49,7 +49,7 @@
 
 /* prototypes */
 static void *getNativeObject( JNIEnv *env, jobject obj );
-static void setNativeObject( JNIEnv *env, jobject obj, void *ptr );
+/* static void setNativeObject( JNIEnv *env, jobject obj, void *ptr ); */
 
 GdkPixmap *cp_gtk_get_pixmap( JNIEnv *env, jobject obj);
 
@@ -57,7 +57,8 @@
  * Creates a cairo surface, ARGB32, native ordering, premultiplied alpha.
  */
 JNIEXPORT jlong JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, jobject obj, 
+Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, 
+						  jobject obj __attribute__ ((__unused__)), 
 						  jobject peer,
 						  jint width, jint height)
 {
@@ -108,7 +109,8 @@
 Java_gnu_java_awt_peer_gtk_GtkVolatileImage_getPixels
 (JNIEnv *env, jobject obj)
 {
-  jint *pixeldata, *jpixdata;
+  /* jint *pixeldata, *jpixdata; */
+  jint *jpixdata;
   GdkPixmap *pixmap;
   jintArray jpixels;
   int width, height, depth, size;
@@ -124,7 +126,7 @@
   g_assert (field != 0);
   height = (*env)->GetIntField (env, obj, field);
 
-  pixmap = (jint *)getNativeObject(env, obj);
+  pixmap = GDK_PIXMAP(getNativeObject(env, obj));
   g_assert(pixmap != NULL);
 
   gdk_threads_enter();



From MAILER-DAEMON Sun Jun 04 13:59:18 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fmwsg-0006RK-EC
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 13:59:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fmwse-0006RC-AB
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 13:59:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fmwsc-0006R0-Et
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 13:59:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fmwsc-0006Qx-8r
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 13:59:14 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmwzZ-0003qJ-Mz
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 14:06:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fmwsb-0000Tv-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 13:59:13 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fmwsa-0000Ts-Ku
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 17:59:12 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fmwsa-0000Ts-Ku@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 04 Jun 2006 17:59:12 +0000
Subject: [commit-cp] classpath ChangeLog java/math/BigDecimal.java j...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jun 2006 17:59:16 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/04 17:59:12

Modified files:
	.              : ChangeLog 
	java/math      : BigDecimal.java 
Added files:
	java/math      : MathContext.java 

Log message:
	2006-03-01  Anthony Balkissoon  <abalkiss@redhat.com>
	
		* java/math/BigDecimal.java:
		(precision): Fixed overflow problem with large numbers.
		(longValueExact): New method.
		(intValueExact): Likewise.
		(byteValueExact): Likewise.
		(shortValueExact): Likewise.
	
	2006-03-01  Anthony Balkissoon  <abalkiss@redhat.com>
	
		* java/math/BigDecimal.java:
		(remainder(BigDecimal)): New method.
		(divideAndRemainder(BigDecimal)): Likewise.
		(divideToIntegralValue(BigDecimal)): Likewise.
		(floor): New implementation method.
	
	2006-02-28  Anthony Balkissoon  <abalkiss@redhat.com>
	
		* java/math/BigDecimal.java:
		(divide(BigDecimal, int, RoundingMode)): New method.
		(divide(BigDecimal, RoundingMode)): Likewise.
		(divide(BigDecimal, int, int)): Removed incorrect throwing of exception
		when the new scale is < 0.
		(setScale(int, RoundingMode)): New method.
		(ulp): Likewise.
	
	2006-02-27  Anthony Balkissoon  <abalkiss@redhat.com>
	
		* java/math/BigDecimal.java: Replaced occurences of BigInteger.valueOf
		with BigInteger.ZERO, BigInteger.ONE, BigInteger.TEN where appropriate.
		(add(BigDecimal, MathContext)): New method.
		(subtract(BigDecimal, MathContext)): Likewise.
		(precision): Fixed to correctly handle BigIntegers with more than 19
		digits.
		(pow(int, MathContext)): New method.
	
	2006-02-27  Anthony Balkissoon  <abalkiss@redhat.com>
	
		* java/math/BigDecimal.java: Added @throws clause to constructors.
		(mathContext): Removed this unneeded field.
		(BigDecimal(int, MathContext)): New constructor.
		(BigDecimal(BigInteger, int, MathContext)): Likewise.
		(multiply(BigDecimal, MathContext)): New method.
		(negate(MathContext)): Likewise.
		(plus(MathContext)): Likewise.
		(numDigitsInLong): Fixed to properly handle negatives.
	
	2006-02-24  Anthony Balkissoon  <abalkiss@redhat.com>
	
		* java/math/BigDecimal.java:
		(BigDecimal(long, MathContext)): New constructor.
		(BigDecimal(BigInteger, MathContext)): Likewise.
		(BigDecimal(String, MathContext)): Likewise.
		(BigDecimal(double, MathContext)): Likewise.
		(round): Fixed a typo where the precision field was used instead of a
		call to the precision method, and also store the new precision in the
		returned BigDecimal.
		(abs(MathContext)): New method.
	
	2006-02-24  Anthony Balkissoon  <abalkiss@redhat.com>
	
		* java/math/BigDecimal.java
		(toBigInteger): Fixed problem where this method couldn't handle 
		negative values for scale.
		(toBigIntegerExact): New method.
		(stripTrailingZeros): Likewise.
	
	2006-02-23  Anthony Balkissoon  <abalkiss@redhat.com>
	
		* java/math/BigDecimal.java:
		(toString): Fixed a problem where the negative sign was being displayed
		twice in the exponent.
		(toEngineeringString): New method.
		(toPlainString): Likewise.
		(pow): Likewise.
	
	2006-02-23  Anthony Balkissoon  <abalkiss@redhat.com>
	
		* java/math/BigDecimal.java:
		(toString): Rewrote this method to behave as specified.  Added API
		comments to explain behaviour.
		(scaleByPowerOfTen): New method.
	
	2006-02-22  Anthony Balkissoon  <abalkiss@redhat.com>
	
		* java/math/BigDecimal.java:
		(BigDecimal(char[], int, int, MathContext)): New constructor.
		(BigDecimal(char[], MathContext)): Likewise.
		(BigDecimal(char[])): Likewise.
		(BigDecimal(char[], int, int)): Likewise.
		(BigDecimal(String)): Fixed handling of exponent and scale.
	
	2006-02-21  Anthony Balkissoon  <abalkiss@redhat.com>
	
		* java/math/BigDecimal.java:
		(mathContext): New field.
		(precision): Likewise.
		(BigDecimal(int)): New constructor.
		(BigDecimal(long)): Likewise.
		(BigDecimal(BigInteger)): Added API docs.
		(BigDecimal(BigInteger, int)): Removed incorrect NumberFormatException
		and added API docs.
		(plus): New method.
		(round): Likewise.
		(precision): Likewise.
		(valueOf): Likewise.
		(numDigitsInLong): New implementation method.
	
	2006-02-21  Anthony Balkissoon  <abalkiss@redhat.com>
	
		* java/math/MathContext.java: New class.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7646&r2=1.7647
http://cvs.savannah.gnu.org/viewcvs/classpath/java/math/BigDecimal.java?cvsroot=classpath&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/classpath/java/math/MathContext.java?cvsroot=classpath&rev=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7646
retrieving revision 1.7647
diff -u -b -r1.7646 -r1.7647
--- ChangeLog	4 Jun 2006 17:52:05 -0000	1.7646
+++ ChangeLog	4 Jun 2006 17:59:12 -0000	1.7647
@@ -1,3 +1,116 @@
+2006-03-01  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* java/math/BigDecimal.java:
+	(precision): Fixed overflow problem with large numbers.
+	(longValueExact): New method.
+	(intValueExact): Likewise.
+	(byteValueExact): Likewise.
+	(shortValueExact): Likewise.
+
+2006-03-01  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* java/math/BigDecimal.java:
+	(remainder(BigDecimal)): New method.
+	(divideAndRemainder(BigDecimal)): Likewise.
+	(divideToIntegralValue(BigDecimal)): Likewise.
+	(floor): New implementation method.
+
+2006-02-28  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* java/math/BigDecimal.java:
+	(divide(BigDecimal, int, RoundingMode)): New method.
+	(divide(BigDecimal, RoundingMode)): Likewise.
+	(divide(BigDecimal, int, int)): Removed incorrect throwing of exception
+	when the new scale is < 0.
+	(setScale(int, RoundingMode)): New method.
+	(ulp): Likewise.
+
+2006-02-27  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* java/math/BigDecimal.java: Replaced occurences of BigInteger.valueOf
+	with BigInteger.ZERO, BigInteger.ONE, BigInteger.TEN where appropriate.
+	(add(BigDecimal, MathContext)): New method.
+	(subtract(BigDecimal, MathContext)): Likewise.
+	(precision): Fixed to correctly handle BigIntegers with more than 19
+	digits.
+	(pow(int, MathContext)): New method.
+
+2006-02-27  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* java/math/BigDecimal.java: Added @throws clause to constructors.
+	(mathContext): Removed this unneeded field.
+	(BigDecimal(int, MathContext)): New constructor.
+	(BigDecimal(BigInteger, int, MathContext)): Likewise.
+	(multiply(BigDecimal, MathContext)): New method.
+	(negate(MathContext)): Likewise.
+	(plus(MathContext)): Likewise.
+	(numDigitsInLong): Fixed to properly handle negatives.
+
+2006-02-24  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* java/math/BigDecimal.java:
+	(BigDecimal(long, MathContext)): New constructor.
+	(BigDecimal(BigInteger, MathContext)): Likewise.
+	(BigDecimal(String, MathContext)): Likewise.
+	(BigDecimal(double, MathContext)): Likewise.
+	(round): Fixed a typo where the precision field was used instead of a
+	call to the precision method, and also store the new precision in the
+	returned BigDecimal.
+	(abs(MathContext)): New method.
+
+2006-02-24  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* java/math/BigDecimal.java
+	(toBigInteger): Fixed problem where this method couldn't handle 
+	negative values for scale.
+	(toBigIntegerExact): New method.
+	(stripTrailingZeros): Likewise.
+
+2006-02-23  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* java/math/BigDecimal.java:
+	(toString): Fixed a problem where the negative sign was being displayed
+	twice in the exponent.
+	(toEngineeringString): New method.
+	(toPlainString): Likewise.
+	(pow): Likewise.
+
+2006-02-23  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* java/math/BigDecimal.java:
+	(toString): Rewrote this method to behave as specified.  Added API
+	comments to explain behaviour.
+	(scaleByPowerOfTen): New method.
+
+2006-02-22  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* java/math/BigDecimal.java:
+	(BigDecimal(char[], int, int, MathContext)): New constructor.
+	(BigDecimal(char[], MathContext)): Likewise.
+	(BigDecimal(char[])): Likewise.
+	(BigDecimal(char[], int, int)): Likewise.
+	(BigDecimal(String)): Fixed handling of exponent and scale.
+
+2006-02-21  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* java/math/BigDecimal.java:
+	(mathContext): New field.
+	(precision): Likewise.
+	(BigDecimal(int)): New constructor.
+	(BigDecimal(long)): Likewise.
+	(BigDecimal(BigInteger)): Added API docs.
+	(BigDecimal(BigInteger, int)): Removed incorrect NumberFormatException
+	and added API docs.
+	(plus): New method.
+	(round): Likewise.
+	(precision): Likewise.
+	(valueOf): Likewise.
+	(numDigitsInLong): New implementation method.
+
+2006-02-21  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* java/math/MathContext.java: New class.
+
 2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c:

Index: java/math/BigDecimal.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/math/BigDecimal.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- java/math/BigDecimal.java	26 Jan 2006 13:43:44 -0000	1.21
+++ java/math/BigDecimal.java	4 Jun 2006 17:59:12 -0000	1.22
@@ -1,5 +1,5 @@
 /* java.math.BigDecimal -- Arbitrary precision decimals.
-   Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@
 {
   private BigInteger intVal;
   private int scale;
+  private int precision = 0;
   private static final long serialVersionUID = 6108874887143696463L;
 
   /**
@@ -48,21 +49,21 @@
    * @since 1.5
    */
   public static final BigDecimal ZERO = 
-    new BigDecimal (BigInteger.valueOf (0), 0);
+    new BigDecimal (BigInteger.ZERO, 0);
 
   /**
    * The constant one as a BigDecimal with scale zero.
    * @since 1.5
    */
   public static final BigDecimal ONE = 
-    new BigDecimal (BigInteger.valueOf (1), 0);
+    new BigDecimal (BigInteger.ONE, 0);
 
   /**
    * The constant ten as a BigDecimal with scale zero.
    * @since 1.5
    */
   public static final BigDecimal TEN = 
-    new BigDecimal (BigInteger.valueOf (10), 0);
+    new BigDecimal (BigInteger.TEN, 0);
 
   public static final int ROUND_UP = 0;
   public static final int ROUND_DOWN = 1;
@@ -73,19 +74,181 @@
   public static final int ROUND_HALF_EVEN = 6;
   public static final int ROUND_UNNECESSARY = 7;
 
+  /**
+   * Constructs a new BigDecimal whose unscaled value is val and whose
+   * scale is zero.
+   * @param val the value of the new BigDecimal
+   * @since 1.5
+   */
+  public BigDecimal (int val)
+  {
+    this.intVal = BigInteger.valueOf(val);
+    this.scale = 0;
+  }
+  
+  /**
+   * Constructs a BigDecimal using the BigDecimal(int) constructor and then
+   * rounds according to the MathContext.
+   * @param val the value for the initial (unrounded) BigDecimal
+   * @param mc the MathContext specifying the rounding
+   * @throws ArithmeticException if the result is inexact but the rounding type
+   * is RoundingMode.UNNECESSARY
+   * @since 1.5
+   */
+  public BigDecimal (int val, MathContext mc)
+  {
+    this (val);
+    if (mc.getPrecision() != 0)
+      {
+        BigDecimal result = this.round(mc);
+        this.intVal = result.intVal;
+        this.scale = result.scale;
+        this.precision = result.precision;
+      }    
+  }
+  
+  /**
+   * Constructs a new BigDecimal whose unscaled value is val and whose
+   * scale is zero.
+   * @param val the value of the new BigDecimal
+   */
+  public BigDecimal (long val)
+  {
+    this.intVal = BigInteger.valueOf(val);
+    this.scale = 0;
+  }
+  
+  /**
+   * Constructs a BigDecimal from the long in the same way as BigDecimal(long)
+   * and then rounds according to the MathContext.
+   * @param val the long from which we create the initial BigDecimal
+   * @param mc the MathContext that specifies the rounding behaviour
+   * @throws ArithmeticException if the result is inexact but the rounding type
+   * is RoundingMode.UNNECESSARY
+   * @since 1.5
+   */
+  public BigDecimal (long val, MathContext mc)
+  {
+    this(val);
+    if (mc.getPrecision() != 0)
+      {
+        BigDecimal result = this.round(mc);
+        this.intVal = result.intVal;
+        this.scale = result.scale;
+        this.precision = result.precision;
+      }    
+  }
+  
+  /**
+   * Constructs a BigDecimal whose value is given by num rounded according to 
+   * mc.  Since num is already a BigInteger, the rounding refers only to the 
+   * precision setting in mc, if mc.getPrecision() returns an int lower than
+   * the number of digits in num, then rounding is necessary.
+   * @param num the unscaledValue, before rounding
+   * @param mc the MathContext that specifies the precision
+   * @throws ArithmeticException if the result is inexact but the rounding type
+   * is RoundingMode.UNNECESSARY
+   * * @since 1.5
+   */
+  public BigDecimal (BigInteger num, MathContext mc)
+  {
+    this (num, 0);
+    if (mc.getPrecision() != 0)
+      {
+        BigDecimal result = this.round(mc);
+        this.intVal = result.intVal;
+        this.scale = result.scale;
+        this.precision = result.precision;
+      }
+  }
+  
+  /**
+   * Constructs a BigDecimal from the String val according to the same
+   * rules as the BigDecimal(String) constructor and then rounds 
+   * according to the MathContext mc.
+   * @param val the String from which we construct the initial BigDecimal
+   * @param mc the MathContext that specifies the rounding
+   * @throws ArithmeticException if the result is inexact but the rounding type
+   * is RoundingMode.UNNECESSARY   
+   * @since 1.5
+   */
+  public BigDecimal (String val, MathContext mc)
+  {
+    this (val);
+    if (mc.getPrecision() != 0)
+      {
+        BigDecimal result = this.round(mc);
+        this.intVal = result.intVal;
+        this.scale = result.scale;
+        this.precision = result.precision;
+      }
+  }
+  
+  /**
+   * Constructs a BigDecimal whose unscaled value is num and whose
+   * scale is zero.
+   * @param num the value of the new BigDecimal
+   */
   public BigDecimal (BigInteger num) 
   {
     this (num, 0);
   }
 
-  public BigDecimal (BigInteger num, int scale) throws NumberFormatException 
+  /**
+   * Constructs a BigDecimal whose unscaled value is num and whose
+   * scale is scale.
+   * @param num
+   * @param scale
+   */
+  public BigDecimal (BigInteger num, int scale)
   {
-    if (scale < 0) 
-      throw new NumberFormatException ("scale of " + scale + " is < 0");
     this.intVal = num;
     this.scale = scale;
   }
 
+  /**
+   * Constructs a BigDecimal using the BigDecimal(BigInteger, int) 
+   * constructor and then rounds according to the MathContext.
+   * @param num the unscaled value of the unrounded BigDecimal
+   * @param scale the scale of the unrounded BigDecimal
+   * @param mc the MathContext specifying the rounding
+   * @throws ArithmeticException if the result is inexact but the rounding type
+   * is RoundingMode.UNNECESSARY
+   * @since 1.5
+   */
+  public BigDecimal (BigInteger num, int scale, MathContext mc)
+  {
+    this (num, scale);
+    if (mc.getPrecision() != 0)
+      {
+        BigDecimal result = this.round(mc);
+        this.intVal = result.intVal;
+        this.scale = result.scale;
+        this.precision = result.precision;
+      }
+  }
+
+  /**
+   * Constructs a BigDecimal in the same way as BigDecimal(double) and then
+   * rounds according to the MathContext.
+   * @param num the double from which the initial BigDecimal is created
+   * @param mc the MathContext that specifies the rounding behaviour
+   * @throws ArithmeticException if the result is inexact but the rounding type
+   * is RoundingMode.UNNECESSARY 
+   * @since 1.5
+   */
+  public BigDecimal (double num, MathContext mc)
+  {
+    this (num);
+    if (mc.getPrecision() != 0)
+      {
+        BigDecimal result = this.round(mc);
+        this.intVal = result.intVal;
+        this.scale = result.scale;
+        this.precision = result.precision;
+      }
+  }
+  
   public BigDecimal (double num) throws NumberFormatException 
   {
     if (Double.isInfinite (num) || Double.isNaN (num))
@@ -136,6 +299,209 @@
       }
   }
 
+  /**
+   * Constructs a BigDecimal from the char subarray and rounding 
+   * according to the MathContext.
+   * @param in the char array
+   * @param offset the start of the subarray
+   * @param len the length of the subarray
+   * @param mc the MathContext for rounding
+   * @throws NumberFormatException if the char subarray is not a valid 
+   * BigDecimal representation
+   * @throws ArithmeticException if the result is inexact but the rounding 
+   * mode is RoundingMode.UNNECESSARY
+   * @since 1.5
+   */
+  public BigDecimal(char[] in, int offset, int len, MathContext mc)
+  {
+    this(in, offset, len);
+    // If mc has precision other than zero then we must round.
+    if (mc.getPrecision() != 0)
+      {
+        BigDecimal temp = this.round(mc);
+        this.intVal = temp.intVal;
+        this.scale = temp.scale;
+        this.precision = temp.precision;
+      }
+  }
+  
+  /**
+   * Constructs a BigDecimal from the char array and rounding according
+   * to the MathContext. 
+   * @param in the char array
+   * @param mc the MathContext
+   * @throws NumberFormatException if <code>in</code> is not a valid BigDecimal
+   * representation
+   * @throws ArithmeticException if the result is inexact but the rounding mode
+   * is RoundingMode.UNNECESSARY
+   * @since 1.5
+   */
+  public BigDecimal(char[] in, MathContext mc)
+  {
+    this(in, 0, in.length);
+    // If mc has precision other than zero then we must round.
+    if (mc.getPrecision() != 0)
+      {
+        BigDecimal temp = this.round(mc);
+        this.intVal = temp.intVal;
+        this.scale = temp.scale;
+        this.precision = temp.precision;
+      } 
+  }
+  
+  /**
+   * Constructs a BigDecimal from the given char array, accepting the same
+   * sequence of characters as the BigDecimal(String) constructor.
+   * @param in the char array
+   * @throws NumberFormatException if <code>in</code> is not a valid BigDecimal
+   * representation
+   * @since 1.5
+   */
+  public BigDecimal(char[] in)
+  {
+    this(in, 0, in.length);
+  }
+  
+  /**
+   * Constructs a BigDecimal from a char subarray, accepting the same sequence
+   * of characters as the BigDecimal(String) constructor.  
+   * @param in the char array
+   * @param offset the start of the subarray
+   * @param len the length of the subarray
+   * @throws NumberFormatException if <code>in</code> is not a valid
+   * BigDecimal representation.
+   * @since 1.5
+   */
+  public BigDecimal(char[] in, int offset, int len)
+  {
+    //  start is the index into the char array where the significand starts
+    int start = offset;
+    //  end is one greater than the index of the last character used
+    int end = offset + len;
+    //  point is the index into the char array where the exponent starts
+    //  (or, if there is no exponent, this is equal to end)
+    int point = offset;
+    //  dot is the index into the char array where the decimal point is 
+    //  found, or -1 if there is no decimal point
+    int dot = -1;
+    
+    //  The following examples show what these variables mean.  Note that
+    //  point and dot don't yet have the correct values, they will be 
+    //  properly assigned in a loop later on in this method.
+    //
+    //  Example 1
+    //
+    //         +  1  0  2  .  4  6  9
+    //  __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __
+    //
+    //  offset = 2, len = 8, start = 3, dot = 6, point = end = 10
+    //
+    //  Example 2
+    //
+    //         +  2  3  4  .  6  1  3  E  -  1
+    //  __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __
+    //
+    //  offset = 2, len = 11, start = 3, dot = 6, point = 10, end = 13
+    //
+    //  Example 3
+    //
+    //         -  1  2  3  4  5  e  7  
+    //  __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __
+    //
+    //  offset = 2, len = 8, start = 3, dot = -1, point = 8, end = 10 
+    
+    //  Determine the sign of the number.
+    boolean negative = false;
+    if (in[offset] == '+')
+      {
+        ++start;
+        ++point;
+      }
+    else if (in[offset] == '-')
+      {
+        ++start;
+        ++point;
+        negative = true;
+      }
+
+    //  Check each character looking for the decimal point and the 
+    //  start of the exponent.
+    while (point < end)
+      {
+        char c = in[point];
+        if (c == '.')
+          {
+            // If dot != -1 then we've seen more than one decimal point.
+            if (dot != -1)
+              throw new NumberFormatException("multiple `.'s in number");
+            dot = point;
+          }
+        // Break when we reach the start of the exponent.
+        else if (c == 'e' || c == 'E')
+          break;
+        // Throw an exception if the character was not a decimal or an 
+        // exponent and is not a digit.
+        else if (!Character.isDigit(c))
+          throw new NumberFormatException("unrecognized character at " + point
+                                          + ": " + c);
+        ++point;
+      }
+
+    // val is a StringBuilder from which we'll create a BigInteger
+    // which will be the unscaled value for this BigDecimal
+    StringBuilder val = new StringBuilder(point - start - 1);
+    if (dot != -1)
+      {
+        // If there was a decimal we must combine the two parts that 
+        // contain only digits and we must set the scale properly.
+        val.append(in, start, dot - start);
+        val.append(in, dot + 1, point - dot - 1);
+        scale = point - 1 - dot;
+      }
+    else
+      {
+        // If there was no decimal then the unscaled value is just the number
+        // formed from all the digits and the scale is zero.
+        val.append(in, start, point - start);
+        scale = 0;
+      }
+    if (val.length() == 0)
+      throw new NumberFormatException("no digits seen");
+
+    // Prepend a negative sign if necessary.
+    if (negative)
+      val.insert(0, '-');
+    intVal = new BigInteger(val.toString());
+
+    // Now parse exponent.
+    // If point < end that means we broke out of the previous loop when we
+    // saw an 'e' or an 'E'.
+    if (point < end)
+      {
+        point++;
+        // Ignore a '+' sign.
+        if (in[point] == '+')
+          point++;
+
+        // Throw an exception if there were no digits found after the 'e'
+        // or 'E'.
+        if (point >= end)
+          throw new NumberFormatException("no exponent following e or E");
+
+        try
+          {
+            // Adjust the scale according to the exponent.  
+            // Remember that the value of a BigDecimal is
+            // unscaledValue x Math.pow(10, -scale)
+            scale -= Integer.parseInt(new String(in, point, end - point));
+          }
+        catch (NumberFormatException ex)
+          {
+            throw new NumberFormatException("malformed exponent");
+          }
+      }
+  }
+  
   public BigDecimal (String num) throws NumberFormatException 
   {
     int len = num.length();
@@ -200,17 +566,7 @@
 	
         try 
 	  {
-	    int exp = Integer.parseInt (num.substring (point));
-	    exp -= scale;
-	    if (signum () == 0)
-	      scale = 0;
-	    else if (exp > 0)
-	      {
-		intVal = intVal.multiply (BigInteger.valueOf (10).pow (exp));
-		scale = 0;
-	      }
-	    else
-	      scale = - exp;
+        scale -= Integer.parseInt (num.substring (point));
 	  }
         catch (NumberFormatException ex) 
 	  {
@@ -247,23 +603,68 @@
     BigInteger op1 = intVal;
     BigInteger op2 = val.intVal;
     if (scale < val.scale)
-      op1 = op1.multiply (BigInteger.valueOf (10).pow (val.scale - scale));
+      op1 = op1.multiply (BigInteger.TEN.pow (val.scale - scale));
     else if (scale > val.scale)
-      op2 = op2.multiply (BigInteger.valueOf (10).pow (scale - val.scale));
+      op2 = op2.multiply (BigInteger.TEN.pow (scale - val.scale));
 
     return new BigDecimal (op1.add (op2), Math.max (scale, val.scale));
   }
 
+  /**
+   * Returns a BigDecimal whose value is found first by calling the 
+   * method add(val) and then by rounding according to the MathContext mc.
+   * @param val the augend
+   * @param mc the MathContext for rounding
+   * @throws ArithmeticException if the value is inexact but the rounding is
+   * RoundingMode.UNNECESSARY
+   * @return <code>this</code> + <code>val</code>, rounded if need be
+   * @since 1.5
+   */
+  public BigDecimal add (BigDecimal val, MathContext mc)
+  {
+    return add(val).round(mc);
+  }
+
   public BigDecimal subtract (BigDecimal val) 
   {
     return this.add(val.negate());
   }
 
+  /**
+   * Returns a BigDecimal whose value is found first by calling the 
+   * method subtract(val) and then by rounding according to the MathContext mc.
+   * @param val the subtrahend
+   * @param mc the MathContext for rounding
+   * @throws ArithmeticException if the value is inexact but the rounding is
+   * RoundingMode.UNNECESSARY
+   * @return <code>this</code> - <code>val</code>, rounded if need be
+   * @since 1.5
+   */
+  public BigDecimal subtract (BigDecimal val, MathContext mc)
+  {
+    return subtract(val).round(mc);
+  }
+
   public BigDecimal multiply (BigDecimal val) 
   {
     return new BigDecimal (intVal.multiply (val.intVal), scale + val.scale);
   }
 
+  /**
+   * Returns a BigDecimal whose value is (this x val) before it is rounded
+   * according to the MathContext mc. 
+   * @param val the multiplicand
+   * @param mc the MathContext for rounding
+   * @return a new BigDecimal with value approximately (this x val)
+   * @throws ArithmeticException if the value is inexact but the rounding mode
+   * is RoundingMode.UNNECESSARY
+   * @since 1.5
+   */
+  public BigDecimal multiply (BigDecimal val, MathContext mc)
+  {
+    return multiply(val).round(mc);
+  }
+
   public BigDecimal divide (BigDecimal val, int roundingMode) 
     throws ArithmeticException, IllegalArgumentException 
   {
@@ -277,9 +678,6 @@
       throw 
 	new IllegalArgumentException("illegal rounding mode: " + roundingMode);
 
-    if (newScale < 0)
-      throw new ArithmeticException ("scale is negative: " + newScale);
-
     if (intVal.signum () == 0)	// handle special case of 0.0/0.0
       return newScale == 0 ? ZERO : new BigDecimal (ZERO.intVal, newScale);
     
@@ -290,11 +688,11 @@
       {
 	// Effectively increase the scale of val to avoid an
 	// ArithmeticException for a negative power.
-        valIntVal = valIntVal.multiply (BigInteger.valueOf (10).pow (-power));
+        valIntVal = valIntVal.multiply (BigInteger.TEN.pow (-power));
 	power = 0;
       }
 
-    BigInteger dividend = intVal.multiply (BigInteger.valueOf (10).pow (power));
+    BigInteger dividend = intVal.multiply (BigInteger.TEN.pow (power));
     
     BigInteger parts[] = dividend.divideAndRemainder (valIntVal);
 
@@ -303,7 +701,7 @@
       return new BigDecimal (unrounded, newScale);
 
     if (roundingMode == ROUND_UNNECESSARY)
-      throw new ArithmeticException ("newScale is not large enough");
+      throw new ArithmeticException ("Rounding necessary");
 
     int sign = intVal.signum () * valIntVal.signum ();
 
@@ -349,15 +747,77 @@
     return new BigDecimal (unrounded, newScale);
   }
     
-  public int compareTo (BigDecimal val) 
+  /**
+   * Returns a BigDecimal whose value is the remainder in the quotient
+   * this / val.  This is obtained by 
+   * subtract(divideToIntegralValue(val).multiply(val)).  
+   * @param val the divisor
+   * @return a BigDecimal whose value is the remainder
+   * @throws ArithmeticException if val == 0
+   * @since 1.5
+   */
+  public BigDecimal remainder(BigDecimal val)
+  {
+    return subtract(divideToIntegralValue(val).multiply(val));
+  }
+  
+  /**
+   * Returns a BigDecimal array, the first element of which is the integer part
+   * of this / val, and the second element of which is the remainder of 
+   * that quotient.
+   * @param val the divisor
+   * @return the above described BigDecimal array
+   * @throws ArithmeticException if val == 0
+   * @since 1.5
+   */
+  public BigDecimal[] divideAndRemainder(BigDecimal val)
+  {
+    BigDecimal[] result = new BigDecimal[2];
+    result[0] = divideToIntegralValue(val);
+    result[1] = subtract(result[0].multiply(val));
+    return result;
+  }
+  
+  /**
+   * Returns a BigDecimal whose value is the integer part of the quotient 
+   * this / val.  The preferred scale is this.scale - val.scale.
+   * @param val the divisor
+   * @return a BigDecimal whose value is the integer part of this / val.
+   * @throws ArithmeticException if val == 0
+   * @since 1.5
+   */
+  public BigDecimal divideToIntegralValue(BigDecimal val)
+  {
+    return divide(val, ROUND_DOWN).floor().setScale(scale - val.scale, ROUND_DOWN);
+  }
+  
+  /**
+   * Mutates this BigDecimal into one with no fractional part, whose value is 
+   * equal to the largest integer that is <= to this BigDecimal.  Note that
+   * since this method is private it is okay to mutate this BigDecimal.
+   * @return the BigDecimal obtained through the floor operation on this 
+   * BigDecimal.
+   */
+  private BigDecimal floor()
+  {
+    if (scale <= 0)
+      return this;
+    String intValStr = intVal.toString();
+    intValStr = intValStr.substring(0, intValStr.length() - scale);
+    intVal = new BigInteger(intValStr).multiply(BigInteger.TEN.pow(scale));
+    return this;
+  }
+    
+  public int compareTo (Object obj) 
   {
+    BigDecimal val = (BigDecimal) obj;
     if (scale == val.scale)
       return intVal.compareTo (val.intVal);
 
     BigInteger thisParts[] = 
-      intVal.divideAndRemainder (BigInteger.valueOf (10).pow (scale));
+      intVal.divideAndRemainder (BigInteger.TEN.pow (scale));
     BigInteger valParts[] =
-      val.intVal.divideAndRemainder (BigInteger.valueOf (10).pow (val.scale));
+      val.intVal.divideAndRemainder (BigInteger.TEN.pow (val.scale));
     
     int compare;
     if ((compare = thisParts[0].compareTo (valParts[0])) != 0)
@@ -377,11 +837,6 @@
     return thisParts[1].compareTo (valParts[1]);
   }
 
-  public int compareTo (Object val) 
-  {
-    return(compareTo((BigDecimal)val));
-  }
-
   public boolean equals (Object o) 
   {
     return (o instanceof BigDecimal 
@@ -430,7 +885,7 @@
       return new BigDecimal (intVal, scale - n);
 
     return new BigDecimal (intVal.multiply 
-			   (BigInteger.valueOf (10).pow (n - scale)), 0);
+			   (BigInteger.TEN.pow (n - scale)), 0);
   }
 
   public int signum () 
@@ -458,20 +913,366 @@
     return new BigDecimal (intVal.negate (), scale);
   }
 
-  public String toString () 
+  /**
+   * Returns a BigDecimal whose value is found first by negating this via
+   * the negate() method, then by rounding according to the MathContext mc.
+   * @param mc the MathContext for rounding
+   * @return a BigDecimal whose value is approximately (-this)
+   * @throws ArithmeticException if the value is inexact but the rounding mode
+   * is RoundingMode.UNNECESSARY
+   * @since 1.5
+   */
+  public BigDecimal negate(MathContext mc)
   {
+    BigDecimal result = negate();
+    if (mc.getPrecision() != 0)
+      result = result.round(mc);
+    return result;
+  }
+  
+  /**
+   * Returns this BigDecimal.  This is included for symmetry with the 
+   * method negate().
+   * @return this
+   * @since 1.5
+   */
+  public BigDecimal plus()
+  {
+    return this;
+  }
+  
+  /**
+   * Returns a BigDecimal whose value is found by rounding <code>this</code> 
+   * according to the MathContext.  This is the same as round(MathContext).
+   * @param mc the MathContext for rounding
+   * @return a BigDecimal whose value is <code>this</code> before being rounded
+   * @throws ArithmeticException if the value is inexact but the rounding mode
+   * is RoundingMode.UNNECESSARY
+   * @since 1.5
+   */
+  public BigDecimal plus(MathContext mc)
+  {
+    return round(mc);
+  }
+   
+  /**
+   * Returns a BigDecimal which is this BigDecimal rounded according to the
+   * MathContext rounding settings.
+   * @param mc the MathContext that tells us how to round
+   * @return the rounded BigDecimal
+   */
+  public BigDecimal round(MathContext mc)
+  {
+    int mcPrecision = mc.getPrecision();
+    int numToChop = precision() - mcPrecision;
+    // If mc specifies not to chop any digits or if we've already chopped 
+    // enough digits (say by using a MathContext in the constructor for this
+    // BigDecimal) then just return this.
+    if (mcPrecision == 0 || numToChop <= 0)
+      return this;
+    
+    // Make a new BigDecimal which is the correct power of 10 to chop off
+    // the required number of digits and then call divide.
+    BigDecimal div = new BigDecimal(BigInteger.TEN.pow(numToChop));
+    BigDecimal rounded = divide(div, scale, 4);
+    rounded.scale -= numToChop;
+    rounded.precision = mcPrecision;
+    return rounded;
+  }
+
+  /**
+   * Returns the precision of this BigDecimal (the number of digits in the
+   * unscaled value).  The precision of a zero value is 1.
+   * @return the number of digits in the unscaled value, or 1 if the value 
+   * is zero.
+   */
+  public int precision()
+  {
+    if (precision == 0)
+      {
+        if (intVal.compareTo(BigInteger.TEN.pow(18)) == 1)
+          precision = numDigitsInBigInteger(intVal);
+        else
+          precision = numDigitsInLong(intVal.longValue());
+      }    
+    return precision;
+  }
+  
+  /**
+   * This method is used to determine the precision of BigIntegers with 19 or
+   * more digits.
+   * @param b the BigInteger
+   * @return the number of digits in <code>b</code>
+   */
+  int numDigitsInBigInteger(BigInteger b)
+  {
+    int i = 19;
+    BigInteger comp = BigInteger.TEN.pow(i);
+    while (b.compareTo(comp) >= 0)      
+      comp = BigInteger.TEN.pow(++i);
+          
+    return i;
+  }
+
+  /**
+   * This method determines the number of digits in the long value l. 
+   * @param l1 the long value
+   * @return the number of digits in l
+   */
+  private static int numDigitsInLong(long l1)
+  {
+    long l = l1 >= 0 ? l1 : -l1; 
+    // We divide up the range in a binary fashion, this first if
+    // takes care of numbers with 1 to 9 digits.
+    if (l < 1000000000L)
+    {
+      // This if is for numbers with 1 to 5 digits.
+      if (l < 100000L)
+        {
+          if (l < 100L)
+            return (l < 10L) ? 1 : 2;
+          if (l < 10000L)
+            return (l < 1000L) ? 3 : 4;
+          return 5;
+        }
+      // Here we handle numbers with 6 to 9 digits.
+      if (l < 10000000L)
+        return (l < 1000000L) ? 6 : 7;
+      return (l < 100000000L) ? 8 : 9;
+    }
+    // If we are at this point that means we didn't enter the loop for
+    // numbers with 1 to 9 digits, so our number has 10 to 19 digits. 
+    // This first if handles numbers with 10 to 14 digits.
+    if (l < 100000000000000L)
+      {
+        // This handles numbers with 10 to 12 digits.
+        if (l < 1000000000000L)
+          {
+            if (l < 100000000000L)
+              return (l < 10000000000L) ? 10 : 11;
+            return 12;
+          }
+        // This handles numbers with 13 or 14 digits.
+        return (l < 10000000000000L) ? 13 : 14;
+      }
+    // Finally we handle numbers with 15 to 19 digits.
+    if (l < 100000000000000000L)
+      {
+        // 15 to 17 digits.
+        if (l < 1000000000000000L)
+          return 15;
+        return (l < 10000000000000000L) ? 16 : 17;
+      }
+    // 18 or 19 digits.
+    return (l < 1000000000000000000L) ? 18 : 19;
+  }
+
+  /**
+   * Returns the String representation of this BigDecimal, using scientific
+   * notation if necessary.  The following steps are taken to generate
+   * the result:
+   * 
+   * 1. the BigInteger unscaledValue's toString method is called and if
+   * <code>scale == 0<code> is returned.
+   * 2. an <code>int adjExp</code> is created which is equal to the negation
+   * of <code>scale</code> plus the number of digits in the unscaled value, 
+   * minus one.
+   * 3. if <code>scale >= 0 && adjExp >= -6</code> then we represent this 
+   * BigDecimal without scientific notation.  A decimal is added if the 
+   * scale is positive and zeros are prepended as necessary.
+   * 4. if scale is negative or adjExp is less than -6 we use scientific
+   * notation.  If the unscaled value has more than one digit, a decimal 
+   * as inserted after the first digit, the character 'E' is appended
+   * and adjExp is appended.
+   */
+  public String toString()
+  {
+    // bigStr is the String representation of the unscaled value.  If
+    // scale is zero we simply return this.
     String bigStr = intVal.toString();
     if (scale == 0) 
       return bigStr;
 
+    // This is the adjusted exponent described above.
+    int adjExp = -scale + (numDigitsInLong(intVal.longValue()) - 1);
+    StringBuilder val = new StringBuilder();
+
+    if (scale >= 0 && adjExp >= -6)
+      {
+        // Convert to character form without scientific notation.
     boolean negative = (bigStr.charAt(0) == '-');
+        int point = bigStr.length() - scale - (negative ? 1 : 0);
+        if (point <= 0)
+          {
+            // Zeros need to be prepended to the StringBuilder.
+            if (negative)
+              val.append('-');
+            // Prepend a '0' and a '.' and then as many more '0's as necessary.
+            val.append('0').append('.');
+            while (point < 0)
+              {
+                val.append('0');
+                point++;
+              }
+            // Append the unscaled value.
+            val.append(bigStr.substring(negative ? 1 : 0));
+          }
+        else
+          {
+            // No zeros need to be prepended so the String is simply the 
+            // unscaled value with the decimal point inserted.
+            val.append(bigStr);
+            val.insert(point + (negative ? 1 : 0), '.');
+          }
+      }
+    else
+      {
+        // We must use scientific notation to represent this BigDecimal.
+        val.append(bigStr);
+        // If there is more than one digit in the unscaled value we put a 
+        // decimal after the first digit.
+        if (bigStr.length() > 1)
+          val.insert(1, '.');
+        // And then append 'E' and the exponent (adjExp).
+        val.append('E');
+        if (adjExp >= 0)
+          val.append('+');
+        val.append(adjExp);
+      }
+    return val.toString();
+  }
+
+  /**
+   * Returns the String representation of this BigDecimal, using engineering
+   * notation if necessary.  This is similar to toString() but when exponents 
+   * are used the exponent is made to be a multiple of 3 such that the integer
+   * part is between 1 and 999.
+   * 
+   * @return a String representation of this BigDecimal in engineering notation
+   * @since 1.5
+   */
+  public String toEngineeringString()
+  {
+    // bigStr is the String representation of the unscaled value.  If
+    // scale is zero we simply return this.
+    String bigStr = intVal.toString();
+    if (scale == 0)
+      return bigStr;
+
+    // This is the adjusted exponent described above.
+    int adjExp = -scale + (numDigitsInLong(intVal.longValue()) - 1);
+    StringBuilder val = new StringBuilder();
 
+    if (scale >= 0 && adjExp >= -6)
+      {
+        // Convert to character form without scientific notation.
+        boolean negative = (bigStr.charAt(0) == '-');
     int point = bigStr.length() - scale - (negative ? 1 : 0);
+        if (point <= 0)
+          {
+            // Zeros need to be prepended to the StringBuilder.
+            if (negative)
+              val.append('-');
+            // Prepend a '0' and a '.' and then as many more '0's as necessary.
+            val.append('0').append('.');
+            while (point < 0)
+              {
+                val.append('0');
+                point++;
+              }
+            // Append the unscaled value.
+            val.append(bigStr.substring(negative ? 1 : 0));
+          }
+        else
+          {
+            // No zeros need to be prepended so the String is simply the 
+            // unscaled value with the decimal point inserted.
+            val.append(bigStr);
+            val.insert(point + (negative ? 1 : 0), '.');
+          }
+      }
+    else
+      {
+        // We must use scientific notation to represent this BigDecimal.
+        // The exponent must be a multiple of 3 and the integer part
+        // must be between 1 and 999.
+        val.append(bigStr);        
+        int zeros = adjExp % 3;
+        int dot = 1;
+        if (adjExp > 0)
+          {
+            // If the exponent is positive we just move the decimal to the
+            // right and decrease the exponent until it is a multiple of 3.
+            dot += zeros;
+            adjExp -= zeros;
+          }
+        else
+          {
+            // If the exponent is negative then we move the dot to the right
+            // and decrease the exponent (increase its magnitude) until 
+            // it is a multiple of 3.  Note that this is not adjExp -= zeros
+            // because the mod operator doesn't give us the distance to the 
+            // correct multiple of 3.  (-5 mod 3) is -2 but the distance from
+            // -5 to the correct multiple of 3 (-6) is 1, not 2.
+            if (zeros == -2)
+              {
+                dot += 1;
+                adjExp -= 1;
+              }
+            else if (zeros == -1)
+              {
+                dot += 2;
+                adjExp -= 2;
+              }
+          }
+
+        // Either we have to append zeros because, for example, 1.1E+5 should
+        // be 110E+3, or we just have to put the decimal in the right place.
+        if (dot > val.length())
+          {
+            while (dot > val.length())
+              val.append('0');
+          }
+        else if (bigStr.length() > dot)
+          val.insert(dot, '.');
 
-    StringBuffer sb = new StringBuffer(bigStr.length() + 2 +
-				       (point <= 0 ? (-point + 1) : 0));
+        // And then append 'E' and the exponent (adjExp).
+        val.append('E');
+        if (adjExp >= 0)
+          val.append('+');
+        val.append(adjExp);
+      }
+    return val.toString();
+  }
+  
+  /**
+   * Returns a String representation of this BigDecimal without using 
+   * scientific notation.  This is how toString() worked for releases 1.4
+   * and previous.  Zeros may be added to the end of the String.  For
+   * example, an unscaled value of 1234 and a scale of -3 would result in 
+   * the String 1234000, but the toString() method would return 
+   * 1.234E+6.
+   * @return a String representation of this BigDecimal
+   * @since 1.5
+   */
+  public String toPlainString()
+  {
+    // If the scale is zero we simply return the String representation of the 
+    // unscaled value.
+    String bigStr = intVal.toString();
+    if (scale == 0)
+      return bigStr;
+
+    // Remember if we have to put a negative sign at the start.
+    boolean negative = (bigStr.charAt(0) == '-');
+
+    int point = bigStr.length() - scale - (negative ? 1 : 0);
+
+    StringBuffer sb = new StringBuffer(bigStr.length() + 2
+                                       + (point <= 0 ? (-point + 1) : 0));
     if (point <= 0)
       {
+        // We have to prepend zeros and a decimal point.
         if (negative)
           sb.append('-');
         sb.append('0').append('.');
@@ -482,18 +1283,61 @@
           }
         sb.append(bigStr.substring(negative ? 1 : 0));
       }
-    else
+    else if (point < bigStr.length())
       {
+        // No zeros need to be prepended or appended, just put the decimal
+        // in the right place.
 	sb.append(bigStr);
 	sb.insert(point + (negative ? 1 : 0), '.');
       }
+    else
+      {
+        // We must append zeros instead of using scientific notation.
+        sb.append(bigStr);
+        for (int i = bigStr.length(); i < point; i++)
+          sb.append('0');
+      }
     return sb.toString();
   }
 
+  /**
+   * Converts this BigDecimal to a BigInteger.  Any fractional part will
+   * be discarded.
+   * @return a BigDecimal whose value is equal to floor[this]
+   */
   public BigInteger toBigInteger () 
   {
-    return scale == 0 ? intVal :
-      intVal.divide (BigInteger.valueOf (10).pow (scale));
+    // If scale > 0 then we must divide, if scale > 0 then we must multiply,
+    // and if scale is zero then we just return intVal;
+    if (scale > 0)
+      return intVal.divide (BigInteger.TEN.pow (scale));
+    else if (scale < 0)
+      return intVal.multiply(BigInteger.TEN.pow(-scale));
+    return intVal;
+  }
+  
+  /**
+   * Converts this BigDecimal into a BigInteger, throwing an 
+   * ArithmeticException if the conversion is not exact.
+   * @return a BigInteger whose value is equal to the value of this BigDecimal
+   * @since 1.5
+   */
+  public BigInteger toBigIntegerExact()
+  {
+    if (scale > 0)
+      {
+        // If we have to divide, we must check if the result is exact.
+        BigInteger[] result = 
+          intVal.divideAndRemainder(BigInteger.TEN.pow(scale));
+        if (result[1].equals(BigInteger.ZERO))
+          return result[0];
+        throw new ArithmeticException("No exact BigInteger representation");
+      }
+    else if (scale < 0)
+      // If we're multiplying instead, then we needn't check for exactness.
+      return intVal.multiply(BigInteger.TEN.pow(-scale));
+    // If the scale is zero we can simply return intVal.
+    return intVal;
   }
 
   public int intValue () 
@@ -501,6 +1345,34 @@
     return toBigInteger ().intValue ();
   }
 
+  /**
+   * Returns a BigDecimal which is numerically equal to this BigDecimal but 
+   * with no trailing zeros in the representation.  For example, if this 
+   * BigDecimal has [unscaledValue, scale] = [6313000, 4] this method returns
+   * a BigDecimal with [unscaledValue, scale] = [6313, 1].  As another 
+   * example, [12400, -2] would become [124, -4].
+   * @return a numerically equal BigDecimal with no trailing zeros
+   */
+  public BigDecimal stripTrailingZeros()  
+  {
+    String intValStr = intVal.toString();
+    int newScale = scale;
+    int pointer = intValStr.length() - 1;
+    // This loop adjusts pointer which will be used to give us the substring
+    // of intValStr to use in our new BigDecimal, and also accordingly
+    // adjusts the scale of our new BigDecimal.
+    while (intValStr.charAt(pointer) == '0')
+      {
+        pointer --;
+        newScale --;
+      }
+    // Create a new BigDecimal with the appropriate substring and then
+    // set its scale.
+    BigDecimal result = new BigDecimal(intValStr.substring(0, pointer + 1));    
+    result.scale = newScale;
+    return result;
+  }
+
   public long longValue ()
   {
     return toBigInteger().longValue();
@@ -526,4 +1398,165 @@
   {
     return divide (ONE, scale, roundingMode);
   }
+   
+  /**
+   * Returns a new BigDecimal constructed from the BigDecimal(String) 
+   * constructor using the Double.toString(double) method to obtain
+   * the String.
+   * @param val the double value used in Double.toString(double)
+   * @return a BigDecimal representation of val
+   * @throws NumberFormatException if val is NaN or infinite
+   * @since 1.5
+   */
+  public static BigDecimal valueOf(double val)
+  {
+    if (Double.isInfinite(val) || Double.isNaN(val))
+      throw new NumberFormatException("argument cannot be NaN or infinite.");
+    return new BigDecimal(Double.toString(val));
+  }
+  
+  /**
+   * Returns a BigDecimal whose numerical value is the numerical value
+   * of this BigDecimal multiplied by 10 to the power of <code>n</code>. 
+   * @param n the power of ten
+   * @return the new BigDecimal
+   * @since 1.5
+   */
+  public BigDecimal scaleByPowerOfTen(int n)
+  {
+    BigDecimal result = new BigDecimal(intVal, scale - n);
+    result.precision = precision;
+    return result;
+  }
+  
+  /**
+   * Returns a BigDecimal whose value is <code>this</code> to the power of 
+   * <code>n</code>. 
+   * @param n the power
+   * @return the new BigDecimal
+   * @since 1.5
+   */
+  public BigDecimal pow(int n)
+  {
+    if (n < 0 || n > 999999999)
+      throw new ArithmeticException("n must be between 0 and 999999999");
+    BigDecimal result = new BigDecimal(intVal.pow(n), scale * n);
+    return result;
+  }
+  
+  /**
+   * Returns a BigDecimal whose value is determined by first calling pow(n)
+   * and then by rounding according to the MathContext mc.
+   * @param n the power
+   * @param mc the MathContext
+   * @return the new BigDecimal
+   * @throws ArithmeticException if n < 0 or n > 999999999 or if the result is
+   * inexact but the rounding is RoundingMode.UNNECESSARY
+   * @since 1.5
+   */
+  public BigDecimal pow(int n, MathContext mc)
+  {
+    // FIXME: The specs claim to use the X3.274-1996 algorithm.  We
+    // currently do not.
+    return pow(n).round(mc);
+  }
+  
+  /**
+   * Returns a BigDecimal whose value is the absolute value of this BigDecimal
+   * with rounding according to the given MathContext.
+   * @param mc the MathContext
+   * @return the new BigDecimal
+   */
+  public BigDecimal abs(MathContext mc)
+  {
+    BigDecimal result = abs();
+    result = result.round(mc);
+    return result;
+  }
+  
+  /**
+   * Returns the size of a unit in the last place of this BigDecimal.  This
+   * returns a BigDecimal with [unscaledValue, scale] = [1, this.scale()].
+   * @return the size of a unit in the last place of <code>this</code>.
+   * @since 1.5
+   */
+  public BigDecimal ulp()
+  {
+    return new BigDecimal(BigInteger.ONE, scale);
+  }
+  
+  /**
+   * Converts this BigDecimal to a long value.
+   * @return the long value
+   * @throws ArithmeticException if rounding occurs or if overflow occurs
+   * @since 1.5
+   */
+  public long longValueExact()
+  {
+    // Set scale will throw an exception if rounding occurs.
+    BigDecimal temp = setScale(0, ROUND_UNNECESSARY);
+    BigInteger tempVal = temp.intVal;
+    // Check for overflow.
+    long result = intVal.longValue();
+    if (tempVal.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 1
+        || (result < 0 && signum() == 1) || (result > 0 && signum() == -1))
+      throw new ArithmeticException("this BigDecimal is too " +
+            "large to fit into the return type");
+    
+    return intVal.longValue();
+  }
+  
+  /**
+   * Converts this BigDecimal into an int by first calling longValueExact
+   * and then checking that the <code>long</code> returned from that
+   * method fits into an <code>int</code>.
+   * @return an int whose value is <code>this</code>
+   * @throws ArithmeticException if this BigDecimal has a fractional part
+   * or is too large to fit into an int.
+   * @since 1.5
+   */
+  public int intValueExact()
+  {
+    long temp = longValueExact();
+    int result = (int)temp;
+    if (result != temp)
+      throw new ArithmeticException ("this BigDecimal cannot fit into an int");
+    return result;
+  }
+  
+  /**
+   * Converts this BigDecimal into a byte by first calling longValueExact
+   * and then checking that the <code>long</code> returned from that
+   * method fits into a <code>byte</code>.
+   * @return a byte whose value is <code>this</code>
+   * @throws ArithmeticException if this BigDecimal has a fractional part
+   * or is too large to fit into a byte.
+   * @since 1.5
+   */
+  public byte byteValueExact()
+  {
+    long temp = longValueExact();
+    byte result = (byte)temp;
+    if (result != temp)
+      throw new ArithmeticException ("this BigDecimal cannot fit into a byte");
+    return result;
+  }
+  
+  /**
+   * Converts this BigDecimal into a short by first calling longValueExact
+   * and then checking that the <code>long</code> returned from that
+   * method fits into a <code>short</code>.
+   * @return a short whose value is <code>this</code>
+   * @throws ArithmeticException if this BigDecimal has a fractional part
+   * or is too large to fit into a short.
+   * @since 1.5
+   */
+  public short shortValueExact()
+  {
+    long temp = longValueExact();
+    short result = (short)temp;
+    if (result != temp)
+      throw new ArithmeticException ("this BigDecimal cannot fit into a short");
+    return result;
+  }
 }

Index: java/math/MathContext.java
===================================================================
RCS file: java/math/MathContext.java
diff -N java/math/MathContext.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/math/MathContext.java	4 Jun 2006 17:59:12 -0000	1.2
@@ -0,0 +1,144 @@
+/* MathContext.java -- 
+   Copyright (C) 1999, 2000, 2002, 2004, 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.math;
+
+import java.io.Serializable;
+
+/**
+ * Immutable objects describing settings such as rounding mode and digit
+ * precision for numerical operations such as those in the BigDecimal class.
+ * @author Anthony Balkissoon abalkiss at redhat dot com
+ *
+ */
+public final class MathContext implements Serializable
+{
+  
+  /**
+   * This is the serialVersionUID reported here:
+   * java.sun.com/j2se/1.5.0/docs/api/serialized-form.html#java.math.MathContext
+   */
+  private static final long serialVersionUID = 5579720004786848255L;
+  
+  private int precision;
+    
+  /**
+   * Constructs a new MathContext with the specified precision and with HALF_UP
+   * rounding.
+   * @param setPrecision the precision for the new MathContext
+   * 
+   * @throws IllegalArgumentException if precision is < 0.
+   */
+  public MathContext(int setPrecision)
+  {
+    if (setPrecision < 0)
+      throw new IllegalArgumentException("Precision cannot be less than zero.");
+    precision = setPrecision;
+  }
+    
+  /**
+   * Constructs a MathContext from a String that has the same form as one
+   * produced by the toString() method.
+   * @param val
+   * 
+   * @throws IllegalArgumentException if the String is not in the correct
+   * format or if the precision specified is < 0.
+   */
+  public MathContext(String val)
+  {
+    try
+    {
+      int roundingModeIndex = val.indexOf("roundingMode", 10);
+      precision = Integer.parseInt(val.substring(10, roundingModeIndex - 1));
+    }
+    catch (NumberFormatException nfe)
+    {
+      throw new IllegalArgumentException("String not in correct format");
+    }
+    catch (IllegalArgumentException iae)
+    {
+      throw new IllegalArgumentException("String not in correct format");
+    }
+    if (precision < 0)
+      throw new IllegalArgumentException("Precision cannot be less than 0.");
+  }
+  
+  /**
+   * Returns true if x is a MathContext and has the same precision setting
+   * and rounding mode as this MathContext.
+   * 
+   * @return true if the above conditions hold
+   */
+  public boolean equals(Object x)
+  {
+    if (!(x instanceof MathContext))
+      return false;
+    MathContext mc = (MathContext)x;
+    return mc.precision == this.precision;
+  }
+  
+  /**
+   * Returns the precision setting.
+   * @return the precision setting.
+   */
+  public int getPrecision()
+  {
+    return precision;
+  }
+  
+  /**
+   * Returns "precision=p roundingMode=MODE" where p is an int giving the 
+   * precision and MODE is UP, DOWN, HALF_UP, HALF_DOWN, HALF_EVEN, CEILING,
+   * FLOOR, or UNNECESSARY corresponding to rounding modes.
+   * 
+   * @return a String describing this MathContext
+   */
+  public String toString()
+  {
+    return "precision="+precision;
+  }
+  
+  /**
+   * Returns the hashcode for this MathContext.
+   * @return the hashcode for this MathContext.
+   */
+  public int hashCode()
+  {
+    return precision;
+  }
+}



From MAILER-DAEMON Sun Jun 04 14:15:08 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fmx80-00060B-BS
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 14:15:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fmx7z-0005yj-0Y
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 14:15:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fmx7y-0005y1-FD
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 14:15:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fmx7y-0005xy-9b
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 14:15:06 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmxEw-0005QB-Jh
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 14:22:18 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fmx7x-0000jT-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 14:15:05 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fmx7x-0000jQ-D8
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 18:15:05 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fmx7x-0000jQ-D8@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 04 Jun 2006 18:15:05 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/System.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jun 2006 18:15:07 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/04 18:15:05

Modified files:
	.              : ChangeLog 
	java/lang      : System.java 

Log message:
	2006-03-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/System.java:
		(nanoTime()): Documented.
	
	2006-03-20  Tom Tromey  <tromey@redhat.com>
	
		* java/lang/System.java:
		(nanoTime()): Implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7647&r2=1.7648
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/System.java?cvsroot=classpath&r1=1.57&r2=1.58

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7647
retrieving revision 1.7648
diff -u -b -r1.7647 -r1.7648
--- ChangeLog	4 Jun 2006 17:59:12 -0000	1.7647
+++ ChangeLog	4 Jun 2006 18:15:04 -0000	1.7648
@@ -1,3 +1,13 @@
+2006-03-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/lang/System.java:
+	(nanoTime()): Documented.
+
+2006-03-20  Tom Tromey  <tromey@redhat.com>
+
+	* java/lang/System.java:
+	(nanoTime()): Implemented.
+
 2006-03-01  Anthony Balkissoon  <abalkiss@redhat.com>
 
 	* java/math/BigDecimal.java:

Index: java/lang/System.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/System.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- java/lang/System.java	12 May 2006 15:54:38 -0000	1.57
+++ java/lang/System.java	4 Jun 2006 18:15:05 -0000	1.58
@@ -223,6 +223,36 @@
   }
 
   /**
+   * <p>
+   * Returns the current value of a nanosecond-precise system timer.
+   * The value of the timer is an offset relative to some arbitrary fixed
+   * time, which may be in the future (making the value negative).  This
+   * method is useful for timing events where nanosecond precision is
+   * required.  This is achieved by calling this method before and after the
+   * event, and taking the difference betweent the two times:
+   * </p>
+   * <p>
+   * <code>long startTime = System.nanoTime();</code><br />
+   * <code>... <emph>event code</emph> ...</code><br />
+   * <code>long endTime = System.nanoTime();</code><br />
+   * <code>long duration = endTime - startTime;</code><br />
+   * </p>
+   * <p>
+   * Note that the value is only nanosecond-precise, and not accurate; there
+   * is no guarantee that the difference between two values is really a
+   * nanosecond.  Also, the value is prone to overflow if the offset
+   * exceeds 2^63.
+   * </p>
+   *
+   * @return the time of a system timer in nanoseconds.
+   * @since 1.5 
+   */
+  public static long nanoTime()
+  {
+    return VMSystem.nanoTime();
+  }
+
+  /**
    * Copy one array onto another from <code>src[srcStart]</code> ...
    * <code>src[srcStart+len-1]</code> to <code>dest[destStart]</code> ...
    * <code>dest[destStart+len-1]</code>. First, the arguments are validated:



From MAILER-DAEMON Sun Jun 04 15:40:51 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmySx-0000hp-No
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 15:40:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmySv-0000h4-QG
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 15:40:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmySu-0000ga-I9
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 15:40:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmySu-0000gV-DP
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 15:40:48 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmyZt-00047R-7l
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 15:48:01 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmySt-0006Mk-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 15:40:47 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FmySt-0006Mh-3Y
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 19:40:47 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmySt-0006Mh-3Y@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 04 Jun 2006 19:40:47 +0000
Subject: [commit-cp] classpath ChangeLog java/util/DuplicateFormatFl...
	[generics]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jun 2006 19:40:50 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/04 19:40:45

Modified files:
	.              : ChangeLog 
	java/util      : DuplicateFormatFlagsException.java 
	                 FormatFlagsConversionMismatchException.java 
	                 FormatterClosedException.java 
	                 IllegalFormatCodePointException.java 
	                 IllegalFormatConversionException.java 
	                 IllegalFormatException.java 
	                 IllegalFormatFlagsException.java 
	                 IllegalFormatPrecisionException.java 
	                 IllegalFormatWidthException.java 
	                 MissingFormatArgumentException.java 
	                 MissingFormatWidthException.java 
	                 UnknownFormatConversionException.java 
	                 UnknownFormatFlagsException.java 

Log message:
	2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/util/DuplicateFormatFlagsException.java,
		* java/util/FormatFlagsConversionMismatchException.java,
		* java/util/FormatterClosedException.java,
		* java/util/IllegalFormatCodePointException.java,
		* java/util/IllegalFormatConversionException.java,
		* java/util/IllegalFormatException.java,
		* java/util/IllegalFormatFlagsException.java,
		* java/util/IllegalFormatPrecisionException.java,
		* java/util/IllegalFormatWidthException.java,
		* java/util/MissingFormatArgumentException.java,
		* java/util/MissingFormatWidthException.java,
		* java/util/UnknownFormatConversionException.java,
		* java/util/UnknownFormatFlagsException.java:
		Documented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics&r1=1.2386.2.262&r2=1.2386.2.263
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/DuplicateFormatFlagsException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/FormatFlagsConversionMismatchException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/FormatterClosedException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatCodePointException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatConversionException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatFlagsException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatPrecisionException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatWidthException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/MissingFormatArgumentException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/MissingFormatWidthException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/UnknownFormatConversionException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/UnknownFormatFlagsException.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.3&r2=1.1.2.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.262
retrieving revision 1.2386.2.263
diff -u -b -r1.2386.2.262 -r1.2386.2.263
--- ChangeLog	4 Jun 2006 15:56:53 -0000	1.2386.2.262
+++ ChangeLog	4 Jun 2006 19:40:43 -0000	1.2386.2.263
@@ -1,5 +1,22 @@
 2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
+	* java/util/DuplicateFormatFlagsException.java,
+	* java/util/FormatFlagsConversionMismatchException.java,
+	* java/util/FormatterClosedException.java,
+	* java/util/IllegalFormatCodePointException.java,
+	* java/util/IllegalFormatConversionException.java,
+	* java/util/IllegalFormatException.java,
+	* java/util/IllegalFormatFlagsException.java,
+	* java/util/IllegalFormatPrecisionException.java,
+	* java/util/IllegalFormatWidthException.java,
+	* java/util/MissingFormatArgumentException.java,
+	* java/util/MissingFormatWidthException.java,
+	* java/util/UnknownFormatConversionException.java,
+	* java/util/UnknownFormatFlagsException.java:
+	Documented.
+
+2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
 	* java/lang/System.java:
 	(getenv()): Handle cases where split only
 	returns an array of size 1.

Index: java/util/DuplicateFormatFlagsException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/DuplicateFormatFlagsException.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- java/util/DuplicateFormatFlagsException.java	21 Sep 2005 21:32:40 -0000	1.1.2.3
+++ java/util/DuplicateFormatFlagsException.java	4 Jun 2006 19:40:45 -0000	1.1.2.4
@@ -38,19 +38,49 @@
 
 package java.util;
 
-/** @since 1.5 */
-public class DuplicateFormatFlagsException extends IllegalFormatException
+/** 
+ * Thrown when the flags supplied to the {@link Formatter#format()}
+ * method of a {@link Formatter} contain duplicates.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class DuplicateFormatFlagsException 
+  extends IllegalFormatException
 {
   private static final long serialVersionUID = 18890531L;
 
+  /**
+   * The flags which contain a duplicate.
+   *
+   * @serial the flags containing a duplicate.
+   */
   // Note: name fixed by serialization.
   private String flags;
 
+  /**
+   * Constructs a new <code>DuplicateFormatFlagsException</code>
+   * which specifies that the supplied set of flags contains a
+   * duplicate.
+   *
+   * @param flags the flags containing a duplicate.
+   * @throws NullPointerException if <code>flags</code> is null.
+   */
   public DuplicateFormatFlagsException(String flags)
   {
+    super("Duplicate flag passed in " + flags);
+    if (flags == null)
+      throw new
+	NullPointerException("Null flags value passed to constructor.");
     this.flags = flags;
   }
 
+  /**
+   * Returns the flags which contain a duplicate.
+   *
+   * @return the flags.
+   */
   public String getFlags()
   {
     return flags;

Index: java/util/FormatFlagsConversionMismatchException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/FormatFlagsConversionMismatchException.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- java/util/FormatFlagsConversionMismatchException.java	25 Sep 2005 02:55:13 -0000	1.1.2.4
+++ java/util/FormatFlagsConversionMismatchException.java	4 Jun 2006 19:40:45 -0000	1.1.2.5
@@ -38,29 +38,72 @@
 
 package java.util;
 
-/** @since 1.5 */
+/** 
+ * Thrown when the flags supplied to the {@link Formatter#format()}
+ * method of a {@link Formatter} contains a flag that does not match
+ * the conversion character specified for it.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
 public class FormatFlagsConversionMismatchException
   extends IllegalFormatException
 {
   private static final long serialVersionUID = 19120414L;
 
+  /**
+   * The mismatching flag.
+   *
+   * @serial the mismatching flag.
+   */
   // Note: name fixed by serialization.
   private String f;
+
+  /**
+   * The conversion character which doesn't match the
+   * appropriate flag.
+   *
+   * @serial the conversion character which doesn't match its flag.
+   */
   // Note: name fixed by serialization.
   private char c;
 
+  /**
+   * Constructs a new <code>FormatFlagsConversionMismatchException</code>
+   * which specifies that the flag, <code>f</code>, does
+   * not match its appropriate conversion character, <code>c</code>.
+   *
+   * @param f the mismatching flag.
+   * @param c the conversion character which doesn't match its flag.
+   * @throws NullPointerException if <code>f</code> is null.
+   */
   public FormatFlagsConversionMismatchException(String f, char c)
   {
-    super("invalid flag " + f + " for conversion " + c);
+    super("Invalid flag " + f + " for conversion " + c);
+    if (f == null)
+      throw new
+	NullPointerException("Null flag value passed to constructor.");
     this.f = f;
     this.c = c;
   }
 
+  /**
+   * Returns the conversion character which doesn't
+   * match the flag.
+   *
+   * @return the conversion character.
+   */
   public char getConversion()
   {
     return c;
   }
 
+  /**
+   * Returns the mismatching flag.
+   *
+   * @return the mismatching flag.
+   */
   public String getFlags()
   {
     return f;

Index: java/util/FormatterClosedException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/FormatterClosedException.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- java/util/FormatterClosedException.java	25 Sep 2005 02:55:13 -0000	1.1.2.4
+++ java/util/FormatterClosedException.java	4 Jun 2006 19:40:45 -0000	1.1.2.5
@@ -38,11 +38,22 @@
 
 package java.util;
 
-/** @since 1.5 */
-public class FormatterClosedException extends IllegalStateException
+/** 
+ * Thrown when a method is called on a {@link Formatter} but
+ * it has already been closed.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class FormatterClosedException 
+  extends IllegalStateException
 {
   private static final long serialVersionUID = 18111216L;
 
+  /**
+   * Constructs a new <code>FormatterClosedException</code>.
+   */
   public FormatterClosedException()
   {
   }

Index: java/util/IllegalFormatCodePointException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/IllegalFormatCodePointException.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- java/util/IllegalFormatCodePointException.java	21 Sep 2005 21:32:40 -0000	1.1.2.3
+++ java/util/IllegalFormatCodePointException.java	4 Jun 2006 19:40:45 -0000	1.1.2.4
@@ -38,19 +38,46 @@
 
 package java.util;
 
-/** @since 1.5 */
-public class IllegalFormatCodePointException extends IllegalFormatException
+/** 
+ * Thrown when a {@link Formatter} receives a character with an
+ * invalid Unicode codepoint, as defined by
+ * {@link Character#isValidCodePoint(int)}.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class IllegalFormatCodePointException 
+  extends IllegalFormatException
 {
   private static final long serialVersionUID = 19080630L;
 
+  /**
+   * The character which is an invalid Unicode code point.
+   *
+   * @serial the invalid character.
+   */
   // Note: name fixed by serialization.
   int c;
 
+  /**
+   * Constructs a new <code>IllegalFormatCodePointException</code>
+   * which specifies that the character, <code>c</code>, passed to
+   * a {@link Formatter} is an invalid Unicode code point.
+   *
+   * @param c the invalid character.
+   */
   public IllegalFormatCodePointException(int c)
   {
+    super("An invalid Unicode code point was supplied.");
     this.c = c;
   }
 
+  /**
+   * Returns the invalid character.
+   *
+   * @return the invalid character.
+   */
   public int getCodePoint()
   {
     return c;

Index: java/util/IllegalFormatConversionException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/IllegalFormatConversionException.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- java/util/IllegalFormatConversionException.java	21 Sep 2005 21:32:40 -0000	1.1.2.3
+++ java/util/IllegalFormatConversionException.java	4 Jun 2006 19:40:45 -0000	1.1.2.4
@@ -38,27 +38,71 @@
 
 package java.util;
 
-/** @since 1.5 */
-public class IllegalFormatConversionException extends IllegalFormatException
+/** 
+ * Thrown when the type of an argument supplied to the
+ * {@link Formatter#format()} method of a {@link Formatter}
+ * does not match the conversion character specified for it.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class IllegalFormatConversionException 
+  extends IllegalFormatException
 {
   private static final long serialVersionUID = 17000126L;
 
+  /**
+   * The conversion character which doesn't match
+   * the type of the argument.
+   *
+   * @serial the conversion character.
+   */
   // Note: name fixed by serialization.
   char c;
+
+  /**
+   * The type of the mismatching argument.
+   *
+   * @serial the mismatching argument type.
+   */
   // Note: name fixed by serialization.
   Class<?> arg;
 
+  /**
+   * Constructs a new <code>IllegalFormatConversionException</code>
+   * which specifies that the argument of type <code>arg</code> does
+   * not match the conversion character, <code>c</code>.
+   *
+   * @param c the conversion character.
+   * @param arg the type which doesn't match the conversion character.
+   * @throws NullPointerException if <code>arg</code> is null.
+   */
   public IllegalFormatConversionException(char c, Class<?> arg)
   {
+    super("The type, " + arg + ", is invalid for the conversion character, " +
+	  c + ".");
+    if (arg == null)
+      throw new NullPointerException("The supplied type was null.");
     this.c = c;
     this.arg = arg;
   }
 
+  /**
+   * Returns the conversion character.
+   *
+   * @return the conversion character.
+   */
   public char getConversion()
   {
     return c;
   }
 
+  /**
+   * Returns the type of the mismatched argument.
+   *
+   * @return the type of the mismatched argument.
+   */
   public Class<?> getArgumentClass()
   {
     return arg;

Index: java/util/IllegalFormatException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/IllegalFormatException.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- java/util/IllegalFormatException.java	25 Sep 2005 02:55:13 -0000	1.1.2.4
+++ java/util/IllegalFormatException.java	4 Jun 2006 19:40:45 -0000	1.1.2.5
@@ -38,15 +38,36 @@
 
 package java.util;
 
-/** @since 1.5 */
-public class IllegalFormatException extends IllegalArgumentException
+/** 
+ * A general exception thrown when a format string is supplied
+ * to a {@link Formatter} that contains either invalid syntax
+ * or a mismatch between the format specification and the
+ * supplied arguments.  This class is never instantiated;
+ * instead one of its subclasses is used to throw a more
+ * specific exception.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class IllegalFormatException 
+  extends IllegalArgumentException
 {
   private static final long serialVersionUID = 18830826L;
 
+  /**
+   * Constructs a new <code>IllegalFormatException</code>.
+   */
   IllegalFormatException()
   {
   }
 
+  /**
+   * Constructs a new <code>IllegalFormatException</code>
+   * with the specified message.
+   *
+   * @param msg the error message for this exception.
+   */
   IllegalFormatException(String msg)
   {
     super(msg);

Index: java/util/IllegalFormatFlagsException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/IllegalFormatFlagsException.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- java/util/IllegalFormatFlagsException.java	21 Sep 2005 21:32:40 -0000	1.1.2.3
+++ java/util/IllegalFormatFlagsException.java	4 Jun 2006 19:40:45 -0000	1.1.2.4
@@ -38,20 +38,47 @@
 
 package java.util;
 
-/** @since 1.5 */
-public class IllegalFormatFlagsException extends IllegalFormatException
+/** 
+ * Thrown when the flags supplied to the {@link Formatter#format()}
+ * method of a {@link Formatter} form an illegal combination.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class IllegalFormatFlagsException 
+  extends IllegalFormatException
 {
   private static final long serialVersionUID = 790824L;
 
+  /**
+   * The set of flags which forms an illegal combination.
+   *
+   * @serial the illegal set of flags.
+   */
   // Note: name fixed by serialization.
   private String flags;
 
+  /**
+   * Constructs a new <code>IllegalFormatFlagsException</code>
+   * for the specified flags.
+   *
+   * @param flags the illegal set of flags.
+   * @throws NullPointerException if <code>flags</code> is null.
+   */
   public IllegalFormatFlagsException(String flags)
   {
-    super();
+    super("An illegal set of flags, " + flags + ", was supplied.");
+    if (flags == null)
+      throw new NullPointerException("The supplied flags are null.");
     this.flags = flags;
   }
 
+  /**
+   * Returns the illegal flags.
+   *
+   * @return the illegal flags.
+   */
   public String getFlags()
   {
     return flags;

Index: java/util/IllegalFormatPrecisionException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/IllegalFormatPrecisionException.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- java/util/IllegalFormatPrecisionException.java	21 Sep 2005 21:32:40 -0000	1.1.2.3
+++ java/util/IllegalFormatPrecisionException.java	4 Jun 2006 19:40:45 -0000	1.1.2.4
@@ -38,20 +38,46 @@
 
 package java.util;
 
-/** @since 1.5 */
-public class IllegalFormatPrecisionException extends IllegalFormatException
+/** 
+ * Thrown when the specified precision for a {@link Formatter}
+ * argument is illegal.  This may be because the number is
+ * a negative number (other than -1), the argument does not
+ * accept a precision or for some other reason.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class IllegalFormatPrecisionException 
+  extends IllegalFormatException
 {
   private static final long serialVersionUID = 18711008L;
 
+  /**
+   * The illegal precision value.
+   *
+   * @serial the illegal precision.
+   */
   // Note: name fixed by serialization.
   private int p;
 
+  /**
+   * Constructs a new <code>IllegalFormatPrecisionException</code>
+   * for the precision, <code>p</code>.
+   *
+   * @param p the illegal precision.
+   */
   public IllegalFormatPrecisionException(int p)
   {
-    super();
+    super("The precision, " + p + ", is illegal.");
     this.p = p;
   }
 
+  /**
+   * Returns the illegal precision.
+   *
+   * @return the illegal precision.
+   */
   public int getPrecision()
   {
     return p;

Index: java/util/IllegalFormatWidthException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/IllegalFormatWidthException.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- java/util/IllegalFormatWidthException.java	21 Sep 2005 21:32:40 -0000	1.1.2.3
+++ java/util/IllegalFormatWidthException.java	4 Jun 2006 19:40:45 -0000	1.1.2.4
@@ -38,20 +38,45 @@
 
 package java.util;
 
-/** @since 1.5 */
-public class IllegalFormatWidthException extends IllegalFormatException
+/** 
+ * Thrown when the specified width for a {@link Formatter}
+ * argument is illegal.  This may be because the number is
+ * a negative number (other than -1) or for some other reason.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class IllegalFormatWidthException 
+  extends IllegalFormatException
 {
   private static final long serialVersionUID = 16660902L;
 
+  /**
+   * The illegal width value.
+   *
+   * @serial the illegal width.
+   */
   // Note: name fixed by serialization.
   private int w;
 
+  /**
+   * Constructs a new <code>IllegalFormatWidthException</code>
+   * with the specified width, <code>w</code>.
+   *
+   * @param w the illegal width.
+   */
   public IllegalFormatWidthException(int w)
   {
-    super();
+    super("The width, " + w + ", is illegal.");
     this.w = w;
   }
 
+  /**
+   * Returns the illegal width.
+   *
+   * @return the illegal width.
+   */
   public int getWidth()
   {
     return w;

Index: java/util/MissingFormatArgumentException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/MissingFormatArgumentException.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- java/util/MissingFormatArgumentException.java	21 Sep 2005 21:32:40 -0000	1.1.2.3
+++ java/util/MissingFormatArgumentException.java	4 Jun 2006 19:40:45 -0000	1.1.2.4
@@ -38,19 +38,51 @@
 
 package java.util;
 
-/** @since 1.5 */
-public class MissingFormatArgumentException extends IllegalFormatException
+/** 
+ * Thrown when the a format specification for a {@link Formatter}
+ * refers to an argument that is non-existent, or an argument index
+ * references a non-existent argument.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class MissingFormatArgumentException 
+  extends IllegalFormatException
 {
   private static final long serialVersionUID = 19190115L;
 
+  /**
+   * The format specification which contains the
+   * unmatched argument.
+   *
+   * @serial the format specification.
+   */
   // Note: name fixed by serialization.
   private String s;
 
+  /**
+   * Constructs a new <code>MissingFormatArgumentException</code>
+   * for a format specification, <code>s</code>, which refers
+   * to a non-existent argument.
+   *
+   * @param s the format specification.
+   * @throws NullPointerException if <code>s</code> is null.
+   */
   public MissingFormatArgumentException(String s)
   {
+    super("The specification, " + s + 
+	  ", refers to a non-existent argument.");
+    if (s == null)
+      throw new NullPointerException("The specification is null.");
     this.s = s;
   }
 
+  /**
+   * Returns the format specification.
+   *
+   * @return the format specification.
+   */
   public String getFormatSpecifier()
   {
     return s;

Index: java/util/MissingFormatWidthException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/MissingFormatWidthException.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- java/util/MissingFormatWidthException.java	21 Sep 2005 21:32:40 -0000	1.1.2.3
+++ java/util/MissingFormatWidthException.java	4 Jun 2006 19:40:45 -0000	1.1.2.4
@@ -38,19 +38,49 @@
 
 package java.util;
 
-/** @since 1.5 */
-public class MissingFormatWidthException extends IllegalFormatException
+/** 
+ * Thrown when the a format specification for a {@link Formatter}
+ * does not include a width for a value where one is required.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class MissingFormatWidthException 
+  extends IllegalFormatException
 {
   private static final long serialVersionUID = 15560123L;
 
+  /**
+   * The format specification which contains the
+   * unmatched argument.
+   *
+   * @serial the format specification.
+   */
   // Note: name fixed by serialization.
   private String s;
 
+  /**
+   * Constructs a new <code>MissingFormatWidthException</code>
+   * for a format specification, <code>s</code>, which excludes
+   * a required width argument.
+   *
+   * @param s the format specification.
+   * @throws NullPointerException if <code>s</code> is null.
+   */
   public MissingFormatWidthException(String s)
   {
+    super("The specification, " + s + ", misses a required width.");
+    if (s == null)
+      throw new NullPointerException("The specification is null.");
     this.s = s;
   }
 
+  /**
+   * Returns the format specification.
+   *
+   * @return the format specification.
+   */
   public String getFormatSpecifier()
   {
     return s;

Index: java/util/UnknownFormatConversionException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/UnknownFormatConversionException.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- java/util/UnknownFormatConversionException.java	25 Sep 2005 02:55:13 -0000	1.1.2.4
+++ java/util/UnknownFormatConversionException.java	4 Jun 2006 19:40:45 -0000	1.1.2.5
@@ -38,20 +38,47 @@
 
 package java.util;
 
-/** @since 1.5 */
-public class UnknownFormatConversionException extends IllegalFormatException
+/** 
+ * Thrown when a {@link Formatter} is supplied with an
+ * unknown conversion.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class UnknownFormatConversionException 
+  extends IllegalFormatException
 {
   private static final long serialVersionUID = 19060418L;
 
+  /**
+   * The unknown conversion.
+   *
+   * @serial the unknown conversion.
+   */
   // Note: name fixed by serialization.
   private String s;
 
+  /**
+   * Constructs a new <code>UnknownFormatConversionException</code>
+   * for the specified conversion string.
+   *
+   * @param s the conversion string.
+   * @throws NullPointerException if the conversion string is null.
+   */
   public UnknownFormatConversionException(String s)
   {
-    super("unknown format conversion: " + s);
+    super("Unknown format conversion: " + s);
+    if (s == null)
+      throw new NullPointerException("The conversion string is null.");
     this.s = s;
   }
 
+  /**
+   * Returns the conversion string.
+   *
+   * @return the conversion string.
+   */
   public String getConversion()
   {
     return s;

Index: java/util/UnknownFormatFlagsException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/UnknownFormatFlagsException.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- java/util/UnknownFormatFlagsException.java	21 Sep 2005 21:32:40 -0000	1.1.2.3
+++ java/util/UnknownFormatFlagsException.java	4 Jun 2006 19:40:45 -0000	1.1.2.4
@@ -38,19 +38,49 @@
 
 package java.util;
 
-/** @since 1.5 */
-public class UnknownFormatFlagsException extends IllegalFormatException
+/** 
+ * Thrown when a {@link Formatter} is supplied with an
+ * unknown flag.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class UnknownFormatFlagsException 
+  extends IllegalFormatException
 {
   private static final long serialVersionUID = 19370506L;
 
+  /**
+   * The set of flags containing the unknown flag.
+   *
+   * @serial the unknown conversion.
+   */
   // Note: name fixed by serialization.
   private String flags;
 
+  /**
+   * Constructs a new <code>UnknownFormatFlagsException</code>
+   * which specifies that the supplied set of flags contains a
+   * unknown.
+   *
+   * @param flags the flags containing a unknown.
+   * @throws NullPointerException if <code>flags</code> is null.
+   */
   public UnknownFormatFlagsException(String s)
   {
+    super("Unknown flag passed in " + s);
+    if (s == null)
+      throw new
+	NullPointerException("Null flags value passed to constructor.");
     this.flags = s;
   }
 
+  /**
+   * Returns the flags which contain a unknown.
+   *
+   * @return the flags.
+   */
   public String getFlags()
   {
     return flags;



From MAILER-DAEMON Sun Jun 04 15:44:47 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FmyWk-00028F-Or
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 15:44:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FmyWi-00026m-Us
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 15:44:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FmyWi-00025g-0G
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 15:44:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FmyWh-00025b-Ul
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 15:44:43 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fmydg-0004Kf-UA
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 15:51:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FmyWe-0006Q5-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 15:44:40 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FmyWe-0006Q2-1N
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 19:44:40 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FmyWe-0006Q2-1N@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Sun, 04 Jun 2006 19:44:40 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Cairo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jun 2006 19:44:45 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/04 19:44:39

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoSurface.java 
	                       ComponentGraphicsCopy.java 
	                       GtkVolatileImage.java 
	include        : gnu_java_awt_peer_gtk_CairoSurface.h 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_CairoSurface.c 
	                     gnu_java_awt_peer_gtk_ComponentGraphics.c 

Log message:
	2006-06-04  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/CairoSurface.java
		(getFlippedBuffer): New method.
		(getGtkImage): Renamed method.
		* gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java
		* gnu/java/awt/peer/gtk/GtkVolatileImage.java
		Renamed getSharedImage to getGtkImage.
		* include/gnu_java_awt_peer_gtk_CairoSurface.h
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
		(getFlippedBuffer): New method
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
		Avoid window casts.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7648&r2=1.7649
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoSurface.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c?cvsroot=classpath&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c?cvsroot=classpath&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7648
retrieving revision 1.7649
diff -u -b -r1.7648 -r1.7649
--- ChangeLog	4 Jun 2006 18:15:04 -0000	1.7648
+++ ChangeLog	4 Jun 2006 19:44:39 -0000	1.7649
@@ -1,3 +1,17 @@
+2006-06-04  Sven de Marothy  <sven@physto.se>
+
+	* gnu/java/awt/peer/gtk/CairoSurface.java
+	(getFlippedBuffer): New method.
+	(getGtkImage): Renamed method.
+	* gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java
+	* gnu/java/awt/peer/gtk/GtkVolatileImage.java
+	Renamed getSharedImage to getGtkImage.
+	* include/gnu_java_awt_peer_gtk_CairoSurface.h
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
+	(getFlippedBuffer): New method
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
+	Avoid window casts.
+	
 2006-03-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/lang/System.java:

Index: gnu/java/awt/peer/gtk/CairoSurface.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/CairoSurface.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/java/awt/peer/gtk/CairoSurface.java	1 Jun 2006 13:57:39 -0000	1.5
+++ gnu/java/awt/peer/gtk/CairoSurface.java	4 Jun 2006 19:44:39 -0000	1.6
@@ -123,6 +123,8 @@
    */
   native void setPixels(int[] pixels);
 
+  native long getFlippedBuffer(int size);
+
   /**
    * Create a cairo_surface_t with specified width and height.
    * The format will be ARGB32 with premultiplied alpha and native bit 
@@ -197,11 +199,11 @@
   }
 
   /**
-   * Return a GtkImage which shares its data with this Cairo surface.
+   * Return a GtkImage from this Cairo surface.
    */
-  public GtkImage getSharedGtkImage()
+  public GtkImage getGtkImage()
   {
-    return new GtkImage( width, height, bufferPointer );
+    return new GtkImage( width, height, getFlippedBuffer( width * height ));
   }
 
   /**

Index: gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java	30 May 2006 04:21:53 -0000	1.1
+++ gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java	4 Jun 2006 19:44:39 -0000	1.2
@@ -83,7 +83,7 @@
     this.component = component;
     this.width = width;
     this.height = height;
-    gtkimage = surface.getSharedGtkImage();
+    gtkimage = surface.getGtkImage();
     getPixbuf( component, gtkimage );
   }
 

Index: gnu/java/awt/peer/gtk/GtkVolatileImage.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/java/awt/peer/gtk/GtkVolatileImage.java	3 Jun 2006 22:41:41 -0000	1.4
+++ gnu/java/awt/peer/gtk/GtkVolatileImage.java	4 Jun 2006 19:44:39 -0000	1.5
@@ -127,7 +127,7 @@
   {
     if( needsUpdate )
       {
-	update( offScreen.getSharedGtkImage() );
+	update( offScreen.getGtkImage() );
 	needsUpdate = false;
 	return VolatileImage.IMAGE_RESTORED;
       }

Index: include/gnu_java_awt_peer_gtk_CairoSurface.h
===================================================================
RCS file: /sources/classpath/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- include/gnu_java_awt_peer_gtk_CairoSurface.h	29 May 2006 16:14:59 -0000	1.1
+++ include/gnu_java_awt_peer_gtk_CairoSurface.h	4 Jun 2006 19:44:39 -0000	1.2
@@ -18,6 +18,7 @@
 JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getPixels (JNIEnv *env, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_setPixels (JNIEnv *env, jobject, jintArray);
 JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_newCairoContext (JNIEnv *env, jobject);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer (JNIEnv *env, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint, jint);
 
 #ifdef __cplusplus

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c	3 Jun 2006 05:21:05 -0000	1.14
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c	4 Jun 2006 19:44:39 -0000	1.15
@@ -208,6 +208,29 @@
  (*env)->ReleaseDoubleArrayElements (env, java_matrix, native_matrix, 0);
 }
 
+JNIEXPORT jlong JNICALL 
+Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer 
+(JNIEnv *env, jobject obj, jint size)
+{
+  jint *dst;
+  jint *src = (jint *)getNativeObject(env, obj, BUFFER);
+  int i;
+  int t;
+
+  g_assert( src != NULL );
+  dst = g_malloc( size * sizeof( jint ) );
+
+  for(i = 0; i < size; i++ )
+    {
+      t = (src[i] & 0x0000FF) << 16;
+      dst[i] = (src[i] & 0x00FF0000) >> 16;
+      dst[i] |= (src[i] & 0xFF00FF00);
+      dst[i] |= t;
+    }
+
+  return PTR_TO_JLONG(dst);
+}
+
 /**
  * Create and return a cairo context for drawing to the surface.
  */

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	4 Jun 2006 17:52:05 -0000	1.11
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	4 Jun 2006 19:44:39 -0000	1.12
@@ -227,13 +227,10 @@
   widget = GTK_WIDGET (ptr);
   g_assert (widget != NULL);
 
-  while(widget->window != NULL)
-    widget = GTK_WIDGET(widget->window);
   pixmap = cp_gtk_get_pixmap( env, img );
  
-
-  gc = gdk_gc_new(GDK_DRAWABLE(widget));
-  gdk_draw_drawable(GDK_DRAWABLE(widget),
+  gc = gdk_gc_new(GDK_DRAWABLE(widget->window));
+  gdk_draw_drawable(GDK_DRAWABLE(widget->window),
 		    gc,
 		    pixmap,
 		    0, 0,



From MAILER-DAEMON Sun Jun 04 16:01:26 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fmyms-0000kh-Gi
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 16:01:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fmymq-0000il-Rh
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 16:01:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fmymp-0000hq-2O
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 16:01:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fmymo-0000hj-T7
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 16:01:22 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fmytn-0005ac-Ic
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 16:08:36 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fmymn-0006fp-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 16:01:21 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fmymn-0006fm-2u
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 20:01:21 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fmymn-0006fm-2u@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 04 Jun 2006 20:01:21 +0000
Subject: [commit-cp] classpath ChangeLog java/util/DuplicateFormatFl...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jun 2006 20:01:25 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/04 20:01:20

Modified files:
	.              : ChangeLog 
Added files:
	java/util      : DuplicateFormatFlagsException.java 
	                 FormatFlagsConversionMismatchException.java 
	                 FormatterClosedException.java 
	                 IllegalFormatCodePointException.java 
	                 IllegalFormatConversionException.java 
	                 IllegalFormatException.java 
	                 IllegalFormatFlagsException.java 
	                 IllegalFormatPrecisionException.java 
	                 IllegalFormatWidthException.java 
	                 MissingFormatArgumentException.java 
	                 MissingFormatWidthException.java 
	                 UnknownFormatConversionException.java 
	                 UnknownFormatFlagsException.java 

Log message:
	2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/util/DuplicateFormatFlagsException.java,
		* java/util/FormatFlagsConversionMismatchException.java,
		* java/util/FormatterClosedException.java,
		* java/util/IllegalFormatCodePointException.java,
		* java/util/IllegalFormatConversionException.java,
		* java/util/IllegalFormatException.java,
		* java/util/IllegalFormatFlagsException.java,
		* java/util/IllegalFormatPrecisionException.java,
		* java/util/IllegalFormatWidthException.java,
		* java/util/MissingFormatArgumentException.java,
		* java/util/MissingFormatWidthException.java,
		* java/util/UnknownFormatConversionException.java,
		* java/util/UnknownFormatFlagsException.java:
		Documented.
	
	2005-08-13  Tom Tromey  <tromey@redhat.com>
	
		* java/util/UnknownFormatConversionException.java
		(serialVersionUID): New field.
		(s): Renamed from 'conv' for serialization.
		* java/util/MissingFormatWidthException.java (serialVersionUID):
		New field.
		(s): Renamed from 'width' for serialization.
		* java/util/MissingFormatArgumentException.java
		(serialVersionUID): New field.
		(s): Renamed from 'spec' for serialization.
		* java/util/IllegalFormatWidthException.java (serialVersionUID):
		New field.
		(w): Renamed from 'width' for serialization.
		* java/util/IllegalFormatPrecisionException.java
		(serialVersionUID): New field.
		(p): Renamed from 'precision' for serialization.
		* java/util/IllegalFormatFlagsException.java (serialVersionUID):
		New field.
		* java/util/IllegalFormatConversionException.java
		(serialVersionUID): New field.
		(c): Renamed from 'conv' for serialization.
		(arg): Renamed from 'argClass' for serialization.
		* java/util/IllegalFormatCodePointException.java
		(serialVersionUID): New field.
		(c): Renamed from 'codepoint' for serialization.
		* java/util/FormatFlagsConversionMismatchException.java
		(serialVersionUID): New field.
		(f): Renamed from 'flags' for serialization.
		(c): Renamed from 'conversion' for serialization.
		* java/util/DuplicateFormatFlagsException.java (serialVersionUID):
		New field.
		* java/util/IllegalFormatException.java (serialVersionUID): New
		field.
		* java/util/FormatterClosedException.java (serialVersionUID): New
		field.
	
	2005-04-20  Tom Tromey  <tromey@redhat.com>
	
		* java/util/DuplicateFormatFlagsException.java: New file.
		* java/util/FormatFlagsConversionMismatchException.java: New file.
		* java/util/FormatterClosedException.java: New file.
		* java/util/IllegalFormatCodePointException.java: New file.
		* java/util/IllegalFormatConversionException.java: New file.
		* java/util/UnknownFormatFlagsException.java: New file.
		* java/util/UnknownFormatConversionException.java: New file.
		* java/util/MissingFormatWidthException.java: New file.
		* java/util/MissingFormatArgumentException.java: New file.
		* java/util/IllegalFormatWidthException.java: New file.
		* java/util/IllegalFormatPrecisionException.java: New file.
		* java/util/IllegalFormatFlagsException.java: New file.
		* java/util/IllegalFormatException.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7649&r2=1.7650
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/DuplicateFormatFlagsException.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/FormatFlagsConversionMismatchException.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/FormatterClosedException.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatCodePointException.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatConversionException.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatException.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatFlagsException.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatPrecisionException.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/IllegalFormatWidthException.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/MissingFormatArgumentException.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/MissingFormatWidthException.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/UnknownFormatConversionException.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/UnknownFormatFlagsException.java?cvsroot=classpath&rev=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7649
retrieving revision 1.7650
diff -u -b -r1.7649 -r1.7650
--- ChangeLog	4 Jun 2006 19:44:39 -0000	1.7649
+++ ChangeLog	4 Jun 2006 20:01:20 -0000	1.7650
@@ -1,3 +1,73 @@
+2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/util/DuplicateFormatFlagsException.java,
+	* java/util/FormatFlagsConversionMismatchException.java,
+	* java/util/FormatterClosedException.java,
+	* java/util/IllegalFormatCodePointException.java,
+	* java/util/IllegalFormatConversionException.java,
+	* java/util/IllegalFormatException.java,
+	* java/util/IllegalFormatFlagsException.java,
+	* java/util/IllegalFormatPrecisionException.java,
+	* java/util/IllegalFormatWidthException.java,
+	* java/util/MissingFormatArgumentException.java,
+	* java/util/MissingFormatWidthException.java,
+	* java/util/UnknownFormatConversionException.java,
+	* java/util/UnknownFormatFlagsException.java:
+	Documented.
+
+2005-08-13  Tom Tromey  <tromey@redhat.com>
+
+	* java/util/UnknownFormatConversionException.java
+	(serialVersionUID): New field.
+	(s): Renamed from 'conv' for serialization.
+	* java/util/MissingFormatWidthException.java (serialVersionUID):
+	New field.
+	(s): Renamed from 'width' for serialization.
+	* java/util/MissingFormatArgumentException.java
+	(serialVersionUID): New field.
+	(s): Renamed from 'spec' for serialization.
+	* java/util/IllegalFormatWidthException.java (serialVersionUID):
+	New field.
+	(w): Renamed from 'width' for serialization.
+	* java/util/IllegalFormatPrecisionException.java
+	(serialVersionUID): New field.
+	(p): Renamed from 'precision' for serialization.
+	* java/util/IllegalFormatFlagsException.java (serialVersionUID):
+	New field.
+	* java/util/IllegalFormatConversionException.java
+	(serialVersionUID): New field.
+	(c): Renamed from 'conv' for serialization.
+	(arg): Renamed from 'argClass' for serialization.
+	* java/util/IllegalFormatCodePointException.java
+	(serialVersionUID): New field.
+	(c): Renamed from 'codepoint' for serialization.
+	* java/util/FormatFlagsConversionMismatchException.java
+	(serialVersionUID): New field.
+	(f): Renamed from 'flags' for serialization.
+	(c): Renamed from 'conversion' for serialization.
+	* java/util/DuplicateFormatFlagsException.java (serialVersionUID):
+	New field.
+	* java/util/IllegalFormatException.java (serialVersionUID): New
+	field.
+	* java/util/FormatterClosedException.java (serialVersionUID): New
+	field.
+
+2005-04-20  Tom Tromey  <tromey@redhat.com>
+
+	* java/util/DuplicateFormatFlagsException.java: New file.
+	* java/util/FormatFlagsConversionMismatchException.java: New file.
+	* java/util/FormatterClosedException.java: New file.
+	* java/util/IllegalFormatCodePointException.java: New file.
+	* java/util/IllegalFormatConversionException.java: New file.
+	* java/util/UnknownFormatFlagsException.java: New file.
+	* java/util/UnknownFormatConversionException.java: New file.
+	* java/util/MissingFormatWidthException.java: New file.
+	* java/util/MissingFormatArgumentException.java: New file.
+	* java/util/IllegalFormatWidthException.java: New file.
+	* java/util/IllegalFormatPrecisionException.java: New file.
+	* java/util/IllegalFormatFlagsException.java: New file.
+	* java/util/IllegalFormatException.java: New file.
+
 2006-06-04  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/peer/gtk/CairoSurface.java

Index: java/util/DuplicateFormatFlagsException.java
===================================================================
RCS file: java/util/DuplicateFormatFlagsException.java
diff -N java/util/DuplicateFormatFlagsException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/DuplicateFormatFlagsException.java	4 Jun 2006 20:01:20 -0000	1.2
@@ -0,0 +1,88 @@
+/* DuplicateFormatFlagsException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * Thrown when the flags supplied to the {@link Formatter#format()}
+ * method of a {@link Formatter} contain duplicates.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class DuplicateFormatFlagsException 
+  extends IllegalFormatException
+{
+  private static final long serialVersionUID = 18890531L;
+
+  /**
+   * The flags which contain a duplicate.
+   *
+   * @serial the flags containing a duplicate.
+   */
+  // Note: name fixed by serialization.
+  private String flags;
+
+  /**
+   * Constructs a new <code>DuplicateFormatFlagsException</code>
+   * which specifies that the supplied set of flags contains a
+   * duplicate.
+   *
+   * @param flags the flags containing a duplicate.
+   * @throws NullPointerException if <code>flags</code> is null.
+   */
+  public DuplicateFormatFlagsException(String flags)
+  {
+    super("Duplicate flag passed in " + flags);
+    if (flags == null)
+      throw new
+	NullPointerException("Null flags value passed to constructor.");
+    this.flags = flags;
+  }
+
+  /**
+   * Returns the flags which contain a duplicate.
+   *
+   * @return the flags.
+   */
+  public String getFlags()
+  {
+    return flags;
+  }
+}

Index: java/util/FormatFlagsConversionMismatchException.java
===================================================================
RCS file: java/util/FormatFlagsConversionMismatchException.java
diff -N java/util/FormatFlagsConversionMismatchException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/FormatFlagsConversionMismatchException.java	4 Jun 2006 20:01:20 -0000	1.2
@@ -0,0 +1,111 @@
+/* FormatFlagsConversionMismatchException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * Thrown when the flags supplied to the {@link Formatter#format()}
+ * method of a {@link Formatter} contains a flag that does not match
+ * the conversion character specified for it.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class FormatFlagsConversionMismatchException
+  extends IllegalFormatException
+{
+  private static final long serialVersionUID = 19120414L;
+
+  /**
+   * The mismatching flag.
+   *
+   * @serial the mismatching flag.
+   */
+  // Note: name fixed by serialization.
+  private String f;
+
+  /**
+   * The conversion character which doesn't match the
+   * appropriate flag.
+   *
+   * @serial the conversion character which doesn't match its flag.
+   */
+  // Note: name fixed by serialization.
+  private char c;
+
+  /**
+   * Constructs a new <code>FormatFlagsConversionMismatchException</code>
+   * which specifies that the flag, <code>f</code>, does
+   * not match its appropriate conversion character, <code>c</code>.
+   *
+   * @param f the mismatching flag.
+   * @param c the conversion character which doesn't match its flag.
+   * @throws NullPointerException if <code>f</code> is null.
+   */
+  public FormatFlagsConversionMismatchException(String f, char c)
+  {
+    super("Invalid flag " + f + " for conversion " + c);
+    if (f == null)
+      throw new
+	NullPointerException("Null flag value passed to constructor.");
+    this.f = f;
+    this.c = c;
+  }
+
+  /**
+   * Returns the conversion character which doesn't
+   * match the flag.
+   *
+   * @return the conversion character.
+   */
+  public char getConversion()
+  {
+    return c;
+  }
+
+  /**
+   * Returns the mismatching flag.
+   *
+   * @return the mismatching flag.
+   */
+  public String getFlags()
+  {
+    return f;
+  }
+}

Index: java/util/FormatterClosedException.java
===================================================================
RCS file: java/util/FormatterClosedException.java
diff -N java/util/FormatterClosedException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/FormatterClosedException.java	4 Jun 2006 20:01:20 -0000	1.2
@@ -0,0 +1,60 @@
+/* FormatterClosedException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * Thrown when a method is called on a {@link Formatter} but
+ * it has already been closed.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class FormatterClosedException 
+  extends IllegalStateException
+{
+  private static final long serialVersionUID = 18111216L;
+
+  /**
+   * Constructs a new <code>FormatterClosedException</code>.
+   */
+  public FormatterClosedException()
+  {
+  }
+}

Index: java/util/IllegalFormatCodePointException.java
===================================================================
RCS file: java/util/IllegalFormatCodePointException.java
diff -N java/util/IllegalFormatCodePointException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/IllegalFormatCodePointException.java	4 Jun 2006 20:01:20 -0000	1.2
@@ -0,0 +1,85 @@
+/* IllegalFormatCodePointException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * Thrown when a {@link Formatter} receives a character with an
+ * invalid Unicode codepoint, as defined by
+ * {@link Character#isValidCodePoint(int)}.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class IllegalFormatCodePointException 
+  extends IllegalFormatException
+{
+  private static final long serialVersionUID = 19080630L;
+
+  /**
+   * The character which is an invalid Unicode code point.
+   *
+   * @serial the invalid character.
+   */
+  // Note: name fixed by serialization.
+  int c;
+
+  /**
+   * Constructs a new <code>IllegalFormatCodePointException</code>
+   * which specifies that the character, <code>c</code>, passed to
+   * a {@link Formatter} is an invalid Unicode code point.
+   *
+   * @param c the invalid character.
+   */
+  public IllegalFormatCodePointException(int c)
+  {
+    super("An invalid Unicode code point was supplied.");
+    this.c = c;
+  }
+
+  /**
+   * Returns the invalid character.
+   *
+   * @return the invalid character.
+   */
+  public int getCodePoint()
+  {
+    return c;
+  }
+}

Index: java/util/IllegalFormatConversionException.java
===================================================================
RCS file: java/util/IllegalFormatConversionException.java
diff -N java/util/IllegalFormatConversionException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/IllegalFormatConversionException.java	4 Jun 2006 20:01:20 -0000	1.2
@@ -0,0 +1,110 @@
+/* IllegalFormatConversionException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * Thrown when the type of an argument supplied to the
+ * {@link Formatter#format()} method of a {@link Formatter}
+ * does not match the conversion character specified for it.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class IllegalFormatConversionException 
+  extends IllegalFormatException
+{
+  private static final long serialVersionUID = 17000126L;
+
+  /**
+   * The conversion character which doesn't match
+   * the type of the argument.
+   *
+   * @serial the conversion character.
+   */
+  // Note: name fixed by serialization.
+  char c;
+
+  /**
+   * The type of the mismatching argument.
+   *
+   * @serial the mismatching argument type.
+   */
+  // Note: name fixed by serialization.
+  Class arg;
+
+  /**
+   * Constructs a new <code>IllegalFormatConversionException</code>
+   * which specifies that the argument of type <code>arg</code> does
+   * not match the conversion character, <code>c</code>.
+   *
+   * @param c the conversion character.
+   * @param arg the type which doesn't match the conversion character.
+   * @throws NullPointerException if <code>arg</code> is null.
+   */
+  public IllegalFormatConversionException(char c, Class arg)
+  {
+    super("The type, " + arg + ", is invalid for the conversion character, " +
+	  c + ".");
+    if (arg == null)
+      throw new NullPointerException("The supplied type was null.");
+    this.c = c;
+    this.arg = arg;
+  }
+
+  /**
+   * Returns the conversion character.
+   *
+   * @return the conversion character.
+   */
+  public char getConversion()
+  {
+    return c;
+  }
+
+  /**
+   * Returns the type of the mismatched argument.
+   *
+   * @return the type of the mismatched argument.
+   */
+  public Class getArgumentClass()
+  {
+    return arg;
+  }
+}

Index: java/util/IllegalFormatException.java
===================================================================
RCS file: java/util/IllegalFormatException.java
diff -N java/util/IllegalFormatException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/IllegalFormatException.java	4 Jun 2006 20:01:20 -0000	1.2
@@ -0,0 +1,75 @@
+/* IllegalFormatException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * A general exception thrown when a format string is supplied
+ * to a {@link Formatter} that contains either invalid syntax
+ * or a mismatch between the format specification and the
+ * supplied arguments.  This class is never instantiated;
+ * instead one of its subclasses is used to throw a more
+ * specific exception.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class IllegalFormatException 
+  extends IllegalArgumentException
+{
+  private static final long serialVersionUID = 18830826L;
+
+  /**
+   * Constructs a new <code>IllegalFormatException</code>.
+   */
+  IllegalFormatException()
+  {
+  }
+
+  /**
+   * Constructs a new <code>IllegalFormatException</code>
+   * with the specified message.
+   *
+   * @param msg the error message for this exception.
+   */
+  IllegalFormatException(String msg)
+  {
+    super(msg);
+  }
+}

Index: java/util/IllegalFormatFlagsException.java
===================================================================
RCS file: java/util/IllegalFormatFlagsException.java
diff -N java/util/IllegalFormatFlagsException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/IllegalFormatFlagsException.java	4 Jun 2006 20:01:20 -0000	1.2
@@ -0,0 +1,86 @@
+/* IllegalFormatFlagsException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * Thrown when the flags supplied to the {@link Formatter#format()}
+ * method of a {@link Formatter} form an illegal combination.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class IllegalFormatFlagsException 
+  extends IllegalFormatException
+{
+  private static final long serialVersionUID = 790824L;
+
+  /**
+   * The set of flags which forms an illegal combination.
+   *
+   * @serial the illegal set of flags.
+   */
+  // Note: name fixed by serialization.
+  private String flags;
+
+  /**
+   * Constructs a new <code>IllegalFormatFlagsException</code>
+   * for the specified flags.
+   *
+   * @param flags the illegal set of flags.
+   * @throws NullPointerException if <code>flags</code> is null.
+   */
+  public IllegalFormatFlagsException(String flags)
+  {
+    super("An illegal set of flags, " + flags + ", was supplied.");
+    if (flags == null)
+      throw new NullPointerException("The supplied flags are null.");
+    this.flags = flags;
+  }
+
+  /**
+   * Returns the illegal flags.
+   *
+   * @return the illegal flags.
+   */
+  public String getFlags()
+  {
+    return flags;
+  }
+}

Index: java/util/IllegalFormatPrecisionException.java
===================================================================
RCS file: java/util/IllegalFormatPrecisionException.java
diff -N java/util/IllegalFormatPrecisionException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/IllegalFormatPrecisionException.java	4 Jun 2006 20:01:20 -0000	1.2
@@ -0,0 +1,85 @@
+/* IllegalFormatPrecisionException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * Thrown when the specified precision for a {@link Formatter}
+ * argument is illegal.  This may be because the number is
+ * a negative number (other than -1), the argument does not
+ * accept a precision or for some other reason.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class IllegalFormatPrecisionException 
+  extends IllegalFormatException
+{
+  private static final long serialVersionUID = 18711008L;
+
+  /**
+   * The illegal precision value.
+   *
+   * @serial the illegal precision.
+   */
+  // Note: name fixed by serialization.
+  private int p;
+
+  /**
+   * Constructs a new <code>IllegalFormatPrecisionException</code>
+   * for the precision, <code>p</code>.
+   *
+   * @param p the illegal precision.
+   */
+  public IllegalFormatPrecisionException(int p)
+  {
+    super("The precision, " + p + ", is illegal.");
+    this.p = p;
+  }
+
+  /**
+   * Returns the illegal precision.
+   *
+   * @return the illegal precision.
+   */
+  public int getPrecision()
+  {
+    return p;
+  }
+}

Index: java/util/IllegalFormatWidthException.java
===================================================================
RCS file: java/util/IllegalFormatWidthException.java
diff -N java/util/IllegalFormatWidthException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/IllegalFormatWidthException.java	4 Jun 2006 20:01:20 -0000	1.2
@@ -0,0 +1,84 @@
+/* IllegalFormatWidthException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * Thrown when the specified width for a {@link Formatter}
+ * argument is illegal.  This may be because the number is
+ * a negative number (other than -1) or for some other reason.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class IllegalFormatWidthException 
+  extends IllegalFormatException
+{
+  private static final long serialVersionUID = 16660902L;
+
+  /**
+   * The illegal width value.
+   *
+   * @serial the illegal width.
+   */
+  // Note: name fixed by serialization.
+  private int w;
+
+  /**
+   * Constructs a new <code>IllegalFormatWidthException</code>
+   * with the specified width, <code>w</code>.
+   *
+   * @param w the illegal width.
+   */
+  public IllegalFormatWidthException(int w)
+  {
+    super("The width, " + w + ", is illegal.");
+    this.w = w;
+  }
+
+  /**
+   * Returns the illegal width.
+   *
+   * @return the illegal width.
+   */
+  public int getWidth()
+  {
+    return w;
+  }
+}

Index: java/util/MissingFormatArgumentException.java
===================================================================
RCS file: java/util/MissingFormatArgumentException.java
diff -N java/util/MissingFormatArgumentException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/MissingFormatArgumentException.java	4 Jun 2006 20:01:20 -0000	1.2
@@ -0,0 +1,90 @@
+/* MissingFormatArgumentException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * Thrown when the a format specification for a {@link Formatter}
+ * refers to an argument that is non-existent, or an argument index
+ * references a non-existent argument.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class MissingFormatArgumentException 
+  extends IllegalFormatException
+{
+  private static final long serialVersionUID = 19190115L;
+
+  /**
+   * The format specification which contains the
+   * unmatched argument.
+   *
+   * @serial the format specification.
+   */
+  // Note: name fixed by serialization.
+  private String s;
+
+  /**
+   * Constructs a new <code>MissingFormatArgumentException</code>
+   * for a format specification, <code>s</code>, which refers
+   * to a non-existent argument.
+   *
+   * @param s the format specification.
+   * @throws NullPointerException if <code>s</code> is null.
+   */
+  public MissingFormatArgumentException(String s)
+  {
+    super("The specification, " + s + 
+	  ", refers to a non-existent argument.");
+    if (s == null)
+      throw new NullPointerException("The specification is null.");
+    this.s = s;
+  }
+
+  /**
+   * Returns the format specification.
+   *
+   * @return the format specification.
+   */
+  public String getFormatSpecifier()
+  {
+    return s;
+  }
+}

Index: java/util/MissingFormatWidthException.java
===================================================================
RCS file: java/util/MissingFormatWidthException.java
diff -N java/util/MissingFormatWidthException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/MissingFormatWidthException.java	4 Jun 2006 20:01:20 -0000	1.2
@@ -0,0 +1,88 @@
+/* MissingFormatWidthException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * Thrown when the a format specification for a {@link Formatter}
+ * does not include a width for a value where one is required.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class MissingFormatWidthException 
+  extends IllegalFormatException
+{
+  private static final long serialVersionUID = 15560123L;
+
+  /**
+   * The format specification which contains the
+   * unmatched argument.
+   *
+   * @serial the format specification.
+   */
+  // Note: name fixed by serialization.
+  private String s;
+
+  /**
+   * Constructs a new <code>MissingFormatWidthException</code>
+   * for a format specification, <code>s</code>, which excludes
+   * a required width argument.
+   *
+   * @param s the format specification.
+   * @throws NullPointerException if <code>s</code> is null.
+   */
+  public MissingFormatWidthException(String s)
+  {
+    super("The specification, " + s + ", misses a required width.");
+    if (s == null)
+      throw new NullPointerException("The specification is null.");
+    this.s = s;
+  }
+
+  /**
+   * Returns the format specification.
+   *
+   * @return the format specification.
+   */
+  public String getFormatSpecifier()
+  {
+    return s;
+  }
+}

Index: java/util/UnknownFormatConversionException.java
===================================================================
RCS file: java/util/UnknownFormatConversionException.java
diff -N java/util/UnknownFormatConversionException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/UnknownFormatConversionException.java	4 Jun 2006 20:01:20 -0000	1.2
@@ -0,0 +1,86 @@
+/* UnknownFormatConversionException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * Thrown when a {@link Formatter} is supplied with an
+ * unknown conversion.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class UnknownFormatConversionException 
+  extends IllegalFormatException
+{
+  private static final long serialVersionUID = 19060418L;
+
+  /**
+   * The unknown conversion.
+   *
+   * @serial the unknown conversion.
+   */
+  // Note: name fixed by serialization.
+  private String s;
+
+  /**
+   * Constructs a new <code>UnknownFormatConversionException</code>
+   * for the specified conversion string.
+   *
+   * @param s the conversion string.
+   * @throws NullPointerException if the conversion string is null.
+   */
+  public UnknownFormatConversionException(String s)
+  {
+    super("Unknown format conversion: " + s);
+    if (s == null)
+      throw new NullPointerException("The conversion string is null.");
+    this.s = s;
+  }
+
+  /**
+   * Returns the conversion string.
+   *
+   * @return the conversion string.
+   */
+  public String getConversion()
+  {
+    return s;
+  }
+}

Index: java/util/UnknownFormatFlagsException.java
===================================================================
RCS file: java/util/UnknownFormatFlagsException.java
diff -N java/util/UnknownFormatFlagsException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/UnknownFormatFlagsException.java	4 Jun 2006 20:01:20 -0000	1.2
@@ -0,0 +1,88 @@
+/* UnknownFormatFlagsException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * Thrown when a {@link Formatter} is supplied with an
+ * unknown flag.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class UnknownFormatFlagsException 
+  extends IllegalFormatException
+{
+  private static final long serialVersionUID = 19370506L;
+
+  /**
+   * The set of flags containing the unknown flag.
+   *
+   * @serial the unknown conversion.
+   */
+  // Note: name fixed by serialization.
+  private String flags;
+
+  /**
+   * Constructs a new <code>UnknownFormatFlagsException</code>
+   * which specifies that the supplied set of flags contains a
+   * unknown.
+   *
+   * @param flags the flags containing a unknown.
+   * @throws NullPointerException if <code>flags</code> is null.
+   */
+  public UnknownFormatFlagsException(String s)
+  {
+    super("Unknown flag passed in " + s);
+    if (s == null)
+      throw new
+	NullPointerException("Null flags value passed to constructor.");
+    this.flags = s;
+  }
+
+  /**
+   * Returns the flags which contain a unknown.
+   *
+   * @return the flags.
+   */
+  public String getFlags()
+  {
+    return flags;
+  }
+}



From MAILER-DAEMON Sun Jun 04 16:21:44 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fmz6W-0001H1-Pw
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 16:21:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fmz6V-0001Gw-GT
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 16:21:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fmz6T-0001GM-Ew
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 16:21:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fmz6T-0001GG-8z
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 16:21:41 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FmzDS-0006jY-R5
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 16:28:54 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fmz6S-000767-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 16:21:40 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1Fmz6S-000762-2V
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 20:21:40 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fmz6S-000762-2V@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Sun, 04 Jun 2006 20:21:40 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/GtkCo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jun 2006 20:21:43 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/04 20:21:39

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: GtkComponentPeer.java 
	java/awt       : Component.java 

Log message:
	2006-06-04  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/GtkComponentPeer.java
		(createVolatileImage): Pass peer to VolatileImage constructor.
		* java/awt/Component.java
		(createVolatileImage): Call peer method directly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7650&r2=1.7651
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java?cvsroot=classpath&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Component.java?cvsroot=classpath&r1=1.119&r2=1.120

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7650
retrieving revision 1.7651
diff -u -b -r1.7650 -r1.7651
--- ChangeLog	4 Jun 2006 20:01:20 -0000	1.7650
+++ ChangeLog	4 Jun 2006 20:21:39 -0000	1.7651
@@ -1,3 +1,10 @@
+2006-06-04  Sven de Marothy  <sven@physto.se>
+
+	* gnu/java/awt/peer/gtk/GtkComponentPeer.java
+	(createVolatileImage): Pass peer to VolatileImage constructor.
+	* java/awt/Component.java
+	(createVolatileImage): Call peer method directly.
+	
 2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/util/DuplicateFormatFlagsException.java,

Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java	29 May 2006 16:14:59 -0000	1.114
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java	4 Jun 2006 20:21:39 -0000	1.115
@@ -697,7 +697,7 @@
   // on which this component is displayed.
   public VolatileImage createVolatileImage (int width, int height)
   {
-    return new GtkVolatileImage (width, height);
+    return new GtkVolatileImage (this, width, height, null);
   }
 
   // Creates buffers used in a buffering strategy.
@@ -707,7 +707,7 @@
     // numBuffers == 2 implies double-buffering, meaning one back
     // buffer and one front buffer.
     if (numBuffers == 2)
-      backBuffer = new GtkVolatileImage(awtComponent.getWidth(),
+      backBuffer = new GtkVolatileImage(this, awtComponent.getWidth(),
 					awtComponent.getHeight(),
 					caps.getBackBufferCapabilities());
     else

Index: java/awt/Component.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/Component.java,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- java/awt/Component.java	30 May 2006 16:38:11 -0000	1.119
+++ java/awt/Component.java	4 Jun 2006 20:21:39 -0000	1.120
@@ -2067,11 +2067,9 @@
    */
   public VolatileImage createVolatileImage(int width, int height)
   {
-    if (GraphicsEnvironment.isHeadless())
+    if (peer != null)
+      return peer.createVolatileImage(width, height);
       return null;
-    GraphicsConfiguration config = getGraphicsConfiguration();
-    return config == null ? null
-      : config.createCompatibleVolatileImage(width, height);
   }
 
   /**
@@ -2090,11 +2088,9 @@
                                            ImageCapabilities caps)
     throws AWTException
   {
-    if (GraphicsEnvironment.isHeadless())
+    if (peer != null)
+      return peer.createVolatileImage(width, height);
       return null;
-    GraphicsConfiguration config = getGraphicsConfiguration();
-    return config == null ? null
-      : config.createCompatibleVolatileImage(width, height, caps);
   }
 
   /**



From MAILER-DAEMON Sun Jun 04 17:26:40 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fn07M-0000EE-HW
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 17:26:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fn07L-0000Dk-7v
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 17:26:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fn07K-0000DF-Ds
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 17:26:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fn07K-0000DA-9X
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 17:26:38 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fn0EK-00032D-B4
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 17:33:52 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fn07J-0001xJ-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 17:26:37 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fn07J-0001xG-JA
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 21:26:37 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fn07J-0001xG-JA@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Sun, 04 Jun 2006 21:26:37 +0000
Subject: [commit-cp] classpath/javax/naming Reference.java InitialCo...
	[generics]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jun 2006 21:26:39 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics
Changes by:	Tom Tromey <tromey>	06/06/04 21:26:35

Modified files:
	javax/naming   : Reference.java InitialContext.java Context.java 
	.              : ChangeLog 

Log message:
		* javax/naming/Context.java (list): Genericized.
		(listBindings): Likewise.
		* javax/naming/Reference.java (addrs): Genericized.
		* javax/naming/InitialContext.java (myProps): Fixed type.
		(init): Genericized.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/naming/Reference.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/naming/InitialContext.java?cvsroot=classpath&only_with_tag=generics&r1=1.7.2.4&r2=1.7.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/naming/Context.java?cvsroot=classpath&only_with_tag=generics&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics&r1=1.2386.2.263&r2=1.2386.2.264

Patches:



Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.263
retrieving revision 1.2386.2.264
diff -u -b -r1.2386.2.263 -r1.2386.2.264
--- ChangeLog	4 Jun 2006 19:40:43 -0000	1.2386.2.263
+++ ChangeLog	4 Jun 2006 21:26:33 -0000	1.2386.2.264
@@ -1,3 +1,11 @@
+2006-06-04  Tom Tromey  <tromey@redhat.com>
+
+	* javax/naming/Context.java (list): Genericized.
+	(listBindings): Likewise.
+	* javax/naming/Reference.java (addrs): Genericized.
+	* javax/naming/InitialContext.java (myProps): Fixed type.
+	(init): Genericized.
+
 2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/util/DuplicateFormatFlagsException.java,



From MAILER-DAEMON Sun Jun 04 18:39:06 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fn1FR-0004Nh-QL
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 18:39:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fn1FQ-0004NZ-Rh
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 18:39:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fn1FO-0004MK-67
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 18:39:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fn1FO-0004MA-1D
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 18:39:02 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fn1MO-0007VS-Cs
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 18:46:16 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fn1FM-00069o-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 18:39:00 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fn1FM-00069k-GB
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 22:39:00 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fn1FM-00069k-GB@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 04 Jun 2006 22:39:00 +0000
Subject: [commit-cp] classpath ChangeLog java/util/Formattable.java ...
	[generics]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jun 2006 22:39:05 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/04 22:38:58

Modified files:
	.              : ChangeLog 
	java/util      : Formattable.java FormattableFlags.java 
	                 Formatter.java 

Log message:
	2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/util/Formattable.java,
		* java/util/FormattableFlags.java,
		* java/util/Formatter.java:
		Documented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics&r1=1.2386.2.264&r2=1.2386.2.265
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/Formattable.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/FormattableFlags.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/Formatter.java?cvsroot=classpath&only_with_tag=generics&r1=1.1.2.4&r2=1.1.2.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.264
retrieving revision 1.2386.2.265
diff -u -b -r1.2386.2.264 -r1.2386.2.265
--- ChangeLog	4 Jun 2006 21:26:33 -0000	1.2386.2.264
+++ ChangeLog	4 Jun 2006 22:38:56 -0000	1.2386.2.265
@@ -1,3 +1,10 @@
+2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/util/Formattable.java,
+	* java/util/FormattableFlags.java,
+	* java/util/Formatter.java:
+	Documented.
+
 2006-06-04  Tom Tromey  <tromey@redhat.com>
 
 	* javax/naming/Context.java (list): Genericized.

Index: java/util/Formattable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/Formattable.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- java/util/Formattable.java	25 Sep 2005 02:55:13 -0000	1.1.2.1
+++ java/util/Formattable.java	4 Jun 2006 22:38:58 -0000	1.1.2.2
@@ -38,9 +38,55 @@
 
 package java.util;
 
-/** @since 1.5 */
+/** 
+ * <p>
+ * The <code>Formattable</code> interface is used to provide customised
+ * formatting to arbitrary objects via the {@link Formatter}.  The
+ * {@link #formatTo} method is called for <code>Formattable</code>
+ * objects used with the 's' conversion operator, allowing the object
+ * to provide its own formatting of its internal data.
+ * </p>
+ * <p>
+ * Thread safety is left up to the implementing class.  Thus,
+ * {@link Formattable} objects are not guaranteed to be thread-safe,
+ * and users should make their own provisions for multiple thread access.
+ * </p>
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
 public interface Formattable
 {
+
+  /**
+   * Formats the object using the supplied formatter to the specification
+   * provided by the given flags, width and precision.
+   *
+   * @param formatter the formatter to use for formatting the object.
+   *                  The formatter gives access to the output stream
+   *                  and locale via {@link Formatter#out()} and
+   *                  {@link Formatter#locale()} respectively.
+   * @param flags a bit mask constructed from the flags in the
+   *              {@link FormattableFlags} class.  When no flags
+   *              are set, the implementing class should use its
+   *              defaults.
+   * @param width the minimum number of characters to include.
+   *              A value of -1 indicates no minimum.  The remaining
+   *              space is padded with ' ' either on the left
+   *              (the default) or right (if left justification is
+   *              specified by the flags).
+   * @param precision the maximum number of characters to include.
+   *              A value of -1 indicates no maximum.  This value
+   *              is applied prior to the minimum (the width).  Thus,
+   *              a value may meet the minimum width initially, but
+   *              not when the width value is applied, due to
+   *              characters being removed by the precision value.
+   * @throws IllegalFormatException if there is a problem with
+   *                                the syntax of the format
+   *                                specification or a mismatch
+   *                                between it and the arguments.
+   */
   public void formatTo(Formatter formatter, int flags, int width,
 		       int precision);
 }

Index: java/util/FormattableFlags.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/FormattableFlags.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- java/util/FormattableFlags.java	25 Sep 2005 02:55:13 -0000	1.1.2.2
+++ java/util/FormattableFlags.java	4 Jun 2006 22:38:58 -0000	1.1.2.3
@@ -38,19 +38,82 @@
 
 package java.util;
 
-/** @since 1.5 */
+/** 
+ * This class contains a set of flags used
+ * by the {@link Formattable#formatTo()} method.
+ * They are used to modify the output of the
+ * {@link Formattable}.  The interpretation and
+ * validation of the flags is left to the
+ * particular {@link Formattable}.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
 public class FormattableFlags
 {
+
+  /**
+   * Requires the output to be left-justified.  Any spaces
+   * required to meet the specified width will be added to
+   * the right of the output.  The default output is
+   * right-justified, where spaces are added to the left.
+   * The output is as for the format specifier
+   * '-' ('\u002d').
+   */
   public static final int LEFT_JUSTIFY = 1;
+
+  /**
+   * Requires the output to be in uppercase.  The output
+   * should be the same as the result from calling
+   * {@link String#toUpperCase(java.util.Locale)} with
+   * the formatting locale. The output is as for the
+   * format specifier '^' ('\u005e').
+   */
   public static final int UPPERCASE = 2;
+
+  /**
+   * Requires the use of an alternate form, as specified
+   * in the documentation of {@link Formattable}.
+   * The output is as for the format specifier
+   * '#' ('\u0023').
+   */
   public static final int ALTERNATE = 4;
 
   // Used internally by Formatter.
   // Changes here must be reflected in the FLAGS string there.
+
+  /**
+   * Requires the output to always include a '+' sign.
+   * The output is as for the format specifier '+'.
+   */
   static final int PLUS = 8;
+
+  /**
+   * Requires the output to include a leading space on
+   * positive value.  The output is as for the format
+   * specifier ' '.
+   */
   static final int SPACE = 16;
+
+  /**
+   * Requires the output to be zero-padded.  The output
+   * is as for the format specifier '0'.
+   */
   static final int ZERO = 32;
+
+  /**
+   * Requires the output to include locale-specific
+   * grouping operators.  The output is as for the
+   * format specifier ','.
+   */
   static final int COMMA = 64;
+
+  /**
+   * Requires the output to include negative numbers
+   * enclosed in parentheses.  The output is as for
+   * the format specifier '('.
+   */
   static final int PAREN = 128;
 
   // Not instantiable.

Index: java/util/Formatter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/Formatter.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- java/util/Formatter.java	20 Mar 2006 01:03:50 -0000	1.1.2.4
+++ java/util/Formatter.java	4 Jun 2006 22:38:58 -0000	1.1.2.5
@@ -54,116 +54,334 @@
 
 import gnu.classpath.SystemProperties;
 
-/** @since 1.5 */
+/** 
+ * <p>
+ * A Java formatter for <code>printf</code>-style format strings,
+ * as seen in the C programming language.   This differs from the
+ * C interpretation of such strings by performing much stricter
+ * checking of format specifications and their corresponding
+ * arguments.  While unknown conversions will be ignored in C,
+ * and invalid conversions will only produce compiler warnings,
+ * the Java version utilises a full range of run-time exceptions to
+ * handle these cases.  The Java version is also more customisable
+ * by virtue of the provision of the {@link Formattable} interface,
+ * which allows an arbitrary class to be formatted by the formatter.
+ * </p>
+ * <p>
+ * The formatter is accessible by more convienient static methods.
+ * For example, streams now have appropriate format methods
+ * (the equivalent of <code>fprintf</code>) as do <code>String</code>
+ * objects (the equivalent of <code>sprintf</code>).
+ * </p>
+ * <p>
+ * <strong>Note</strong>: the formatter is not thread-safe.  For
+ * multi-threaded access, external synchronization should be provided.
+ * </p>
+ *  
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
 public final class Formatter 
   implements Closeable, Flushable
 {
+
+  /**
+   * The output of the formatter.
+   */
   private Appendable out;
+
+  /**
+   * The locale used by the formatter.
+   */
   private Locale locale;
+
+  /**
+   * Whether or not the formatter is closed.
+   */
   private boolean closed;
+
+  /**
+   * The last I/O exception thrown by the output stream.
+   */
   private IOException ioException;
 
   // Some state used when actually formatting.
+  /**
+   * The format string.
+   */
   private String format;
+
+  /**
+   * The current index into the string.
+   */
   private int index;
+
+  /**
+   * The length of the format string.
+   */
   private int length;
+
+  /**
+   * The formatting locale.
+   */
   private Locale fmtLocale;
 
   // Note that we include '-' twice.  The flags are ordered to
   // correspond to the values in FormattableFlags, and there is no
   // flag (in the sense of this field used when parsing) for
   // UPPERCASE; the second '-' serves as a placeholder.
+  /**
+   * A string used to index into the formattable flags.
+   */
   private static final String FLAGS = "--#+ 0,(";
 
+  /**
+   * The system line separator.
+   */
   private static final String lineSeparator
     = SystemProperties.getProperty("line.separator");
 
+  /**
+   * The type of numeric output format for a {@link BigDecimal}.
+   */
   public enum BigDecimalLayoutForm
   {
     DECIMAL_FLOAT,
     SCIENTIFIC
   }
 
+  /**
+   * Constructs a new <code>Formatter</code> using the default
+   * locale and a {@link StringBuilder} as the output stream.
+   */
   public Formatter()
   {
-    this.out = new StringBuilder();
+    this(null, Locale.getDefault());
   }
 
+  /**
+   * Constructs a new <code>Formatter</code> using the specified
+   * locale and a {@link StringBuilder} as the output stream.
+   * If the locale is <code>null</code>, then no localization
+   * is applied.
+   *
+   * @param loc the locale to use.
+   */
   public Formatter(Locale loc)
   {
-    this.out = new StringBuilder();
-    this.locale = loc;
+    this(null, loc);
   }
 
+  /**
+   * Constructs a new <code>Formatter</code> using the default
+   * locale and the specified output stream.
+   *
+   * @param app the output stream to use.
+   */
   public Formatter(Appendable app)
   {
-    this(app, null);
+    this(app, Locale.getDefault());
   }
 
+  /**
+   * Constructs a new <code>Formatter</code> using the specified
+   * locale and the specified output stream.  If the locale is
+   * <code>null</code>, then no localization is applied.
+   *
+   * @param app the output stream to use.
+   * @param loc the locale to use.
+   */
   public Formatter(Appendable app, Locale loc)
   {
     this.out = app == null ? new StringBuilder() : app;
     this.locale = loc;
   }
 
-  public Formatter(File file) throws FileNotFoundException
+  /**
+   * Constructs a new <code>Formatter</code> using the default
+   * locale and character set, with the specified file as the
+   * output stream.
+   *
+   * @param file the file to use for output.
+   * @throws FileNotFoundException if the file does not exist
+   *                               and can not be created.
+   * @throws SecurityException if a security manager is present
+   *                           and doesn't allow writing to the file.
+   */
+  public Formatter(File file) 
+    throws FileNotFoundException
   {
-    this.out = new OutputStreamWriter(new FileOutputStream(file));
+    this(new OutputStreamWriter(new FileOutputStream(file)));
   }
 
+  /**
+   * Constructs a new <code>Formatter</code> using the default
+   * locale, with the specified file as the output stream
+   * and the supplied character set.
+   *
+   * @param file the file to use for output.
+   * @param charset the character set to use for output.
+   * @throws FileNotFoundException if the file does not exist
+   *                               and can not be created.
+   * @throws SecurityException if a security manager is present
+   *                           and doesn't allow writing to the file.
+   * @throws UnsupportedEncodingException if the supplied character
+   *                                      set is not supported.
+   */
   public Formatter(File file, String charset)
     throws FileNotFoundException, UnsupportedEncodingException
   {
-    this(file, charset, null);
+    this(file, charset, Locale.getDefault());
   }
 
+  /**
+   * Constructs a new <code>Formatter</code> using the specified
+   * file as the output stream with the supplied character set
+   * and locale.  If the locale is <code>null</code>, then no
+   * localization is applied.
+   *
+   * @param file the file to use for output.
+   * @param charset the character set to use for output.
+   * @param loc the locale to use.
+   * @throws FileNotFoundException if the file does not exist
+   *                               and can not be created.
+   * @throws SecurityException if a security manager is present
+   *                           and doesn't allow writing to the file.
+   * @throws UnsupportedEncodingException if the supplied character
+   *                                      set is not supported.
+   */
   public Formatter(File file, String charset, Locale loc)
     throws FileNotFoundException, UnsupportedEncodingException
   {
-    this.out = new OutputStreamWriter(new FileOutputStream(file), charset);
+    this(new OutputStreamWriter(new FileOutputStream(file), charset),
+	 loc);
   }
 
+  /**
+   * Constructs a new <code>Formatter</code> using the default
+   * locale and character set, with the specified output stream.
+   *
+   * @param out the output stream to use.
+   */
   public Formatter(OutputStream out)
   {
-    this.out = new OutputStreamWriter(out);
+    this(new OutputStreamWriter(out));
   }
 
+  /**
+   * Constructs a new <code>Formatter</code> using the default
+   * locale, with the specified file output stream and the
+   * supplied character set.
+   *
+   * @param out the output stream.
+   * @param charset the character set to use for output.
+   * @throws UnsupportedEncodingException if the supplied character
+   *                                      set is not supported.
+   */
   public Formatter(OutputStream out, String charset)
     throws UnsupportedEncodingException
   {
-    this(out, charset, null);
+    this(out, charset, Locale.getDefault());
   }
 
+  /**
+   * Constructs a new <code>Formatter</code> using the specified
+   * output stream with the supplied character set and locale.
+   * If the locale is <code>null</code>, then no localization is
+   * applied.
+   *
+   * @param file the output stream.
+   * @param charset the character set to use for output.
+   * @param loc the locale to use.
+   * @throws UnsupportedEncodingException if the supplied character
+   *                                      set is not supported.
+   */
   public Formatter(OutputStream out, String charset, Locale loc)
     throws UnsupportedEncodingException
   {
-    this.out = new OutputStreamWriter(out, charset);
-    this.locale = loc;
+    this(new OutputStreamWriter(out, charset), loc);
   }
 
+  /**
+   * Constructs a new <code>Formatter</code> using the default
+   * locale with the specified output stream.  The character
+   * set used is that of the output stream.
+   *
+   * @param out the output stream to use.
+   */
   public Formatter(PrintStream out)
   {
-    this.out = out;
+    this((Appendable) out);
   }
 
+  /**
+   * Constructs a new <code>Formatter</code> using the default
+   * locale and character set, with the specified file as the
+   * output stream.
+   *
+   * @param file the file to use for output.
+   * @throws FileNotFoundException if the file does not exist
+   *                               and can not be created.
+   * @throws SecurityException if a security manager is present
+   *                           and doesn't allow writing to the file.
+   */
   public Formatter(String file) throws FileNotFoundException
   {
-    this.out = new OutputStreamWriter(new FileOutputStream(file));
+    this(new OutputStreamWriter(new FileOutputStream(file)));
   }
 
+  /**
+   * Constructs a new <code>Formatter</code> using the default
+   * locale, with the specified file as the output stream
+   * and the supplied character set.
+   *
+   * @param file the file to use for output.
+   * @param charset the character set to use for output.
+   * @throws FileNotFoundException if the file does not exist
+   *                               and can not be created.
+   * @throws SecurityException if a security manager is present
+   *                           and doesn't allow writing to the file.
+   * @throws UnsupportedEncodingException if the supplied character
+   *                                      set is not supported.
+   */
   public Formatter(String file, String charset)
     throws FileNotFoundException, UnsupportedEncodingException
   {
-    this(file, charset, null);
+    this(file, charset, Locale.getDefault());
   }
 
+  /**
+   * Constructs a new <code>Formatter</code> using the specified
+   * file as the output stream with the supplied character set
+   * and locale.  If the locale is <code>null</code>, then no
+   * localization is applied.
+   *
+   * @param file the file to use for output.
+   * @param charset the character set to use for output.
+   * @param loc the locale to use.
+   * @throws FileNotFoundException if the file does not exist
+   *                               and can not be created.
+   * @throws SecurityException if a security manager is present
+   *                           and doesn't allow writing to the file.
+   * @throws UnsupportedEncodingException if the supplied character
+   *                                      set is not supported.
+   */
   public Formatter(String file, String charset, Locale loc)
     throws FileNotFoundException, UnsupportedEncodingException
   {
-    this.out = new OutputStreamWriter(new FileOutputStream(file), charset);
-    this.locale = loc;
+    this(new OutputStreamWriter(new FileOutputStream(file), charset),
+	 loc);
   }
 
+  /**
+   * Closes the formatter, so as to release used resources.
+   * If the underlying output stream supports the {@link Closeable}
+   * interface, then this is also closed.  Attempts to use
+   * a formatter instance, via any method other than
+   * {@link #ioException()}, after closure results in a
+   * {@link FormatterClosedException}.
+   */
   public void close()
   {
     if (closed)
@@ -181,6 +399,13 @@
     closed = true;
   }
 
+  /**
+   * Flushes the formatter, writing any cached data to the output
+   * stream.  If the underlying output stream supports the
+   * {@link Flushable} interface, it is also flushed.
+   *
+   * @throws FormatterClosedException if the formatter is closed.
+   */
   public void flush()
   {
     if (closed)
@@ -199,6 +424,9 @@
 
   /**
    * Return the name corresponding to a flag.
+   *
+   * @param flags the flag to return the name of.
+   * @return the name of the flag.
    */
   private String getName(int flags)
   {
@@ -210,6 +438,10 @@
 
   /**
    * Verify the flags passed to a conversion.
+   *
+   * @param flags the flags to verify.
+   * @param allowed the allowed flags mask.
+   * @param conversion the conversion character.
    */
   private void checkFlags(int flags, int allowed, char conversion)
   {
@@ -220,7 +452,9 @@
   }
 
   /**
-   * Throw an exception is a precision was specified.
+   * Throw an exception if a precision was specified.
+   *
+   * @param precision the precision value (-1 indicates not specified).
    */
   private void noPrecision(int precision)
   {
@@ -230,6 +464,11 @@
 
   /**
    * Apply the numeric localization algorithm to a StringBuilder.
+   *
+   * @param builder the builder to apply to.
+   * @param flags the formatting flags to use.
+   * @param width the width of the numeric value.
+   * @param isNegative true if the value is negative.
    */
   private void applyLocalization(StringBuilder builder, int flags, int width,
 				 boolean isNegative)
@@ -301,6 +540,12 @@
   /**
    * A helper method that handles emitting a String after applying
    * precision, width, justification, and upper case flags.
+   *
+   * @param arg the string to emit.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @throws IOException if the output stream throws an I/O error.
    */
   private void genericFormat(String arg, int flags, int width, int precision)
     throws IOException
@@ -332,7 +577,16 @@
       }
   }
 
-  /** Emit a boolean.  */
+  /** 
+   * Emit a boolean.  
+   *
+   * @param arg the boolean to emit.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param conversion the conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
   private void booleanFormat(Object arg, int flags, int width, int precision,
 			     char conversion)
     throws IOException
@@ -348,7 +602,16 @@
     genericFormat(result, flags, width, precision);
   }
 
-  /** Emit a hash code.  */
+  /** 
+   * Emit a hash code.  
+   *
+   * @param arg the hash code to emit.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param conversion the conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
   private void hashCodeFormat(Object arg, int flags, int width, int precision,
 			      char conversion)
     throws IOException
@@ -360,7 +623,16 @@
 		  flags, width, precision);
   }
 
-  /** Emit via a String or Formattable conversion.  */
+  /** 
+   * Emit a String or Formattable conversion.  
+   *
+   * @param arg the String or Formattable to emit.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param conversion the conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
   private void stringFormat(Object arg, int flags, int width, int precision,
 			    char conversion)
     throws IOException
@@ -385,7 +657,16 @@
       }
   }
 
-  /** Emit a character value.  */
+  /** 
+   * Emit a character.  
+   *
+   * @param arg the character to emit.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param conversion the conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
   private void characterFormat(Object arg, int flags, int width, int precision,
 			       char conversion)
     throws IOException
@@ -414,7 +695,14 @@
     genericFormat(result, flags, width, precision);
   }
 
-  /** Emit a '%'.  */
+  /** 
+   * Emit a '%'.
+   *
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @throws IOException if the output stream throws an I/O error.
+   */
   private void percentFormat(int flags, int width, int precision)
     throws IOException
   {
@@ -423,7 +711,14 @@
     genericFormat("%", flags, width, precision);
   }
 
-  /** Emit a newline.  */
+  /** 
+   * Emit a newline.
+   *
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @throws IOException if the output stream throws an I/O error.
+   */
   private void newLineFormat(int flags, int width, int precision)
     throws IOException
   {
@@ -437,6 +732,14 @@
   /**
    * Helper method to do initial formatting and checking for integral
    * conversions.
+   *
+   * @param arg the formatted argument.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param radix the radix of the number.
+   * @param conversion the conversion character.
+   * @return the result.
    */
   private StringBuilder basicIntegralConversion(Object arg, int flags,
 						int width, int precision,
@@ -501,7 +804,17 @@
     return new StringBuilder(result);
   }
 
-  /** Emit a hex or octal value.  */
+  /** 
+   * Emit a hex or octal value.  
+   * 
+   * @param arg the hexadecimal or octal value.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param radix the radix of the number.
+   * @param conversion the conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
   private void hexOrOctalConversion(Object arg, int flags, int width,
 				    int precision, int radix,
 				    char conversion)
@@ -573,7 +886,16 @@
     out.append(result);
   }
 
-  /** Emit a decimal value.  */
+  /** 
+   * Emit a decimal value.  
+   * 
+   * @param arg the hexadecimal or octal value.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param conversion the conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
   private void decimalConversion(Object arg, int flags, int width,
 				 int precision, char conversion)
     throws IOException
@@ -593,7 +915,14 @@
     genericFormat(builder.toString(), flags, width, precision);
   }
 
-  /** Emit a single date or time conversion to a StringBuilder.  */
+  /** 
+   * Emit a single date or time conversion to a StringBuilder.  
+   *
+   * @param builder the builder to write to.
+   * @param cal the calendar to use in the conversion.
+   * @param conversion the formatting character to specify the type of data.
+   * @param syms the date formatting symbols.
+   */
   private void singleDateTimeConversion(StringBuilder builder, Calendar cal,
 					char conversion,
 					DateFormatSymbols syms)
@@ -777,7 +1106,17 @@
       }
   }
 
-  /** Emit a date or time value.  */
+  /**
+   * Emit a date or time value.
+   *
+   * @param arg the date or time value.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param conversion the conversion character.
+   * @param subConversion the sub conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
   private void dateTimeConversion(Object arg, int flags, int width,
 				  int precision, char conversion,
 				  char subConversion)
@@ -824,6 +1163,8 @@
   /**
    * Advance the internal parsing index, and throw an exception
    * on overrun.
+   *
+   * @throws IllegalArgumentException on overrun.
    */
   private void advance()
   {
@@ -838,6 +1179,8 @@
   /**
    * Parse an integer appearing in the format string.  Will return -1
    * if no integer was found.
+   *
+   * @return the parsed integer.
    */
   private int parseInt()
   {
@@ -853,6 +1196,8 @@
    * Parse the argument index.  Returns -1 if there was no index, 0 if
    * we should re-use the previous index, and a positive integer to
    * indicate an absolute index.
+   *
+   * @return the parsed argument index.
    */
   private int parseArgumentIndex()
   {
@@ -882,6 +1227,8 @@
    * Parse a set of flags and return a bit mask of values from
    * FormattableFlags.  Will throw an exception if a flag is
    * duplicated.
+   *
+   * @return the parsed flags.
    */
   private int parseFlags()
   {
@@ -905,6 +1252,8 @@
   /**
    * Parse the width part of a format string.  Returns -1 if no width
    * was specified.
+   *
+   * @return the parsed width.
    */
   private int parseWidth()
   {
@@ -914,6 +1263,8 @@
   /**
    * If the current character is '.', parses the precision part of a
    * format string.  Returns -1 if no precision was specified.
+   *
+   * @return the parsed precision.
    */
   private int parsePrecision()
   {
@@ -927,6 +1278,23 @@
     return precision;
   }
 
+  /**
+   * Outputs a formatted string based on the supplied specification,
+   * <code>fmt</code>, and its arguments using the specified locale.
+   * The locale of the formatter does not change as a result; the
+   * specified locale is just used for this particular formatting
+   * operation.  If the locale is <code>null</code>, then no
+   * localization is applied.
+   *
+   * @param loc the locale to use for this format.
+   * @param fmt the format specification.
+   * @param args the arguments to apply to the specification.
+   * @throws IllegalFormatException if there is a problem with
+   *                                the syntax of the format
+   *                                specification or a mismatch
+   *                                between it and the arguments.
+   * @throws FormatterClosedException if the formatter is closed.
+   */ 
   public Formatter format(Locale loc, String fmt, Object... args)
   {
     if (closed)
@@ -1058,16 +1426,41 @@
     return this;
   }
 
+  /**
+   * Outputs a formatted string based on the supplied specification,
+   * <code>fmt</code>, and its arguments using the formatter's locale.
+   *
+   * @param fmt the format specification.
+   * @param args the arguments to apply to the specification.
+   * @throws IllegalFormatException if there is a problem with
+   *                                the syntax of the format
+   *                                specification or a mismatch
+   *                                between it and the arguments.
+   * @throws FormatterClosedException if the formatter is closed.
+   */
   public Formatter format(String format, Object... args)
   {
     return format(locale, format, args);
   }
 
+  /**
+   * Returns the last I/O exception thrown by the
+   * <code>append()</code> operation of the underlying
+   * output stream.
+   *
+   * @return the last I/O exception.
+   */
   public IOException ioException()
   {
     return ioException;
   }
 
+  /**
+   * Returns the locale used by this formatter.
+   *
+   * @return the formatter's locale.
+   * @throws FormatterClosedException if the formatter is closed.
+   */
   public Locale locale()
   {
     if (closed)
@@ -1075,6 +1468,12 @@
     return locale;
   }
 
+  /**
+   * Returns the output stream used by this formatter.
+   *
+   * @return the formatter's output stream.
+   * @throws FormatterClosedException if the formatter is closed.
+   */
   public Appendable out()
   {
     if (closed)
@@ -1082,6 +1481,15 @@
     return out;
   }
 
+  /**
+   * Returns the result of applying {@link Object#toString()}
+   * to the underlying output stream.  The results returned
+   * depend on the particular {@link Appendable} being used.
+   * For example, a {@link StringBuilder} will return the
+   * formatted output but an I/O stream will not.
+   *
+   * @throws FormatterClosedException if the formatter is closed.
+   */
   public String toString()
   {
     if (closed)



From MAILER-DAEMON Sun Jun 04 19:36:36 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fn296-0001I7-AJ
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 19:36:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fn294-0001HU-Av
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 19:36:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fn28z-0001FC-O6
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 19:36:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fn28z-0001Et-FL
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 19:36:29 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fn2G0-0002Fi-4R
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 19:43:44 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fn28y-0000Db-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 19:36:28 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fn28x-0000DP-MU
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 23:36:28 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fn28x-0000DP-MU@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 04 Jun 2006 23:36:27 +0000
Subject: [commit-cp] classpath ChangeLog java/util/Formattable.java ...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jun 2006 23:36:35 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/04 23:36:27

Modified files:
	.              : ChangeLog 
Added files:
	java/util      : Formattable.java FormattableFlags.java 
	                 Formatter.java 

Log message:
	2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/util/Formattable.java,
		* java/util/FormattableFlags.java,
		* java/util/Formatter.java:
		Documented.
	
	2006-03-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/util/Formatter.java:
		Make the class final.
	
	2005-09-26  Tom Tromey  <tromey@redhat.com>
	
		* java/util/Formatter.java (format): Set fmtLocale.
		(applyLocalization): New method.
		(basicIntegralConversion): Likewise.
		(hexOrOctalConversion): Use it.
		(decimalConversion): New method.
		(format): Use decimalConversion, dateTimeConversion.
		(genericFormat): Upper-case earlier.  Justify correctly.
		(singleDateTimeConversion): New method.
		(dateTimeConversion): Likewise.
	
	2005-09-25  Tom Tromey  <tromey@redhat.com>
	
		* java/util/Formatter.java (lineSeparator): Use SystemProperties.
	
	2005-09-24  Tom Tromey  <tromey@redhat.com>
	
		* java/util/FormattableFlags.java (PLUS, SPACE, ZERO, COMMA,
		PAREN): New constants.
		* java/util/Formattable.java: New file.
		* java/util/Formatter.java: New file.
	
	2005-08-13  Tom Tromey  <tromey@redhat.com>
	
		* java/util/FormattableFlags.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7651&r2=1.7652
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/Formattable.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/FormattableFlags.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/Formatter.java?cvsroot=classpath&rev=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7651
retrieving revision 1.7652
diff -u -b -r1.7651 -r1.7652
--- ChangeLog	4 Jun 2006 20:21:39 -0000	1.7651
+++ ChangeLog	4 Jun 2006 23:36:26 -0000	1.7652
@@ -1,3 +1,42 @@
+2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/util/Formattable.java,
+	* java/util/FormattableFlags.java,
+	* java/util/Formatter.java:
+	Documented.
+
+2006-03-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/util/Formatter.java:
+	Make the class final.
+
+2005-09-26  Tom Tromey  <tromey@redhat.com>
+
+	* java/util/Formatter.java (format): Set fmtLocale.
+	(applyLocalization): New method.
+	(basicIntegralConversion): Likewise.
+	(hexOrOctalConversion): Use it.
+	(decimalConversion): New method.
+	(format): Use decimalConversion, dateTimeConversion.
+	(genericFormat): Upper-case earlier.  Justify correctly.
+	(singleDateTimeConversion): New method.
+	(dateTimeConversion): Likewise.
+
+2005-09-25  Tom Tromey  <tromey@redhat.com>
+
+	* java/util/Formatter.java (lineSeparator): Use SystemProperties.
+
+2005-09-24  Tom Tromey  <tromey@redhat.com>
+
+	* java/util/FormattableFlags.java (PLUS, SPACE, ZERO, COMMA,
+	PAREN): New constants.
+	* java/util/Formattable.java: New file.
+	* java/util/Formatter.java: New file.
+
+2005-08-13  Tom Tromey  <tromey@redhat.com>
+
+	* java/util/FormattableFlags.java: New file.
+
 2006-06-04  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/peer/gtk/GtkComponentPeer.java

Index: java/util/Formattable.java
===================================================================
RCS file: java/util/Formattable.java
diff -N java/util/Formattable.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/Formattable.java	4 Jun 2006 23:36:27 -0000	1.2
@@ -0,0 +1,92 @@
+/* Formattable.java -- Objects which can be passed to a Formatter
+   Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * <p>
+ * The <code>Formattable</code> interface is used to provide customised
+ * formatting to arbitrary objects via the {@link Formatter}.  The
+ * {@link #formatTo} method is called for <code>Formattable</code>
+ * objects used with the 's' conversion operator, allowing the object
+ * to provide its own formatting of its internal data.
+ * </p>
+ * <p>
+ * Thread safety is left up to the implementing class.  Thus,
+ * {@link Formattable} objects are not guaranteed to be thread-safe,
+ * and users should make their own provisions for multiple thread access.
+ * </p>
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public interface Formattable
+{
+
+  /**
+   * Formats the object using the supplied formatter to the specification
+   * provided by the given flags, width and precision.
+   *
+   * @param formatter the formatter to use for formatting the object.
+   *                  The formatter gives access to the output stream
+   *                  and locale via {@link Formatter#out()} and
+   *                  {@link Formatter#locale()} respectively.
+   * @param flags a bit mask constructed from the flags in the
+   *              {@link FormattableFlags} class.  When no flags
+   *              are set, the implementing class should use its
+   *              defaults.
+   * @param width the minimum number of characters to include.
+   *              A value of -1 indicates no minimum.  The remaining
+   *              space is padded with ' ' either on the left
+   *              (the default) or right (if left justification is
+   *              specified by the flags).
+   * @param precision the maximum number of characters to include.
+   *              A value of -1 indicates no maximum.  This value
+   *              is applied prior to the minimum (the width).  Thus,
+   *              a value may meet the minimum width initially, but
+   *              not when the width value is applied, due to
+   *              characters being removed by the precision value.
+   * @throws IllegalFormatException if there is a problem with
+   *                                the syntax of the format
+   *                                specification or a mismatch
+   *                                between it and the arguments.
+   */
+  public void formatTo(Formatter formatter, int flags, int width,
+		       int precision);
+}

Index: java/util/FormattableFlags.java
===================================================================
RCS file: java/util/FormattableFlags.java
diff -N java/util/FormattableFlags.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/FormattableFlags.java	4 Jun 2006 23:36:27 -0000	1.2
@@ -0,0 +1,123 @@
+/* FormattableFlags.java --
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * This class contains a set of flags used
+ * by the {@link Formattable#formatTo()} method.
+ * They are used to modify the output of the
+ * {@link Formattable}.  The interpretation and
+ * validation of the flags is left to the
+ * particular {@link Formattable}.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class FormattableFlags
+{
+
+  /**
+   * Requires the output to be left-justified.  Any spaces
+   * required to meet the specified width will be added to
+   * the right of the output.  The default output is
+   * right-justified, where spaces are added to the left.
+   * The output is as for the format specifier
+   * '-' ('\u002d').
+   */
+  public static final int LEFT_JUSTIFY = 1;
+
+  /**
+   * Requires the output to be in uppercase.  The output
+   * should be the same as the result from calling
+   * {@link String#toUpperCase(java.util.Locale)} with
+   * the formatting locale. The output is as for the
+   * format specifier '^' ('\u005e').
+   */
+  public static final int UPPERCASE = 2;
+
+  /**
+   * Requires the use of an alternate form, as specified
+   * in the documentation of {@link Formattable}.
+   * The output is as for the format specifier
+   * '#' ('\u0023').
+   */
+  public static final int ALTERNATE = 4;
+
+  // Used internally by Formatter.
+  // Changes here must be reflected in the FLAGS string there.
+
+  /**
+   * Requires the output to always include a '+' sign.
+   * The output is as for the format specifier '+'.
+   */
+  static final int PLUS = 8;
+
+  /**
+   * Requires the output to include a leading space on
+   * positive value.  The output is as for the format
+   * specifier ' '.
+   */
+  static final int SPACE = 16;
+
+  /**
+   * Requires the output to be zero-padded.  The output
+   * is as for the format specifier '0'.
+   */
+  static final int ZERO = 32;
+
+  /**
+   * Requires the output to include locale-specific
+   * grouping operators.  The output is as for the
+   * format specifier ','.
+   */
+  static final int COMMA = 64;
+
+  /**
+   * Requires the output to include negative numbers
+   * enclosed in parentheses.  The output is as for
+   * the format specifier '('.
+   */
+  static final int PAREN = 128;
+
+  // Not instantiable.
+  private FormattableFlags()
+  {
+  }
+}

Index: java/util/Formatter.java
===================================================================
RCS file: java/util/Formatter.java
diff -N java/util/Formatter.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/Formatter.java	4 Jun 2006 23:36:27 -0000	1.2
@@ -0,0 +1,1294 @@
+/* Formatter.java -- printf-style formatting
+   Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.Flushable;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.text.DateFormatSymbols;
+import java.text.DecimalFormatSymbols;
+
+import gnu.classpath.SystemProperties;
+
+/** 
+ * <p>
+ * A Java formatter for <code>printf</code>-style format strings,
+ * as seen in the C programming language.   This differs from the
+ * C interpretation of such strings by performing much stricter
+ * checking of format specifications and their corresponding
+ * arguments.  While unknown conversions will be ignored in C,
+ * and invalid conversions will only produce compiler warnings,
+ * the Java version utilises a full range of run-time exceptions to
+ * handle these cases.  The Java version is also more customisable
+ * by virtue of the provision of the {@link Formattable} interface,
+ * which allows an arbitrary class to be formatted by the formatter.
+ * </p>
+ * <p>
+ * The formatter is accessible by more convienient static methods.
+ * For example, streams now have appropriate format methods
+ * (the equivalent of <code>fprintf</code>) as do <code>String</code>
+ * objects (the equivalent of <code>sprintf</code>).
+ * </p>
+ * <p>
+ * <strong>Note</strong>: the formatter is not thread-safe.  For
+ * multi-threaded access, external synchronization should be provided.
+ * </p>
+ *  
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public final class Formatter 
+  implements Closeable, Flushable
+{
+
+  /**
+   * The output of the formatter.
+   */
+  private StringBuilder out;
+
+  /**
+   * The locale used by the formatter.
+   */
+  private Locale locale;
+
+  /**
+   * Whether or not the formatter is closed.
+   */
+  private boolean closed;
+
+  /**
+   * The last I/O exception thrown by the output stream.
+   */
+  private IOException ioException;
+
+  // Some state used when actually formatting.
+  /**
+   * The format string.
+   */
+  private String format;
+
+  /**
+   * The current index into the string.
+   */
+  private int index;
+
+  /**
+   * The length of the format string.
+   */
+  private int length;
+
+  /**
+   * The formatting locale.
+   */
+  private Locale fmtLocale;
+
+  // Note that we include '-' twice.  The flags are ordered to
+  // correspond to the values in FormattableFlags, and there is no
+  // flag (in the sense of this field used when parsing) for
+  // UPPERCASE; the second '-' serves as a placeholder.
+  /**
+   * A string used to index into the formattable flags.
+   */
+  private static final String FLAGS = "--#+ 0,(";
+
+  /**
+   * The system line separator.
+   */
+  private static final String lineSeparator
+    = SystemProperties.getProperty("line.separator");
+
+  /**
+   * Constructs a new <code>Formatter</code> using the default
+   * locale and a {@link StringBuilder} as the output stream.
+   */
+  public Formatter()
+  {
+    this(null, Locale.getDefault());
+  }
+
+  /**
+   * Constructs a new <code>Formatter</code> using the specified
+   * locale and a {@link StringBuilder} as the output stream.
+   * If the locale is <code>null</code>, then no localization
+   * is applied.
+   *
+   * @param loc the locale to use.
+   */
+  public Formatter(Locale loc)
+  {
+    this(null, loc);
+  }
+
+  /**
+   * Constructs a new <code>Formatter</code> using the default
+   * locale and the specified output stream.
+   *
+   * @param app the output stream to use.
+   */
+  public Formatter(StringBuilder app)
+  {
+    this(app, Locale.getDefault());
+  }
+
+  /**
+   * Constructs a new <code>Formatter</code> using the specified
+   * locale and the specified output stream.  If the locale is
+   * <code>null</code>, then no localization is applied.
+   *
+   * @param app the output stream to use.
+   * @param loc the locale to use.
+   */
+  public Formatter(StringBuilder app, Locale loc)
+  {
+    this.out = app == null ? new StringBuilder() : app;
+    this.locale = loc;
+  }
+
+  /**
+   * Closes the formatter, so as to release used resources.
+   * If the underlying output stream supports the {@link Closeable}
+   * interface, then this is also closed.  Attempts to use
+   * a formatter instance, via any method other than
+   * {@link #ioException()}, after closure results in a
+   * {@link FormatterClosedException}.
+   */
+  public void close()
+  {
+    if (closed)
+      return;
+    closed = true;
+  }
+
+  /**
+   * Flushes the formatter, writing any cached data to the output
+   * stream.  If the underlying output stream supports the
+   * {@link Flushable} interface, it is also flushed.
+   *
+   * @throws FormatterClosedException if the formatter is closed.
+   */
+  public void flush()
+  {
+    if (closed)
+      throw new FormatterClosedException();
+  }
+
+  /**
+   * Return the name corresponding to a flag.
+   *
+   * @param flags the flag to return the name of.
+   * @return the name of the flag.
+   */
+  private String getName(int flags)
+  {
+    // FIXME: do we want all the flags in here?
+    // Or should we redo how this is reported?
+    int bit = Integer.numberOfTrailingZeros(flags);
+    return FLAGS.substring(bit, bit + 1);
+  }
+
+  /**
+   * Verify the flags passed to a conversion.
+   *
+   * @param flags the flags to verify.
+   * @param allowed the allowed flags mask.
+   * @param conversion the conversion character.
+   */
+  private void checkFlags(int flags, int allowed, char conversion)
+  {
+    flags &= ~allowed;
+    if (flags != 0)
+      throw new FormatFlagsConversionMismatchException(getName(flags),
+						       conversion);
+  }
+
+  /**
+   * Throw an exception if a precision was specified.
+   *
+   * @param precision the precision value (-1 indicates not specified).
+   */
+  private void noPrecision(int precision)
+  {
+    if (precision != -1)
+      throw new IllegalFormatPrecisionException(precision);
+  }
+
+  /**
+   * Apply the numeric localization algorithm to a StringBuilder.
+   *
+   * @param builder the builder to apply to.
+   * @param flags the formatting flags to use.
+   * @param width the width of the numeric value.
+   * @param isNegative true if the value is negative.
+   */
+  private void applyLocalization(StringBuilder builder, int flags, int width,
+				 boolean isNegative)
+  {
+    DecimalFormatSymbols dfsyms;
+    if (fmtLocale == null)
+      dfsyms = new DecimalFormatSymbols();
+    else
+      dfsyms = new DecimalFormatSymbols(fmtLocale);
+
+    // First replace each digit.
+    char zeroDigit = dfsyms.getZeroDigit();
+    int decimalOffset = -1;
+    for (int i = builder.length() - 1; i >= 0; --i)
+      {
+	char c = builder.charAt(i);
+	if (c >= '0' && c <= '9')
+	  builder.setCharAt(i, (char) (c - '0' + zeroDigit));
+	else if (c == '.')
+	  {
+	    assert decimalOffset == -1;
+	    decimalOffset = i;
+	  }
+      }
+
+    // Localize the decimal separator.
+    if (decimalOffset != -1)
+      {
+	builder.deleteCharAt(decimalOffset);
+	builder.insert(decimalOffset, dfsyms.getDecimalSeparator());
+      }
+	
+    // Insert the grouping separators.
+    if ((flags & FormattableFlags.COMMA) != 0)
+      {
+	char groupSeparator = dfsyms.getGroupingSeparator();
+	int groupSize = 3;	// FIXME
+	int offset = (decimalOffset == -1) ? builder.length() : decimalOffset;
+	// We use '>' because we don't want to insert a separator
+	// before the first digit.
+	for (int i = offset - groupSize; i > 0; i -= groupSize)
+	  builder.insert(i, groupSeparator);
+      }
+
+    if ((flags & FormattableFlags.ZERO) != 0)
+      {
+	// Zero fill.  Note that according to the algorithm we do not
+	// insert grouping separators here.
+	for (int i = width - builder.length(); i > 0; --i)
+	  builder.insert(0, zeroDigit);
+      }
+
+    if (isNegative)
+      {
+	if ((flags & FormattableFlags.PAREN) != 0)
+	  {
+	    builder.insert(0, '(');
+	    builder.append(')');
+	  }
+	else
+	  builder.insert(0, '-');
+      }
+    else if ((flags & FormattableFlags.PLUS) != 0)
+      builder.insert(0, '+');
+    else if ((flags & FormattableFlags.SPACE) != 0)
+      builder.insert(0, ' ');
+  }
+
+  /**
+   * A helper method that handles emitting a String after applying
+   * precision, width, justification, and upper case flags.
+   *
+   * @param arg the string to emit.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @throws IOException if the output stream throws an I/O error.
+   */
+  private void genericFormat(String arg, int flags, int width, int precision)
+    throws IOException
+  {
+    if ((flags & FormattableFlags.UPPERCASE) != 0)
+      {
+	if (fmtLocale == null)
+	  arg = arg.toUpperCase();
+	else
+	  arg = arg.toUpperCase(fmtLocale);
+      }
+
+    if (precision >= 0 && arg.length() > precision)
+      arg = arg.substring(0, precision);
+
+    boolean leftJustify = (flags & FormattableFlags.LEFT_JUSTIFY) != 0;
+    if (leftJustify && width == -1)
+      throw new MissingFormatWidthException("fixme");
+    if (! leftJustify && arg.length() < width)
+      {
+	for (int i = width - arg.length(); i > 0; --i)
+	  out.append(' ');
+      }
+    out.append(arg);
+    if (leftJustify && arg.length() < width)
+      {
+	for (int i = width - arg.length(); i > 0; --i)
+	  out.append(' ');
+      }
+  }
+
+  /** 
+   * Emit a boolean.  
+   *
+   * @param arg the boolean to emit.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param conversion the conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
+  private void booleanFormat(Object arg, int flags, int width, int precision,
+			     char conversion)
+    throws IOException
+  {
+    checkFlags(flags,
+	       FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
+	       conversion);
+    String result;
+    if (arg instanceof Boolean)
+      result = String.valueOf((Boolean) arg);
+    else
+      result = arg == null ? "false" : "true";
+    genericFormat(result, flags, width, precision);
+  }
+
+  /** 
+   * Emit a hash code.  
+   *
+   * @param arg the hash code to emit.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param conversion the conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
+  private void hashCodeFormat(Object arg, int flags, int width, int precision,
+			      char conversion)
+    throws IOException
+  {
+    checkFlags(flags,
+	       FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
+	       conversion);
+    genericFormat(arg == null ? "null" : Integer.toHexString(arg.hashCode()),
+		  flags, width, precision);
+  }
+
+  /** 
+   * Emit a String or Formattable conversion.  
+   *
+   * @param arg the String or Formattable to emit.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param conversion the conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
+  private void stringFormat(Object arg, int flags, int width, int precision,
+			    char conversion)
+    throws IOException
+  {
+    if (arg instanceof Formattable)
+      {
+	checkFlags(flags,
+		   (FormattableFlags.LEFT_JUSTIFY
+		    | FormattableFlags.UPPERCASE
+		    | FormattableFlags.ALTERNATE),
+		   conversion);
+	Formattable fmt = (Formattable) arg;
+	fmt.formatTo(this, flags, width, precision);
+      }
+    else
+      {
+	checkFlags(flags,
+		   FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
+		   conversion);
+	genericFormat(arg == null ? "null" : arg.toString(), flags, width,
+		      precision);
+      }
+  }
+
+  /** 
+   * Emit a character.  
+   *
+   * @param arg the character to emit.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param conversion the conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
+  private void characterFormat(Object arg, int flags, int width, int precision,
+			       char conversion)
+    throws IOException
+  {
+    checkFlags(flags,
+	       FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
+	       conversion);
+    noPrecision(precision);
+
+    int theChar;
+    if (arg instanceof Character)
+      theChar = ((Character) arg).charValue();
+    else if (arg instanceof Byte)
+      theChar = (char) (((Byte) arg).byteValue ());
+    else if (arg instanceof Short)
+      theChar = (char) (((Short) arg).shortValue ());
+    else if (arg instanceof Integer)
+      {
+	theChar = ((Integer) arg).intValue();
+	if (! Character.isValidCodePoint(theChar))
+	  throw new IllegalFormatCodePointException(theChar);
+      }
+    else
+      throw new IllegalFormatConversionException(conversion, arg.getClass());
+    String result = new String(Character.toChars(theChar));
+    genericFormat(result, flags, width, precision);
+  }
+
+  /** 
+   * Emit a '%'.
+   *
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @throws IOException if the output stream throws an I/O error.
+   */
+  private void percentFormat(int flags, int width, int precision)
+    throws IOException
+  {
+    checkFlags(flags, FormattableFlags.LEFT_JUSTIFY, '%');
+    noPrecision(precision);
+    genericFormat("%", flags, width, precision);
+  }
+
+  /** 
+   * Emit a newline.
+   *
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @throws IOException if the output stream throws an I/O error.
+   */
+  private void newLineFormat(int flags, int width, int precision)
+    throws IOException
+  {
+    checkFlags(flags, 0, 'n');
+    noPrecision(precision);
+    if (width != -1)
+      throw new IllegalFormatWidthException(width);
+    genericFormat(lineSeparator, flags, width, precision);
+  }
+
+  /**
+   * Helper method to do initial formatting and checking for integral
+   * conversions.
+   *
+   * @param arg the formatted argument.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param radix the radix of the number.
+   * @param conversion the conversion character.
+   * @return the result.
+   */
+  private StringBuilder basicIntegralConversion(Object arg, int flags,
+						int width, int precision,
+						int radix, char conversion)
+  {
+    assert radix == 8 || radix == 10 || radix == 16;
+    noPrecision(precision);
+
+    // Some error checking.
+    if ((flags & FormattableFlags.ZERO) != 0
+	&& (flags & FormattableFlags.LEFT_JUSTIFY) == 0)
+      throw new IllegalFormatFlagsException(getName(flags));
+    if ((flags & FormattableFlags.PLUS) != 0
+	&& (flags & FormattableFlags.SPACE) != 0)
+      throw new IllegalFormatFlagsException(getName(flags));
+
+    if ((flags & FormattableFlags.LEFT_JUSTIFY) != 0 && width == -1)
+      throw new MissingFormatWidthException("fixme");
+
+    // Do the base translation of the value to a string.
+    String result;
+    int basicFlags = (FormattableFlags.LEFT_JUSTIFY
+		      // We already handled any possible error when
+		      // parsing.
+		      | FormattableFlags.UPPERCASE
+		      | FormattableFlags.ZERO);
+    if (radix == 10)
+      basicFlags |= (FormattableFlags.PLUS
+		     | FormattableFlags.SPACE
+		     | FormattableFlags.COMMA
+		     | FormattableFlags.PAREN);
+    else
+      basicFlags |= FormattableFlags.ALTERNATE;
+
+    if (arg instanceof BigInteger)
+      {
+	checkFlags(flags,
+		   (basicFlags
+		    | FormattableFlags.PLUS
+		    | FormattableFlags.SPACE
+		    | FormattableFlags.PAREN),
+		   conversion);
+	BigInteger bi = (BigInteger) arg;
+	result = bi.toString(radix);
+      }
+    else if (arg instanceof Number
+	     && ! (arg instanceof Float)
+	     && ! (arg instanceof Double))
+      {
+	checkFlags(flags, basicFlags, conversion);
+	long value = ((Number) arg).longValue ();
+	if (radix == 8)
+	  result = Long.toOctalString(value);
+	else if (radix == 16)
+	  result = Long.toHexString(value);
+	else
+	  result = Long.toString(value);
+      }
+    else
+      throw new IllegalFormatConversionException(conversion, arg.getClass());
+
+    return new StringBuilder(result);
+  }
+
+  /** 
+   * Emit a hex or octal value.  
+   * 
+   * @param arg the hexadecimal or octal value.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param radix the radix of the number.
+   * @param conversion the conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
+  private void hexOrOctalConversion(Object arg, int flags, int width,
+				    int precision, int radix,
+				    char conversion)
+    throws IOException
+  {
+    assert radix == 8 || radix == 16;
+
+    StringBuilder builder = basicIntegralConversion(arg, flags, width,
+						    precision, radix,
+						    conversion);
+    int insertPoint = 0;
+
+    // Insert the sign.
+    if (builder.charAt(0) == '-')
+      {
+	// Already inserted.  Note that we don't insert a sign, since
+	// the only case where it is needed it BigInteger, and it has
+	// already been inserted by toString.
+	++insertPoint;
+      }
+    else if ((flags & FormattableFlags.PLUS) != 0)
+      {
+	builder.insert(insertPoint, '+');
+	++insertPoint;
+      }
+    else if ((flags & FormattableFlags.SPACE) != 0)
+      {
+	builder.insert(insertPoint, ' ');
+	++insertPoint;
+      }
+
+    // Insert the radix prefix.
+    if ((flags & FormattableFlags.ALTERNATE) != 0)
+      {
+	builder.insert(insertPoint, radix == 8 ? "0" : "0x");
+	insertPoint += radix == 8 ? 1 : 2;
+      }
+
+    // Now justify the result.
+    int resultWidth = builder.length();
+    if (resultWidth < width)
+      {
+	char fill = ((flags & FormattableFlags.ZERO) != 0) ? '0' : ' ';
+	if ((flags & FormattableFlags.LEFT_JUSTIFY) != 0)
+	  {
+	    // Left justify.  
+	    if (fill == ' ')
+	      insertPoint = builder.length();
+	  }
+	else
+	  {
+	    // Right justify.  Insert spaces before the radix prefix
+	    // and sign.
+	    insertPoint = 0;
+	  }
+	while (resultWidth++ < width)
+	  builder.insert(insertPoint, fill);
+      }
+
+    String result = builder.toString();
+    if ((flags & FormattableFlags.UPPERCASE) != 0)
+      {
+	if (fmtLocale == null)
+	  result = result.toUpperCase();
+	else
+	  result = result.toUpperCase(fmtLocale);
+      }
+
+    out.append(result);
+  }
+
+  /** 
+   * Emit a decimal value.  
+   * 
+   * @param arg the hexadecimal or octal value.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param conversion the conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
+  private void decimalConversion(Object arg, int flags, int width,
+				 int precision, char conversion)
+    throws IOException
+  {
+    StringBuilder builder = basicIntegralConversion(arg, flags, width,
+						    precision, 10,
+						    conversion);
+    boolean isNegative = false;
+    if (builder.charAt(0) == '-')
+      {
+	// Sign handling is done during localization.
+	builder.deleteCharAt(0);
+	isNegative = true;
+      }
+
+    applyLocalization(builder, flags, width, isNegative);
+    genericFormat(builder.toString(), flags, width, precision);
+  }
+
+  /** 
+   * Emit a single date or time conversion to a StringBuilder.  
+   *
+   * @param builder the builder to write to.
+   * @param cal the calendar to use in the conversion.
+   * @param conversion the formatting character to specify the type of data.
+   * @param syms the date formatting symbols.
+   */
+  private void singleDateTimeConversion(StringBuilder builder, Calendar cal,
+					char conversion,
+					DateFormatSymbols syms)
+  {
+    int oldLen = builder.length();
+    int digits = -1;
+    switch (conversion)
+      {
+      case 'H':
+	builder.append(cal.get(Calendar.HOUR_OF_DAY));
+	digits = 2;
+	break;
+      case 'I':
+	builder.append(cal.get(Calendar.HOUR));
+	digits = 2;
+	break;
+      case 'k':
+	builder.append(cal.get(Calendar.HOUR_OF_DAY));
+	break;
+      case 'l':
+	builder.append(cal.get(Calendar.HOUR));
+	break;
+      case 'M':
+	builder.append(cal.get(Calendar.MINUTE));
+	digits = 2;
+	break;
+      case 'S':
+	builder.append(cal.get(Calendar.SECOND));
+	digits = 2;
+	break;
+      case 'N':
+	// FIXME: nanosecond ...
+	digits = 9;
+	break;
+      case 'p':
+	{
+	  int ampm = cal.get(Calendar.AM_PM);
+	  builder.append(syms.getAmPmStrings()[ampm]);
+	}
+	break;
+      case 'z':
+	{
+	  int zone = cal.get(Calendar.ZONE_OFFSET) / (1000 * 60);
+	  builder.append(zone);
+	  digits = 4;
+	  // Skip the '-' sign.
+	  if (zone < 0)
+	    ++oldLen;
+	}
+	break;
+      case 'Z':
+	{
+	  // FIXME: DST?
+	  int zone = cal.get(Calendar.ZONE_OFFSET) / (1000 * 60 * 60);
+	  String[][] zs = syms.getZoneStrings();
+	  builder.append(zs[zone + 12][1]);
+	}
+	break;
+      case 's':
+	{
+	  long val = cal.getTime().getTime();
+	  builder.append(val / 1000);
+	}
+	break;
+      case 'Q':
+	{
+	  long val = cal.getTime().getTime();
+	  builder.append(val);
+	}
+	break;
+      case 'B':
+	{
+	  int month = cal.get(Calendar.MONTH);
+	  builder.append(syms.getMonths()[month]);
+	}
+	break;
+      case 'b':
+      case 'h':
+	{
+	  int month = cal.get(Calendar.MONTH);
+	  builder.append(syms.getShortMonths()[month]);
+	}
+	break;
+      case 'A':
+	{
+	  int day = cal.get(Calendar.DAY_OF_WEEK);
+	  builder.append(syms.getWeekdays()[day]);
+	}
+	break;
+      case 'a':
+	{
+	  int day = cal.get(Calendar.DAY_OF_WEEK);
+	  builder.append(syms.getShortWeekdays()[day]);
+	}
+	break;
+      case 'C':
+	builder.append(cal.get(Calendar.YEAR) / 100);
+	digits = 2;
+	break;
+      case 'Y':
+	builder.append(cal.get(Calendar.YEAR));
+	digits = 4;
+	break;
+      case 'y':
+	builder.append(cal.get(Calendar.YEAR) % 100);
+	digits = 2;
+	break;
+      case 'j':
+	builder.append(cal.get(Calendar.DAY_OF_YEAR));
+	digits = 3;
+	break;
+      case 'm':
+	builder.append(cal.get(Calendar.MONTH) + 1);
+	digits = 2;
+	break;
+      case 'd':
+	builder.append(cal.get(Calendar.DAY_OF_MONTH));
+	digits = 2;
+	break;
+      case 'e':
+	builder.append(cal.get(Calendar.DAY_OF_MONTH));
+	break;
+      case 'R':
+	singleDateTimeConversion(builder, cal, 'H', syms);
+	builder.append(':');
+	singleDateTimeConversion(builder, cal, 'M', syms);
+	break;
+      case 'T':
+	singleDateTimeConversion(builder, cal, 'H', syms);
+	builder.append(':');
+	singleDateTimeConversion(builder, cal, 'M', syms);
+	builder.append(':');
+	singleDateTimeConversion(builder, cal, 'S', syms);
+	break;
+      case 'r':
+	singleDateTimeConversion(builder, cal, 'I', syms);
+	builder.append(':');
+	singleDateTimeConversion(builder, cal, 'M', syms);
+	builder.append(':');
+	singleDateTimeConversion(builder, cal, 'S', syms);
+	builder.append(' ');
+	singleDateTimeConversion(builder, cal, 'p', syms);
+	break;
+      case 'D':
+	singleDateTimeConversion(builder, cal, 'm', syms);
+	builder.append('/');
+    	singleDateTimeConversion(builder, cal, 'd', syms);
+	builder.append('/');
+	singleDateTimeConversion(builder, cal, 'y', syms);
+	break;
+      case 'F':
+	singleDateTimeConversion(builder, cal, 'Y', syms);
+	builder.append('-');
+	singleDateTimeConversion(builder, cal, 'm', syms);
+	builder.append('-');
+	singleDateTimeConversion(builder, cal, 'd', syms);
+	break;
+      case 'c':
+	singleDateTimeConversion(builder, cal, 'a', syms);
+	builder.append(' ');
+	singleDateTimeConversion(builder, cal, 'b', syms);
+	builder.append(' ');
+	singleDateTimeConversion(builder, cal, 'd', syms);
+	builder.append(' ');
+	singleDateTimeConversion(builder, cal, 'T', syms);
+	builder.append(' ');
+	singleDateTimeConversion(builder, cal, 'Z', syms);
+	builder.append(' ');
+	singleDateTimeConversion(builder, cal, 'Y', syms);
+	break;
+      default:
+	throw new UnknownFormatConversionException(String.valueOf(conversion));
+      }
+
+    if (digits > 0)
+      {
+	int newLen = builder.length();
+	int delta = newLen - oldLen;
+	while (delta++ < digits)
+	  builder.insert(oldLen, '0');
+      }
+  }
+
+  /**
+   * Emit a date or time value.
+   *
+   * @param arg the date or time value.
+   * @param flags the formatting flags to use.
+   * @param width the width to use.
+   * @param precision the precision to use.
+   * @param conversion the conversion character.
+   * @param subConversion the sub conversion character.
+   * @throws IOException if the output stream throws an I/O error.
+   */
+  private void dateTimeConversion(Object arg, int flags, int width,
+				  int precision, char conversion,
+				  char subConversion)
+    throws IOException
+  {
+    noPrecision(precision);
+    checkFlags(flags,
+	       FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
+	       conversion);
+
+    Calendar cal;
+    if (arg instanceof Calendar)
+      cal = (Calendar) arg;
+    else
+      {
+	Date date;
+	if (arg instanceof Date)
+	  date = (Date) arg;
+	else if (arg instanceof Long)
+	  date = new Date(((Long) arg).longValue());
+	else
+	  throw new IllegalFormatConversionException(conversion,
+						     arg.getClass());
+	if (fmtLocale == null)
+	  cal = Calendar.getInstance();
+	else
+	  cal = Calendar.getInstance(fmtLocale);
+	cal.setTime(date);
+      }
+
+    // We could try to be more efficient by computing this lazily.
+    DateFormatSymbols syms;
+    if (fmtLocale == null)
+      syms = new DateFormatSymbols();
+    else
+      syms = new DateFormatSymbols(fmtLocale);
+
+    StringBuilder result = new StringBuilder();
+    singleDateTimeConversion(result, cal, subConversion, syms);
+
+    genericFormat(result.toString(), flags, width, precision);
+  }
+
+  /**
+   * Advance the internal parsing index, and throw an exception
+   * on overrun.
+   *
+   * @throws IllegalArgumentException on overrun.
+   */
+  private void advance()
+  {
+    ++index;
+    if (index >= length)
+      {
+	// FIXME: what exception here?
+	throw new IllegalArgumentException();
+      }
+  }
+
+  /**
+   * Parse an integer appearing in the format string.  Will return -1
+   * if no integer was found.
+   *
+   * @return the parsed integer.
+   */
+  private int parseInt()
+  {
+    int start = index;
+    while (Character.isDigit(format.charAt(index)))
+      advance();
+    if (start == index)
+      return -1;
+    return Integer.decode(format.substring(start, index)).intValue();
+  }
+
+  /**
+   * Parse the argument index.  Returns -1 if there was no index, 0 if
+   * we should re-use the previous index, and a positive integer to
+   * indicate an absolute index.
+   *
+   * @return the parsed argument index.
+   */
+  private int parseArgumentIndex()
+  {
+    int result = -1;
+    int start = index;
+    if (format.charAt(index) == '<')
+      {
+	result = 0;
+	advance();
+      }
+    else if (Character.isDigit(format.charAt(index)))
+      {
+	result = parseInt();
+	if (format.charAt(index) == '$')
+	  advance();
+	else
+	  {
+	    // Reset.
+	    index = start;
+	    result = -1;
+	  }
+      }
+    return result;
+  }
+
+  /**
+   * Parse a set of flags and return a bit mask of values from
+   * FormattableFlags.  Will throw an exception if a flag is
+   * duplicated.
+   *
+   * @return the parsed flags.
+   */
+  private int parseFlags()
+  {
+    int value = 0;
+    int start = index;
+    while (true)
+      {
+	int x = FLAGS.indexOf(format.charAt(index));
+	if (x == -1)
+	  break;
+	int newValue = 1 << x;
+	if ((value & newValue) != 0)
+	  throw new DuplicateFormatFlagsException(format.substring(start,
+								   index + 1));
+	value |= newValue;
+	advance();
+      }
+    return value;
+  }
+
+  /**
+   * Parse the width part of a format string.  Returns -1 if no width
+   * was specified.
+   *
+   * @return the parsed width.
+   */
+  private int parseWidth()
+  {
+    return parseInt();
+  }
+
+  /**
+   * If the current character is '.', parses the precision part of a
+   * format string.  Returns -1 if no precision was specified.
+   *
+   * @return the parsed precision.
+   */
+  private int parsePrecision()
+  {
+    if (format.charAt(index) != '.')
+      return -1;
+    advance();
+    int precision = parseInt();
+    if (precision == -1)
+      // FIXME
+      throw new IllegalArgumentException();
+    return precision;
+  }
+
+  /**
+   * Outputs a formatted string based on the supplied specification,
+   * <code>fmt</code>, and its arguments using the specified locale.
+   * The locale of the formatter does not change as a result; the
+   * specified locale is just used for this particular formatting
+   * operation.  If the locale is <code>null</code>, then no
+   * localization is applied.
+   *
+   * @param loc the locale to use for this format.
+   * @param fmt the format specification.
+   * @param args the arguments to apply to the specification.
+   * @throws IllegalFormatException if there is a problem with
+   *                                the syntax of the format
+   *                                specification or a mismatch
+   *                                between it and the arguments.
+   * @throws FormatterClosedException if the formatter is closed.
+   */ 
+  public Formatter format(Locale loc, String fmt, Object[] args)
+  {
+    if (closed)
+      throw new FormatterClosedException();
+
+    // Note the arguments are indexed starting at 1.
+    int implicitArgumentIndex = 1;
+    int previousArgumentIndex = 0;
+
+    try
+      {
+	fmtLocale = loc;
+	format = fmt;
+	length = format.length();
+	for (index = 0; index < length; ++index)
+	  {
+	    char c = format.charAt(index);
+	    if (c != '%')
+	      {
+		out.append(c);
+		continue;
+	      }
+
+	    int start = index;
+	    advance();
+
+	    // We do the needed post-processing of this later, when we
+	    // determine whether an argument is actually needed by
+	    // this conversion.
+	    int argumentIndex = parseArgumentIndex();
+
+	    int flags = parseFlags();
+	    int width = parseWidth();
+	    int precision = parsePrecision();
+	    char origConversion = format.charAt(index);
+	    char conversion = origConversion;
+	    if (Character.isUpperCase(conversion))
+	      {
+		flags |= FormattableFlags.UPPERCASE;
+		conversion = Character.toLowerCase(conversion);
+	      }
+
+	    Object argument = null;
+	    if (conversion == '%' || conversion == 'n')
+	      {
+		if (argumentIndex != -1)
+		  {
+		    // FIXME: not sure about this.
+		    throw new UnknownFormatConversionException("FIXME");
+		  }
+	      }
+	    else
+	      {
+		if (argumentIndex == -1)
+		  argumentIndex = implicitArgumentIndex++;
+		else if (argumentIndex == 0)
+		  argumentIndex = previousArgumentIndex;
+		// Argument indices start at 1 but array indices at 0.
+		--argumentIndex;
+		if (argumentIndex < 0 || argumentIndex >= args.length)
+		  throw new MissingFormatArgumentException(format.substring(start, index));
+		argument = args[argumentIndex];
+	      }
+
+	    switch (conversion)
+	      {
+	      case 'b':
+		booleanFormat(argument, flags, width, precision,
+			      origConversion);
+		break;
+	      case 'h':
+		hashCodeFormat(argument, flags, width, precision,
+			       origConversion);
+		break;
+	      case 's':
+		stringFormat(argument, flags, width, precision,
+			     origConversion);
+		break;
+	      case 'c':
+		characterFormat(argument, flags, width, precision,
+				origConversion);
+		break;
+	      case 'd':
+		checkFlags(flags & FormattableFlags.UPPERCASE, 0, 'd');
+		decimalConversion(argument, flags, width, precision,
+				  origConversion);
+		break;
+	      case 'o':
+		checkFlags(flags & FormattableFlags.UPPERCASE, 0, 'o');
+		hexOrOctalConversion(argument, flags, width, precision, 8,
+				     origConversion);
+		break;
+	      case 'x':
+		hexOrOctalConversion(argument, flags, width, precision, 16,
+				     origConversion);
+	      case 'e':
+		// scientificNotationConversion();
+		break;
+	      case 'f':
+		// floatingDecimalConversion();
+		break;
+	      case 'g':
+		// smartFloatingConversion();
+		break;
+	      case 'a':
+		// hexFloatingConversion();
+		break;
+	      case 't':
+		advance();
+		char subConversion = format.charAt(index);
+		dateTimeConversion(argument, flags, width, precision,
+				   origConversion, subConversion);
+		break;
+	      case '%':
+		percentFormat(flags, width, precision);
+		break;
+	      case 'n':
+		newLineFormat(flags, width, precision);
+		break;
+	      default:
+		throw new UnknownFormatConversionException(String.valueOf(origConversion));
+	      }
+	  }
+      }
+    catch (IOException exc)
+      {
+	ioException = exc;
+      }
+    return this;
+  }
+
+  /**
+   * Outputs a formatted string based on the supplied specification,
+   * <code>fmt</code>, and its arguments using the formatter's locale.
+   *
+   * @param fmt the format specification.
+   * @param args the arguments to apply to the specification.
+   * @throws IllegalFormatException if there is a problem with
+   *                                the syntax of the format
+   *                                specification or a mismatch
+   *                                between it and the arguments.
+   * @throws FormatterClosedException if the formatter is closed.
+   */
+  public Formatter format(String format, Object[] args)
+  {
+    return format(locale, format, args);
+  }
+
+  /**
+   * Returns the last I/O exception thrown by the
+   * <code>append()</code> operation of the underlying
+   * output stream.
+   *
+   * @return the last I/O exception.
+   */
+  public IOException ioException()
+  {
+    return ioException;
+  }
+
+  /**
+   * Returns the locale used by this formatter.
+   *
+   * @return the formatter's locale.
+   * @throws FormatterClosedException if the formatter is closed.
+   */
+  public Locale locale()
+  {
+    if (closed)
+      throw new FormatterClosedException();
+    return locale;
+  }
+
+  /**
+   * Returns the output stream used by this formatter.
+   *
+   * @return the formatter's output stream.
+   * @throws FormatterClosedException if the formatter is closed.
+   */
+  public StringBuilder out()
+  {
+    if (closed)
+      throw new FormatterClosedException();
+    return out;
+  }
+
+  /**
+   * Returns the result of applying {@link Object#toString()}
+   * to the underlying output stream.  The results returned
+   * depend on the particular {@link Appendable} being used.
+   * For example, a {@link StringBuilder} will return the
+   * formatted output but an I/O stream will not.
+   *
+   * @throws FormatterClosedException if the formatter is closed.
+   */
+  public String toString()
+  {
+    if (closed)
+      throw new FormatterClosedException();
+    return out.toString();
+  }
+}



From MAILER-DAEMON Sun Jun 04 23:39:25 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fn5w5-0004bd-66
	for mharc-commit-classpath@gnu.org; Sun, 04 Jun 2006 23:39:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fn5w3-0004bE-3O
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 23:39:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fn5w1-0004b1-DR
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 23:39:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fn5w1-0004ay-82
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 23:39:21 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fn634-0000zN-U5
	for commit-classpath@gnu.org; Sun, 04 Jun 2006 23:46:39 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fn5vv-0001Uh-00
	for <commit-classpath@gnu.org>; Sun, 04 Jun 2006 23:39:15 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1Fn5vu-0001Ue-UE
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 03:39:15 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fn5vu-0001Ue-UE@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Mon, 05 Jun 2006 03:39:14 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Compo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jun 2006 03:39:23 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/05 03:39:14

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: ComponentGraphics.java 

Log message:
	2006-06-05  Sven de Marothy  <sven@physto.se>
	
		*  gnu/java/awt/peer/gtk/ComponentGraphics.java
		(ComponentGraphics): Use 0,0 as clip origin.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7652&r2=1.7653
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java?cvsroot=classpath&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7652
retrieving revision 1.7653
diff -u -b -r1.7652 -r1.7653
--- ChangeLog	4 Jun 2006 23:36:26 -0000	1.7652
+++ ChangeLog	5 Jun 2006 03:39:13 -0000	1.7653
@@ -1,3 +1,8 @@
+2006-06-05  Sven de Marothy  <sven@physto.se>
+
+	*  gnu/java/awt/peer/gtk/ComponentGraphics.java
+	(ComponentGraphics): Use 0,0 as clip origin.
+	
 2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/util/Formattable.java,

Index: gnu/java/awt/peer/gtk/ComponentGraphics.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnu/java/awt/peer/gtk/ComponentGraphics.java	3 Jun 2006 22:41:41 -0000	1.8
+++ gnu/java/awt/peer/gtk/ComponentGraphics.java	5 Jun 2006 03:39:14 -0000	1.9
@@ -71,8 +71,9 @@
     this.component = component;
     cairo_t = initState(component);
     setup( cairo_t );
+    Rectangle bounds = component.awtComponent.getBounds();
+    setClip( new Rectangle( 0, 0, bounds.width, bounds.height) );
     setBackground(component.awtComponent.getBackground());
-    setClip(component.awtComponent.getBounds());
     setColor(component.awtComponent.getForeground());
   }
 
@@ -81,8 +82,9 @@
     component = cg.component;
     cairo_t = initState(component);
     copy( cg, cairo_t );
+    Rectangle bounds = component.awtComponent.getBounds();
+    setClip( new Rectangle( 0, 0, bounds.width, bounds.height) );
     setBackground(component.awtComponent.getBackground());
-    setClip(component.awtComponent.getBounds());
     setColor(component.awtComponent.getForeground());
   }
 



From MAILER-DAEMON Mon Jun 05 07:44:57 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnDVx-0004WQ-Qu
	for mharc-commit-classpath@gnu.org; Mon, 05 Jun 2006 07:44:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnDVw-0004WC-8D
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 07:44:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnDVu-0004VG-Ii
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 07:44:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnDVu-0004VD-Ap
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 07:44:54 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnDd2-00020J-Oe
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 07:52:16 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnDVs-0002yd-00
	for <commit-classpath@gnu.org>; Mon, 05 Jun 2006 07:44:52 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FnDVr-0002ya-R8
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 11:44:52 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnDVr-0002ya-R8@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Mon, 05 Jun 2006 11:44:51 +0000
Subject: [commit-cp] classpath/javax/swing/text GapContent.java Chan...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jun 2006 11:44:56 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/05 11:44:51

Modified files:
	javax/swing/text: GapContent.java 
	.              : ChangeLog 

Log message:
	2006-06-05  Roman Kennke  <kennke@aicas.com>
	
		PR 27834
		* javax/swing/text/GapContent.java
		(setPositionsInRange): Compare with startIndex and endIndex
		rather than start and end.
		(dumpMarks): Only dump real marks.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/GapContent.java?cvsroot=classpath&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7653&r2=1.7654

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7653
retrieving revision 1.7654
diff -u -b -r1.7653 -r1.7654
--- ChangeLog	5 Jun 2006 03:39:13 -0000	1.7653
+++ ChangeLog	5 Jun 2006 11:44:51 -0000	1.7654
@@ -1,3 +1,11 @@
+2006-06-05  Roman Kennke  <kennke@aicas.com>
+
+	PR 27834
+	* javax/swing/text/GapContent.java
+	(setPositionsInRange): Compare with startIndex and endIndex
+	rather than start and end.
+	(dumpMarks): Only dump real marks.
+
 2006-06-05  Sven de Marothy  <sven@physto.se>
 
 	*  gnu/java/awt/peer/gtk/ComponentGraphics.java



From MAILER-DAEMON Mon Jun 05 08:38:40 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnELw-0001mn-FG
	for mharc-commit-classpath@gnu.org; Mon, 05 Jun 2006 08:38:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnELu-0001lv-D7
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 08:38:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnELs-0001l9-10
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 08:38:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnELr-0001l5-Sp
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 08:38:35 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnET0-0007mI-Hn
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 08:45:58 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnELp-0004Ug-00
	for <commit-classpath@gnu.org>; Mon, 05 Jun 2006 08:38:33 -0400
Received: from audriusa by savannah.gnu.org with local (Exim 4.50)
	id 1FnELo-0004Ub-B3
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 12:38:33 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnELo-0004Ub-B3@savannah.gnu.org>
From: Audrius Meskauskas <audriusa@bluewin.ch>
Date: Mon, 05 Jun 2006 12:38:32 +0000
Subject: [commit-cp] classpath javax/swing/text/htmlHTMLEditorKit.ja...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jun 2006 12:38:38 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Audrius Meskauskas <audriusa>	06/06/05 12:38:32

Modified files:
	javax/swing/text/html: HTMLEditorKit.java 
	.              : ChangeLog 
Added files:
	javax/swing/text/html: ImageView.java 
	gnu/javax/swing/text/html: CombinedAttributes.java 

Log message:
	2006-06-05  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
	
		* javax/swing/text/html/HTMLEditorKit.java (HTMLFactory.create):
		Create the ImageView, when applicable.
		* gnu/javax/swing/text/html/CombinedAttributes.java,
		javax/swing/text/html/ImageView.java: New files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/HTMLEditorKit.java?cvsroot=classpath&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/ImageView.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7654&r2=1.7655
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/swing/text/html/CombinedAttributes.java?cvsroot=classpath&rev=1.1

Patches:
Index: javax/swing/text/html/HTMLEditorKit.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/text/html/HTMLEditorKit.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- javax/swing/text/html/HTMLEditorKit.java	23 Mar 2006 00:30:14 -0000	1.27
+++ javax/swing/text/html/HTMLEditorKit.java	5 Jun 2006 12:38:30 -0000	1.28
@@ -548,6 +548,8 @@
                    || tag.equals(HTML.Tag.BLOCKQUOTE)
                    || tag.equals(HTML.Tag.PRE))
             view = new BlockView(element, View.Y_AXIS);
+          else if (tag.equals(HTML.Tag.IMG))
+            view = new ImageView(element);
           
           // FIXME: Uncomment when the views have been implemented
           else if (tag.equals(HTML.Tag.CONTENT))
@@ -559,12 +561,11 @@
           else if (tag.equals(HTML.Tag.TD))
             view = new ParagraphView(element);
 
+
           /*
           else if (tag.equals(HTML.Tag.MENU) || tag.equals(HTML.Tag.DIR)
                    || tag.equals(HTML.Tag.UL) || tag.equals(HTML.Tag.OL))
             view = new ListView(element);
-          else if (tag.equals(HTML.Tag.IMG))
-            view = new ImageView(element);
           else if (tag.equals(HTML.Tag.HR))
             view = new HRuleView(element);
           else if (tag.equals(HTML.Tag.BR))

Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7654
retrieving revision 1.7655
diff -u -b -r1.7654 -r1.7655
--- ChangeLog	5 Jun 2006 11:44:51 -0000	1.7654
+++ ChangeLog	5 Jun 2006 12:38:30 -0000	1.7655
@@ -1,3 +1,10 @@
+2006-06-05  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
+	* javax/swing/text/html/HTMLEditorKit.java (HTMLFactory.create):
+	Create the ImageView, when applicable.
+	* gnu/javax/swing/text/html/CombinedAttributes.java,
+	javax/swing/text/html/ImageView.java: New files.
+
 2006-06-05  Roman Kennke  <kennke@aicas.com>
 
 	PR 27834

Index: javax/swing/text/html/ImageView.java
===================================================================
RCS file: javax/swing/text/html/ImageView.java
diff -N javax/swing/text/html/ImageView.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/swing/text/html/ImageView.java	5 Jun 2006 12:38:30 -0000	1.1
@@ -0,0 +1,441 @@
+package javax.swing.text.html;
+
+import gnu.javax.swing.text.html.CombinedAttributes;
+import gnu.javax.swing.text.html.ImageViewIconFactory;
+
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.MediaTracker;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
+import javax.swing.text.View;
+import javax.swing.text.Position.Bias;
+import javax.swing.text.html.HTML.Attribute;
+
+/**
+ * A view, representing a single image, represented by the HTML IMG tag.
+ * 
+ * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) 
+ */
+public class ImageView extends View
+{
+  /**
+   * True if the image loads synchronuosly (on demand). By default, the image
+   * loads asynchronuosly.
+   */
+  boolean loadOnDemand;
+  
+  /**
+   * The image icon, wrapping the image,
+   */
+  ImageIcon imageIcon;
+ 
+  /**
+   * The image state.
+   */
+  byte imageState = MediaTracker.LOADING;
+
+  /**
+   * Creates the image view that represents the given element.
+   * 
+   * @param element the element, represented by this image view.
+   */
+  public ImageView(Element element)
+  {
+    super(element);
+  }
+ 
+  /**
+   * Load or reload the image. This method initiates the image reloading. After
+   * the image is ready, the repaint event will be scheduled. The current image,
+   * if it already exists, will be discarded.
+   * 
+   * @param itsTime
+   *          also load if the "on demand" property is set
+   */
+  void reloadImage(boolean itsTime)
+  {
+    URL url = getImageURL();
+    if (url == null)
+      imageState = (byte) MediaTracker.ERRORED;
+    else if (!(loadOnDemand && !itsTime))
+      imageIcon = new ImageIcon(url);
+    else
+      imageState = (byte) MediaTracker.LOADING;
+  }
+  
+  /**
+   * Get the image alignment. This method works handling standart alignment
+   * attributes in the HTML IMG tag (align = top bottom middle left right).
+   * Depending from the parameter, either horizontal or vertical alingment
+   * information is returned.
+   * 
+   * @param axis -
+   *          either X_AXIS or Y_AXIS
+   */
+  public float getAlignment(int axis)
+  {
+    AttributeSet attrs = getAttributes();
+    Object al = attrs.getAttribute(Attribute.ALIGN);
+    
+    // Default is top left aligned.
+    if (al == null)
+      return 0.0f;
+
+    String align = al.toString();
+
+    if (axis == View.X_AXIS)
+      {
+        if (align.equals("middle"))
+          return 0.5f;
+        else if (align.equals("left"))
+          return 0.0f;
+        else if (align.equals("right"))
+          return 1.0f;
+        else
+          return 0.0f;
+      }
+    else if (axis == View.Y_AXIS)
+      {
+        if (align.equals("middle"))
+          return 0.5f;
+        else if (align.equals("top"))
+          return 0.0f;
+        else if (align.equals("bottom"))
+          return 1.0f;
+        else
+          return 0.0f;
+      }
+    else
+      throw new IllegalArgumentException("axis " + axis);
+  }
+  
+  /**
+   * Get the text that should be shown as the image replacement and also as the
+   * image tool tip text. The method returns the value of the attribute, having
+   * the name {@link Attribute#ALT}. If there is no such attribute, the image
+   * name from the url is returned. If the URL is not available, the empty
+   * string is returned.
+   */
+  public String getAltText()
+  {
+    Object rt = getAttributes().getAttribute(Attribute.ALT);
+    if (rt != null)
+      return rt.toString();
+    else
+      {
+        URL u = getImageURL();
+        if (u == null)
+          return "";
+        else
+          return u.getFile();
+      }
+  }
+  
+  /**
+   * Returns the combination of the document and the style sheet attributes.
+   */
+  public AttributeSet getAttributes()
+  {
+    StyleSheet styles = getStyleSheet();
+    if (styles == null)
+      return super.getAttributes();
+    else
+      return CombinedAttributes.combine(super.getAttributes(),
+                                        styles.getViewAttributes(this));
+  }
+  
+  /**
+   * Get the image to render. May return null if the image is not yet loaded.
+   */
+  public Image getImage()
+  {
+    if (imageIcon == null)
+      return null;
+    else
+      return imageIcon.getImage();
+  }
+  
+  /**
+   * Get the URL location of the image to render. If this method returns null,
+   * the "no image" icon is rendered instead. By defaul, url must be present as
+   * the "src" property of the IMG tag. If it is missing, null is returned and
+   * the "no image" icon is rendered.
+   * 
+   * @return the URL location of the image to render.
+   */
+  public URL getImageURL()
+  {
+    Object url = getAttributes().getAttribute(Attribute.SRC);
+    if (url == null)
+      return null;
+
+    try
+      {
+        return new URL(url.toString());
+      }
+    catch (MalformedURLException e)
+      {
+        // The URL is malformed - no image.
+        return null;
+      }
+  }
+
+  /**
+   * Get the icon that should be displayed while the image is loading and hence
+   * not yet available.
+   * 
+   * @return an icon, showing a non broken sheet of paper with image.
+   */
+  public Icon getLoadingImageIcon()
+  {
+    return ImageViewIconFactory.getLoadingImageIcon();
+  }
+  
+  /**
+   * Get the image loading strategy.
+   * 
+   * @return false (default) if the image is loaded when the view is
+   *         constructed, true if the image is only loaded on demand when
+   *         rendering.
+   */
+  public boolean getLoadsSynchronously()
+  {
+    return loadOnDemand;
+  }
+
+  /**
+   * Get the icon that should be displayed when the image is not available.
+   * 
+   * @return an icon, showing a broken sheet of paper with image.
+   */
+  public Icon getNoImageIcon()
+  {
+    return ImageViewIconFactory.getNoImageIcon();
+  }
+  
+  /**
+   * Get the preferred span of the image along the axis. The image size is first
+   * requested to the attributes {@link Attribute#WIDTH} and
+   * {@link Attribute#HEIGHT}. If they are missing, and the image is already
+   * loaded, the image size is returned. If there are no attributes, and the
+   * image is not loaded, zero is returned.
+   * 
+   * @param axis -
+   *          either X_AXIS or Y_AXIS
+   * @return either width of height of the image, depending on the axis.
+   */
+  public float getPreferredSpan(int axis)
+  {
+    AttributeSet attrs = getAttributes();
+    
+    Image image = getImage();
+
+    if (axis == View.X_AXIS)
+      {
+        Object w = attrs.getAttribute(Attribute.WIDTH);
+        if (w != null)
+          return Integer.parseInt(w.toString());
+        else if (image != null)
+          return image.getWidth(getContainer());
+        else
+          return getNoImageIcon().getIconWidth();
+      }
+    else if (axis == View.Y_AXIS)
+      {
+        Object w = attrs.getAttribute(Attribute.HEIGHT);
+        if (w != null)
+          return Integer.parseInt(w.toString());
+        else if (image != null)
+          return image.getHeight(getContainer());
+        else
+          return getNoImageIcon().getIconHeight();
+      }
+    else
+      throw new IllegalArgumentException("axis " + axis);
+  }
+  
+  /**
+   * Get the associated style sheet from the document.
+   * 
+   * @return the associated style sheet.
+   */
+  protected StyleSheet getStyleSheet()
+  {
+    Document d = getElement().getDocument();
+    if (d instanceof HTMLDocument)
+      return ((HTMLDocument) d).getStyleSheet();
+    else
+      return null;
+  }
+
+  /**
+   * Get the tool tip text. This is overridden to return the value of the
+   * {@link #getAltText()}. The parameters are ignored.
+   * 
+   * @return that is returned by getAltText().
+   */
+  public String getToolTipText(float x, float y, Shape shape)
+  {
+    return getAltText();
+  }
+  
+  /**
+   * Paints the image or one of the two image state icons. The image is resized
+   * to the shape bounds. If there is no image available, the alternative text
+   * is displayed besides the image state icon.
+   * 
+   * @param g
+   *          the Graphics, used for painting.
+   * @param bounds
+   *          the bounds of the region where the image or replacing icon must be
+   *          painted.
+   */
+  public void paint(Graphics g, Shape bounds)
+  {
+    Rectangle r = bounds.getBounds();
+
+    if (imageIcon == null)
+
+      {
+        // Loading image on demand, rendering the loading icon so far.
+        reloadImage(true);
+         
+        // The reloadImage sets the imageIcon, unless the URL is broken 
+        // or malformed.
+        if (imageIcon != null)
+          {
+            if (imageIcon.getImageLoadStatus() != MediaTracker.COMPLETE)
+              {
+                // Render "not ready" icon, unless the image is ready
+                // immediately.
+                renderIcon(g, r, getLoadingImageIcon());
+                // Add the listener to repaint when the icon will be ready.
+                imageIcon.setImageObserver(getContainer());
+                return;
+              }
+          }
+        else
+          {
+            renderIcon(g, r, getNoImageIcon());
+            return;
+          }
+      }
+
+    imageState = (byte) imageIcon.getImageLoadStatus();
+
+    switch (imageState)
+      {
+      case MediaTracker.ABORTED:
+      case MediaTracker.ERRORED:
+        renderIcon(g, r, getNoImageIcon());
+        break;
+      case MediaTracker.LOADING:
+      // If the image is not loaded completely, we still render it, as the
+      // partial image may be available.
+      case MediaTracker.COMPLETE:
+      {
+        // Paint the scaled image.
+        Image scaled = imageIcon.getImage().getScaledInstance(
+                                                              r.width,
+                                                              r.height,
+                                                              Image.SCALE_DEFAULT);
+        ImageIcon painter = new ImageIcon(scaled);
+        painter.paintIcon(getContainer(), g, r.x, r.y);
+      }
+        break;
+      }
+  }
+  
+  /**
+   * Render "no image" icon and the alternative "no image" text. The text is
+   * rendered right from the icon and is aligned to the icon bottom.
+   */
+  private void renderIcon(Graphics g, Rectangle bounds, Icon icon)
+  {
+    Shape current = g.getClip();
+    try
+      {
+        g.setClip(bounds);
+        if (icon != null)
+          {
+            icon.paintIcon(getContainer(), g, bounds.x, bounds.y);
+            g.drawString(getAltText(), bounds.x + icon.getIconWidth(),
+                         bounds.y + icon.getIconHeight());
+          }
+      }
+    finally
+      {
+        g.setClip(current);
+      }
+  }
+  
+  /**
+   * Set if the image should be loaded only when needed (synchronuosly). By
+   * default, the image loads asynchronuosly. If the image is not yet ready, the
+   * icon, returned by the {@link #getLoadingImageIcon()}, is displayed.
+   */
+  public void setLoadsSynchronously(boolean load_on_demand)
+  {
+    loadOnDemand = load_on_demand;
+  }
+ 
+  /**
+   * Update all cached properties from the attribute set, returned by the
+   * {@link #getAttributes}.
+   */
+  protected void setPropertiesFromAttributes()
+  {
+    // In the current implementation, nothing is cached yet, unless the image
+    // itself.
+    imageIcon = null;
+  }
+  
+  /**
+   * Maps the picture co-ordinates into the image position in the model. As the
+   * image is not divideable, this is currently implemented always to return the
+   * start offset.
+   */
+  public int viewToModel(float x, float y, Shape shape, Bias[] bias)
+  {
+    return getStartOffset();
+  }
+  
+  /**
+   * This is currently implemented always to return the area of the image view,
+   * as the image is not divideable by character positions.
+   * 
+   * @param pos character position
+   * @param area of the image view
+   * @param bias bias
+   * 
+   * @return the shape, where the given character position should be mapped.
+   */
+  public Shape modelToView(int pos, Shape area, Bias bias)
+      throws BadLocationException
+  {
+    return area;
+  }
+  
+  /**
+   * Starts loading the image asynchronuosly. If the image must be loaded
+   * synchronuosly instead, the {@link #setLoadsSynchronously} must be
+   * called before calling this method. The passed parameters are not used.
+   */
+  public void setSize(float width, float height)
+  {
+    if (imageIcon == null)
+      reloadImage(false);
+  }  
+  
+
+}

Index: gnu/javax/swing/text/html/CombinedAttributes.java
===================================================================
RCS file: gnu/javax/swing/text/html/CombinedAttributes.java
diff -N gnu/javax/swing/text/html/CombinedAttributes.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/javax/swing/text/html/CombinedAttributes.java	5 Jun 2006 12:38:31 -0000	1.1
@@ -0,0 +1,213 @@
+/* CombinedAttributes.java -- A two combined sets of attributes
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.javax.swing.text.html;
+
+import java.io.Serializable;
+import java.util.Enumeration;
+
+import javax.swing.text.AttributeSet;
+import javax.swing.text.SimpleAttributeSet;
+
+/**
+ * Contains the two combined attribute sets what are searched subsequently.
+ * This is used to combine style sheet attributes with the HTML view attributes.
+ * The parent cannot be used as the view may have its own attribute hierarchy.
+ * 
+ * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)  
+ */
+public class CombinedAttributes implements AttributeSet, Serializable
+{
+  /**
+   * Returns the elements from both enumerations.
+   */
+  class CombinedEnumeration implements Enumeration
+  {
+    /**
+     * Create a combined enumeration that enumerates over two enumerations.
+     * 
+     * @param first the first enumeration to enumerate
+     * @param second the second enumeration to enumerate
+     */
+    CombinedEnumeration(Enumeration first, Enumeration second)
+    {
+      a = first;
+      b = second;
+    }
+    
+    /**
+     * The first enumeration (elements returned first)
+     */
+    final Enumeration a;
+    
+    /**
+     * The second enumeration (elements returned later)
+     */
+    final Enumeration b;
+    
+    /** @inheritDoc */
+    public boolean hasMoreElements()
+    {
+      return a.hasMoreElements() || b.hasMoreElements();
+    }
+    
+    /** @inheritDoc */
+    public Object nextElement()
+    {
+      return a.hasMoreElements() ? a.nextElement():b.nextElement();
+    }
+  }
+  
+  
+  /**
+   * The first attribute set.
+   */
+  final AttributeSet a;
+  
+  /**
+   * The second attribute set.
+   */
+  final AttributeSet b;
+  
+  /**
+   * Create the CombinedAttributes what search in the two sets. If any of the
+   * two passed sets is null, another set is returned. Otherwise, the combined
+   * attribute set is returned.
+   * 
+   * @param primary the first set (searched first)
+   * @param secondary the second set (searched later).
+   */
+  public static AttributeSet combine(AttributeSet primary,
+                                     AttributeSet secondary)
+  {
+    if (primary == null)
+      return secondary;
+    else if (secondary == null)
+      return primary;
+    else
+      return new CombinedAttributes(primary, secondary);
+  }
+  
+  /**
+   * Create the CombinedAttributes what search in the two sets.
+   * 
+   * @param primary the first set (searched first)
+   * @param secondary the second set (searched later).
+   */
+  private CombinedAttributes(AttributeSet primary, AttributeSet secondary)
+  {
+    a = primary;
+    b = secondary;
+  }
+
+  /** @inheritDoc */
+  public boolean containsAttribute(Object name, Object value)
+  {
+    return a.containsAttribute(name, value) || b.containsAttribute(name, value);
+  }
+
+  /** @inheritDoc */
+  public boolean containsAttributes(AttributeSet attributes)
+  {
+    Enumeration names = attributes.getAttributeNames();
+    Object name;
+    while (names.hasMoreElements())
+      {
+        name = names.nextElement();
+        if (!containsAttribute(name, attributes.getAttribute(name)))
+          return false;
+      }
+    return true;
+  }
+
+  /** @inheritDoc */
+  public AttributeSet copyAttributes()
+  {
+    SimpleAttributeSet copy = new SimpleAttributeSet();
+    copy.addAttributes(a);
+    copy.addAttributes(b);
+    return copy;
+  }
+
+  /** @inheritDoc */
+  public Object getAttribute(Object key)
+  {
+    Object value = a.getAttribute(key);
+    if (value == null)
+      value = b.getAttribute(key);
+    
+    return value;
+  }
+
+  /** @inheritDoc */
+  public int getAttributeCount()
+  {
+    return a.getAttributeCount()+b.getAttributeCount();
+  }
+
+  /** @inheritDoc */
+  public Enumeration getAttributeNames()
+  {
+    return new CombinedEnumeration(a.getAttributeNames(), b.getAttributeNames());
+  }
+
+  /**
+   * There is no one.
+   * 
+   * @return null, always.
+   */
+  public AttributeSet getResolveParent()
+  {
+    return null;
+  }
+
+  /** @inheritDoc */
+  public boolean isDefined(Object attrName)
+  {
+    return a.isDefined(attrName) || b.isDefined(attrName);
+  }
+
+  /** @inheritDoc */
+  public boolean isEqual(AttributeSet attr)
+  {
+    if (attr.getAttributeCount() == getAttributeCount())
+      return containsAttributes(attr);
+    else
+      return false;
+  }
+}



From MAILER-DAEMON Mon Jun 05 09:47:19 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnFQM-000533-Tw
	for mharc-commit-classpath@gnu.org; Mon, 05 Jun 2006 09:47:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnFQJ-00051n-Qm
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 09:47:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnFQH-00050c-QR
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 09:47:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnFQH-00050T-DA
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 09:47:13 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnFXQ-0005d8-8l
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 09:54:36 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnFQA-0007Jj-00
	for <commit-classpath@gnu.org>; Mon, 05 Jun 2006 09:47:06 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FnFQ9-0007Jg-7k
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 13:47:05 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnFQ9-0007Jg-7k@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Mon, 05 Jun 2006 13:47:05 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/GtkIm...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jun 2006 13:47:17 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/05 13:47:04

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: GtkImage.java GtkToolkit.java 

Log message:
	2006-06-05  Francis Kung  <fkung@redhat.com>
	
	        PR 27507
	        * gnu/java/awt/peer/gtk/GtkImage.java
	        (getSource): Added check to determine if in
	        errorLoading state.
	        * gnu/java/awt/peer/gtk/GtkToolkit.java
	        (createImage): Added check to prevent NPE.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7655&r2=1.7656
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkImage.java?cvsroot=classpath&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java?cvsroot=classpath&r1=1.86&r2=1.87

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7655
retrieving revision 1.7656
diff -u -b -r1.7655 -r1.7656
--- ChangeLog	5 Jun 2006 12:38:30 -0000	1.7655
+++ ChangeLog	5 Jun 2006 13:47:02 -0000	1.7656
@@ -1,3 +1,12 @@
+2006-06-05  Francis Kung  <fkung@redhat.com>
+	
+	PR 27507
+	* gnu/java/awt/peer/gtk/GtkImage.java
+	(getSource): Added check to determine if in
+	errorLoading state.
+	* gnu/java/awt/peer/gtk/GtkToolkit.java
+	(createImage): Added check to prevent NPE.
+
 2006-06-05  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	* javax/swing/text/html/HTMLEditorKit.java (HTMLFactory.create):

Index: gnu/java/awt/peer/gtk/GtkImage.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkImage.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- gnu/java/awt/peer/gtk/GtkImage.java	30 May 2006 21:42:56 -0000	1.33
+++ gnu/java/awt/peer/gtk/GtkImage.java	5 Jun 2006 13:47:04 -0000	1.34
@@ -421,9 +421,12 @@
       return null;
 
     int[] pixels;
-    synchronized(pixbufLock)
+    synchronized (pixbufLock)
       {
+        if (!errorLoading)
 	pixels = getPixels();
+        else
+          return null;
       }
     return new MemoryImageSource(width, height, nativeModel, pixels, 
 				 0, width);

Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- gnu/java/awt/peer/gtk/GtkToolkit.java	30 May 2006 22:36:32 -0000	1.86
+++ gnu/java/awt/peer/gtk/GtkToolkit.java	5 Jun 2006 13:47:04 -0000	1.87
@@ -184,6 +184,9 @@
 
   public Image createImage (ImageProducer producer) 
   {
+    if (producer == null)
+      return null;
+      
     Image image;
     try
       {



From MAILER-DAEMON Mon Jun 05 10:20:06 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnFw6-0005pu-HX
	for mharc-commit-classpath@gnu.org; Mon, 05 Jun 2006 10:20:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnFw4-0005ml-8Y
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 10:20:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnFw3-0005lv-N2
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 10:20:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnFw3-0005le-2v
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 10:20:03 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnG3C-0008Lh-Sq
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 10:27:27 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnFw1-0007fw-00
	for <commit-classpath@gnu.org>; Mon, 05 Jun 2006 10:20:01 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FnFw1-0007fq-7L
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 14:20:01 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnFw1-0007fq-7L@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Mon, 05 Jun 2006 14:20:01 +0000
Subject: [commit-cp] classpath ChangeLog native/plugin/Makefile.am n...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jun 2006 14:20:04 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/05 14:20:00

Modified files:
	.              : ChangeLog 
	native/plugin  : Makefile.am gcjwebplugin.cc 

Log message:
	2006-06-05  Lillian Angel  <langel@redhat.com>
	
	        * native/plugin/Makefile.am:
	        Fixed to use a set plugin directory in the .mozilla directory.
	        All applet logs are now stored here, instead of /tmp.
	        * native/plugin/gcjwebplugin.cc:
	        Added new fields for security warning.
	        (GCJ_NEW): Added code to generate a security warning for all pages
	        that spawn an appletviewer. This warning asks the user if they trust
	        the applet and if they would like to add it to a 'whitelist'. This
	        whitelist keeps track of all the addresses the user would like
	        to trust indefinitely.
	        (plugin_user_trusts_documentbase): New helper function.
	        (plugin_add_documentbase_to_whitelist): New helper function.
	        (plugin_ask_user_about_documentbase): New helper function.
	        (plugin_in_pipe_callback): Fixed check to determine if channel_error
	        has been set.
	        (plugin_start_appletviewer): Likewise.
	        (plugin_create_applet_tag):  Reset all fields to null after they have been
	        freed.
	        (plugin_send_message_to_appletviewer): Fixed all error checks to determine
	        if channel_error has been set.
	        (plugin_stop_appletviewer): Likewise.
	        (NP_Initialize): Likewise. Also, added code to determine if directory and file
	        should be created.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7656&r2=1.7657
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/Makefile.am?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/gcjwebplugin.cc?cvsroot=classpath&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7656
retrieving revision 1.7657
diff -u -b -r1.7656 -r1.7657
--- ChangeLog	5 Jun 2006 13:47:02 -0000	1.7656
+++ ChangeLog	5 Jun 2006 14:19:59 -0000	1.7657
@@ -1,3 +1,29 @@
+2006-06-05  Lillian Angel  <langel@redhat.com>
+
+	* native/plugin/Makefile.am:
+	Fixed to use a set plugin directory in the .mozilla directory.
+	All applet logs are now stored here, instead of /tmp.
+	* native/plugin/gcjwebplugin.cc:
+	Added new fields for security warning.
+	(GCJ_NEW): Added code to generate a security warning for all pages
+	that spawn an appletviewer. This warning asks the user if they trust
+	the applet and if they would like to add it to a 'whitelist'. This
+	whitelist keeps track of all the addresses the user would like
+	to trust indefinitely.
+	(plugin_user_trusts_documentbase): New helper function.
+	(plugin_add_documentbase_to_whitelist): New helper function.
+	(plugin_ask_user_about_documentbase): New helper function.
+	(plugin_in_pipe_callback): Fixed check to determine if channel_error 
+	has been set.
+	(plugin_start_appletviewer): Likewise.
+	(plugin_create_applet_tag):  Reset all fields to null after they have been
+	freed.
+	(plugin_send_message_to_appletviewer): Fixed all error checks to determine 
+	if channel_error has been set.
+	(plugin_stop_appletviewer): Likewise.
+	(NP_Initialize): Likewise. Also, added code to determine if directory and file
+	should be created.	
+
 2006-06-05  Francis Kung  <fkung@redhat.com>
 	
 	PR 27507

Index: native/plugin/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/plugin/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- native/plugin/Makefile.am	9 May 2006 18:11:13 -0000	1.1
+++ native/plugin/Makefile.am	5 Jun 2006 14:20:00 -0000	1.2
@@ -4,15 +4,16 @@
 
 libgcjwebplugin_la_CXXFLAGS = \
 	-Wall -DAPPLETVIEWER_EXECUTABLE="\"$(bindir)/appletviewer\"" \
-	$(MOZILLA_CFLAGS) $(GLIB_CFLAGS)
+	-DPLUGIN_DATA_DIRECTORY="\"$(PLUGIN_DIR)/gcjwebplugin-data\"" \
+	$(MOZILLA_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
 
 libgcjwebplugin_la_LDFLAGS = -avoid-version \
-	$(GLIB_LIBS) \
+	$(GLIB_LIBS) $(GTK_LIBS) \
 	-lstdc++
 
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	$(INSTALL) -d -m0755 $(DESTDIR)@PLUGIN_DIR@
-	$(INSTALL) .libs/libgcjwebplugin.so $(DESTDIR)@PLUGIN_DIR@
+install-plugin: $(lib_LTLIBRARIES)
+	$(INSTALL) -d -m0755 $(DESTDIR)$(PLUGIN_DIR)
+	$(INSTALL) .libs/libgcjwebplugin.so $(DESTDIR)$(PLUGIN_DIR)
 
-uninstall-libLTLIBRARIES:
-	rm -f $(DESTDIR)@PLUGIN_DIR@/libgcjwebplugin.so
+uninstall-plugin:
+	rm -f $(DESTDIR)$(PLUGIN_DIR)/libgcjwebplugin.so

Index: native/plugin/gcjwebplugin.cc
===================================================================
RCS file: /cvsroot/classpath/classpath/native/plugin/gcjwebplugin.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- native/plugin/gcjwebplugin.cc	9 May 2006 18:11:13 -0000	1.1
+++ native/plugin/gcjwebplugin.cc	5 Jun 2006 14:20:00 -0000	1.2
@@ -49,6 +49,10 @@
 
 // GLib includes.
 #include <glib.h>
+#include <glib/gstdio.h>
+
+// GTK includes.
+#include <gtk/gtk.h>
 
 // gcjwebplugin includes.
 #include "config.h"
@@ -113,8 +117,23 @@
 #define PLUGIN_FILE_EXTS "class,jar,zip"
 #define PLUGIN_MIME_COUNT 1
 
-// Directory in which named pipes are created.
-#define PIPE_DIRECTORY "/tmp"
+// Security dialog messages.
+#define RESPONSE_TRUST_APPLET "Trust Applet"
+#define RESPONSE_TRUST_APPLET_ADD_TO_LIST "Trust Applet and Add to Whitelist"
+#define WHITELIST_FILENAME PLUGIN_DATA_DIRECTORY "/whitelist.txt"
+#define SECURITY_WARNING                                        \
+  "%s wants to load an applet.\n"                               \
+  "GNU Classpath's security implementation is not complete.\n"  \
+  "HOSTILE APPLETS WILL STEAL AND/OR DESTROY YOUR DATA!\n"
+#define SECURITY_DESCRIPTION                                            \
+  "If you do not know or trust the source of this applet, click"        \
+  " \"Cancel\".\n"                                                      \
+  "Click \"Trust Applet\" to load and run this applet now.\n"           \
+  "Click \"Trust Applet and Add To Whitelist\" to always load"          \
+  " and run this applet from now on, without asking.\n"                 \
+  "The whitelist is a list of the URLs from which you trust"            \
+  " applets.\n"                                                         \
+  "Your whitelist file is \"" WHITELIST_FILENAME "\"."
 
 // Documentbase retrieval required definition.
 static NS_DEFINE_IID (kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID);
@@ -173,6 +192,10 @@
 static void plugin_data_new (GCJPluginData** data);
 // Documentbase retrieval.
 static gchar* plugin_get_documentbase (NPP instance);
+// Whitelist handling.
+static bool plugin_user_trusts_documentbase (char* documentbase);
+static bool plugin_ask_user_about_documentbase (char* documentbase);
+static void plugin_add_documentbase_to_whitelist (char* documentbase);
 // Callback used to monitor input pipe status.
 static gboolean plugin_in_pipe_callback (GIOChannel* source,
                                          GIOCondition condition,
@@ -195,6 +218,11 @@
 static GMutex* plugin_instance_mutex = NULL;
 // A counter used to create uniquely named pipes.
 static gulong plugin_instance_counter = 0;
+// The user's documentbase whitelist.
+static GIOChannel* whitelist_file = NULL;
+// A global variable for reporting GLib errors.  This must be free'd
+// and set to NULL after each use.
+static GError* channel_error = NULL;
 
 // Functions prefixed by GCJ_ are instance functions.  They are called
 // by the browser and operate on instances of GCJPluginData.
@@ -224,7 +252,7 @@
 
   NPError np_error = NPERR_NO_ERROR;
   GCJPluginData* data = NULL;
-  GError* channel_error = NULL;
+
   gchar* documentbase = NULL;
   gchar* read_message = NULL;
   gchar* applet_tag = NULL;
@@ -278,11 +306,18 @@
       goto cleanup_appletviewer_mutex;
     }
 
+  if (!plugin_user_trusts_documentbase (documentbase))
+    {
+      PLUGIN_ERROR ("User does not trust applet.");
+      np_error = NPERR_GENERIC_ERROR;
+      goto cleanup_appletviewer_mutex;
+    }
+
   // Create appletviewer-to-plugin pipe which we refer to as the input
   // pipe.
 
   // data->in_pipe_name
-  data->in_pipe_name = g_strdup_printf (PIPE_DIRECTORY
+  data->in_pipe_name = g_strdup_printf (PLUGIN_DATA_DIRECTORY
                                         "/gcj-%s-appletviewer-to-plugin",
                                         data->instance_string);
   if (!data->in_pipe_name)
@@ -305,7 +340,7 @@
   // output pipe.
 
   // data->out_pipe_name
-  data->out_pipe_name = g_strdup_printf (PIPE_DIRECTORY
+  data->out_pipe_name = g_strdup_printf (PLUGIN_DATA_DIRECTORY
                                          "/gcj-%s-plugin-to-appletviewer",
                                          data->instance_string);
 
@@ -342,16 +377,19 @@
                                                      "w", &channel_error);
   if (!data->out_to_appletviewer)
     {
-      PLUGIN_ERROR_TWO ("Failed to create output channel",
-                        channel_error->message);
-      np_error = NPERR_GENERIC_ERROR;
-      goto cleanup_out_to_appletviewer;
-    }
   if (channel_error)
     {
+          PLUGIN_ERROR_TWO ("Failed to create output channel",
+                            channel_error->message);
       g_error_free (channel_error);
       channel_error = NULL;
     }
+      else
+        PLUGIN_ERROR ("Failed to create output channel");
+        
+      np_error = NPERR_GENERIC_ERROR;
+      goto cleanup_out_to_appletviewer;
+    }
 
   // Watch for hangup and error signals on the output pipe.
   data->out_watch_source =
@@ -366,16 +404,19 @@
                                                       "r", &channel_error);
   if (!data->in_from_appletviewer)
     {
-      PLUGIN_ERROR_TWO ("Failed to create input channel",
-                        channel_error->message);
-      np_error = NPERR_GENERIC_ERROR;
-      goto cleanup_in_from_appletviewer;
-    }
   if (channel_error)
     {
+          PLUGIN_ERROR_TWO ("Failed to create input channel",
+                            channel_error->message);
       g_error_free (channel_error);
       channel_error = NULL;
     }
+      else
+        PLUGIN_ERROR ("Failed to create input channel");
+        
+      np_error = NPERR_GENERIC_ERROR;
+      goto cleanup_in_from_appletviewer;
+    }
 
   // Watch for hangup and error signals on the input pipe.
   data->in_watch_source =
@@ -390,16 +431,19 @@
                               &channel_error)
       != G_IO_STATUS_NORMAL)
     {
-      PLUGIN_ERROR_TWO ("Receiving confirmation from appletviewer failed",
-                        channel_error->message);
-      np_error = NPERR_GENERIC_ERROR;
-      goto cleanup_in_watch_source;
-    }
   if (channel_error)
     {
+          PLUGIN_ERROR_TWO ("Receiving confirmation from appletviewer failed",
+                            channel_error->message);
       g_error_free (channel_error);
       channel_error = NULL;
     }
+      else
+        PLUGIN_ERROR ("Receiving confirmation from appletviewer failed");
+          
+      np_error = NPERR_GENERIC_ERROR;
+      goto cleanup_in_watch_source;
+    }
 
   PLUGIN_DEBUG ("GCJ_New: got confirmation that appletviewer is running.");
   data->appletviewer_alive = TRUE;
@@ -480,7 +524,6 @@
   instance->pdata = NULL;
 
  cleanup_done:
-
   g_free (tag_message);
   tag_message = NULL;
   g_free (applet_tag);
@@ -602,6 +645,7 @@
                                                           window->width);
 		  plugin_send_message_to_appletviewer (data, width_message);
                   g_free (width_message);
+                  width_message = NULL;
 
                   // Store the new width.
                   data->window_width = window->width;
@@ -619,6 +663,7 @@
                                                            window->height);
 		  plugin_send_message_to_appletviewer (data, height_message);
                   g_free (height_message);
+                  height_message = NULL;
 
                   // Store the new height.
                   data->window_height = window->height;
@@ -651,6 +696,7 @@
                                                (gulong) window->window);
       plugin_send_message_to_appletviewer (data, window_message);
       g_free (window_message);
+      window_message = NULL;
 
       g_mutex_unlock (data->appletviewer_mutex);
 
@@ -833,6 +879,175 @@
   return documentbase_copy;
 }
 
+// plugin_user_trusts_documentbase returns true if the given
+// documentbase is in the documentbase whitelist.  Otherwise it asks
+// the user if he trusts the given documentbase by calling
+// plugin_ask_user_about_documentbase.
+static bool
+plugin_user_trusts_documentbase (char* documentbase)
+{
+  bool applet_in_whitelist = false;
+
+  // Check if documentbase is in whitelist.
+  while (true)
+    {
+      gchar* whitelist_entry = NULL;
+      gchar* newline_documentbase = NULL;
+
+      // If reading fails, break out of this loop with
+      // applet_in_whitelist still set to false.
+      if (g_io_channel_read_line (whitelist_file, &whitelist_entry,
+                                  NULL, NULL, &channel_error)
+          != G_IO_STATUS_NORMAL)
+        {
+          if (channel_error)
+            {
+              PLUGIN_ERROR_TWO ("Failed to read line from whitelist file",
+                                channel_error->message);
+              g_error_free (channel_error);
+              channel_error = NULL;
+            }
+          else
+            PLUGIN_ERROR ("Failed to open whitelist file.");
+          g_free (whitelist_entry);
+          whitelist_entry = NULL;
+          break;
+        }
+
+      newline_documentbase = g_strdup_printf ("%s\n", documentbase);
+      if (!strcmp (newline_documentbase, whitelist_entry))
+        {
+          applet_in_whitelist = true;
+          g_free (newline_documentbase);
+          newline_documentbase = NULL;
+          g_free (whitelist_entry);
+          whitelist_entry = NULL;
+          break;
+        }
+      g_free (whitelist_entry);
+      whitelist_entry = NULL;
+      g_free (newline_documentbase);
+      newline_documentbase = NULL;
+    }
+
+  return applet_in_whitelist ? true
+    : plugin_ask_user_about_documentbase (documentbase);
+}
+
+// plugin_add_documentbase_to_whitelist adds the given documentbase to
+// the user's documentbase whitelist.
+static void
+plugin_add_documentbase_to_whitelist (char* documentbase)
+{
+  gsize bytes_written = 0;
+  char* newline_documentbase = NULL;
+  GIOStatus status = G_IO_STATUS_NORMAL;
+
+  newline_documentbase = g_strdup_printf ("%s\n", documentbase);
+  status = g_io_channel_write_chars (whitelist_file,
+                                     newline_documentbase, -1, &bytes_written,
+                                     &channel_error);
+  g_free (newline_documentbase);
+  newline_documentbase = NULL;
+
+  if (status != G_IO_STATUS_NORMAL)
+    {
+      if (channel_error)
+        {
+          PLUGIN_ERROR_TWO ("Error writing to whitelist file",
+                            channel_error->message);
+          g_error_free (channel_error);
+          channel_error = NULL;
+        }
+      else
+        PLUGIN_ERROR ("Error writing to whitelist file.");
+    }
+
+  if (g_io_channel_flush (whitelist_file, &channel_error)
+      != G_IO_STATUS_NORMAL)
+    {
+      if (channel_error)
+        {
+          PLUGIN_ERROR_TWO ("Failed to write whitelist file",
+                            channel_error->message);
+          g_error_free (channel_error);
+          channel_error = NULL;
+        }
+      else
+        PLUGIN_ERROR ("Failed to write whitelist file.");
+    }
+
+  if (g_io_channel_shutdown (whitelist_file, TRUE, &channel_error)
+      != G_IO_STATUS_NORMAL)
+    {
+      if (channel_error)
+        {
+          PLUGIN_ERROR_TWO ("Failed to close whitelist file",
+                            channel_error->message);
+          g_error_free (channel_error);
+          channel_error = NULL;
+        }
+      else
+        PLUGIN_ERROR ("Failed to close whitelist file.");
+    }
+}
+
+// plugin_ask_user_about_documentbase puts up a dialog box that asks if the
+// user trusts applets from this documentbase.  The user has three
+// options: "Cancel", "Trust Applet" and "Trust Applet and Add to
+// Whitelist".  If the user selects Cancel (the default) then a
+// generic error code is returned from GCJ_New, telling the browser
+// that the applet failed to load.  If the user selects "Trust Applet"
+// then plugin loading proceeds.  If the user selects "Trust Applet
+// and Add to Whitelist" then this documentbase is added to the user's
+// applet whitelist and plugin loading proceeds.
+static bool
+plugin_ask_user_about_documentbase (char* documentbase)
+{
+  GtkWidget* dialog = NULL;
+  GtkWidget* ok_button = NULL;
+  GtkWidget* cancel_button = NULL;
+  GtkWidget* whitelist_button = NULL;
+  gint dialog_response = GTK_RESPONSE_NONE;
+
+  dialog = gtk_message_dialog_new (NULL,
+                                   GTK_DIALOG_MODAL,
+                                   GTK_MESSAGE_WARNING,
+                                   GTK_BUTTONS_NONE,
+                                   SECURITY_WARNING,
+                                   documentbase);
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                            SECURITY_DESCRIPTION);
+
+  cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
+                                         GTK_STOCK_CANCEL,
+                                         GTK_RESPONSE_CANCEL);
+  ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
+                                     RESPONSE_TRUST_APPLET,
+                                     GTK_RESPONSE_OK);
+  whitelist_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
+                                            RESPONSE_TRUST_APPLET_ADD_TO_LIST,
+                                            GTK_RESPONSE_APPLY);
+  gtk_widget_grab_focus (cancel_button);
+
+  gtk_widget_show_all (dialog);
+  dialog_response = gtk_dialog_run (GTK_DIALOG (dialog));
+  gtk_widget_destroy (dialog);
+  if (dialog_response == GTK_RESPONSE_CANCEL)
+    {
+      // The user does not trust this documentbase.
+      return false;
+    }
+  else if (dialog_response == GTK_RESPONSE_APPLY)
+    {
+      // The user wants this documentbase added to his documentbase
+      // whitelist.
+      plugin_add_documentbase_to_whitelist (documentbase);
+    }
+  // The user trusts this documentbase.
+  return true;
+}
+
 // plugin_in_pipe_callback is called when data is available on the
 // input pipe, or when the appletviewer crashes or is killed.  It may
 // be called after data has been destroyed in which case it simply
@@ -858,7 +1073,6 @@
 
       if (condition & G_IO_IN)
         {
-          GError* channel_error = NULL;
           gchar* message = NULL;
 
           if (g_io_channel_read_line (data->in_from_appletviewer,
@@ -866,8 +1080,15 @@
                                       &channel_error)
               != G_IO_STATUS_NORMAL)
             {
+              if (channel_error)
+                {
               PLUGIN_ERROR_TWO ("Failed to read line from input channel",
                                 channel_error->message);
+                  g_error_free (channel_error);
+                  channel_error = NULL;
+                }
+              else
+                PLUGIN_ERROR ("Failed to read line from input channel");
             }
           else
             {
@@ -899,12 +1120,6 @@
               g_print ("  PIPE: plugin read %s\n", message);
             }
 
-          if (channel_error)
-            {
-              g_error_free (channel_error);
-              channel_error = NULL;
-            }
-
           g_free (message);
           message = NULL;
 
@@ -965,7 +1180,6 @@
 
   if (!data->appletviewer_alive)
     {
-      GError* spawn_error = NULL;
       gchar* command_line[3] = { NULL, NULL, NULL };
 
       command_line[0] = g_strdup (APPLETVIEWER_EXECUTABLE);
@@ -977,22 +1191,27 @@
       command_line[2] = NULL;
 
       if (!g_spawn_async (NULL, command_line, NULL, (GSpawnFlags) 0,
-                          NULL, NULL, NULL, &spawn_error))
+                          NULL, NULL, NULL, &channel_error))
+        {
+          if (channel_error)
         {
           PLUGIN_ERROR_TWO ("Failed to spawn applet viewer",
-                            spawn_error->message);
+                                channel_error->message);
+              g_error_free (channel_error);
+              channel_error = NULL;
+            }
+          else
+            PLUGIN_ERROR ("Failed to spawn applet viewer");
           goto cleanup;
         }
 
     cleanup:
       g_free (command_line[0]);
+      command_line[0] = NULL;
       g_free (command_line[1]);
+      command_line[1] = NULL;
       g_free (command_line[2]);
-      if (spawn_error)
-        {
-          g_error_free (spawn_error);
-          spawn_error = NULL;
-        }
+      command_line[2] = NULL;
     }
 
   PLUGIN_DEBUG ("plugin_start_appletviewer return");
@@ -1015,30 +1234,35 @@
           gchar* code = g_strdup_printf ("CODE=\"%s\" ", argv[i]);
 	  applet_tag = g_strconcat (applet_tag, code, NULL);
           g_free (code);
+          code = NULL;
 	}
       else if (!g_ascii_strcasecmp (argn[i], "codebase"))
 	{
           gchar* codebase = g_strdup_printf ("CODEBASE=\"%s\" ", argv[i]);
 	  applet_tag = g_strconcat (applet_tag, codebase, NULL);
           g_free (codebase);
+          codebase = NULL;
 	}
       else if (!g_ascii_strcasecmp (argn[i], "archive"))
 	{
           gchar* archive = g_strdup_printf ("ARCHIVE=\"%s\" ", argv[i]);
 	  applet_tag = g_strconcat (applet_tag, archive, NULL);
           g_free (archive);
+          archive = NULL;
 	}
       else if (!g_ascii_strcasecmp (argn[i], "width"))
 	{
           gchar* width = g_strdup_printf ("WIDTH=\"%s\" ", argv[i]);
 	  applet_tag = g_strconcat (applet_tag, width, NULL);
           g_free (width);
+          width = NULL;
 	}
       else if (!g_ascii_strcasecmp (argn[i], "height"))
 	{
           gchar* height = g_strdup_printf ("HEIGHT=\"%s\" ", argv[i]);
 	  applet_tag = g_strconcat (applet_tag, height, NULL);
           g_free (height);
+          height = NULL;
 	}
       else
         {
@@ -1046,10 +1270,14 @@
           // characters will pass through the pipe.
           if (argv[i] != '\0')
             {
-              gchar* escaped = g_strescape (argv[i], NULL);
+              gchar* escaped = NULL;
+
+              escaped = g_strescape (argv[i], NULL);
               parameters = g_strconcat (parameters, "<PARAM NAME=\"", argn[i],
                                         "\" VALUE=\"", escaped, "\">", NULL);
+
               g_free (escaped);
+              escaped = NULL;
             }
         }
     }
@@ -1073,7 +1301,6 @@
 
   if (data->appletviewer_alive)
     {
-      GError* channel_error = NULL;
       gchar* newline_message = NULL;
       gsize bytes_written = 0;
 
@@ -1087,26 +1314,33 @@
                                     newline_message, -1, &bytes_written,
                                     &channel_error)
           != G_IO_STATUS_NORMAL)
-        PLUGIN_ERROR_TWO ("Failed to write bytes to output channel",
-                          channel_error->message);
-
+        {
       if (channel_error)
         {
+              PLUGIN_ERROR_TWO ("Failed to write bytes to output channel",
+                                channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
         }
+          else
+            PLUGIN_ERROR ("Failed to write bytes to output channel");
+        }            
 
       if (g_io_channel_flush (data->out_to_appletviewer, &channel_error)
           != G_IO_STATUS_NORMAL)
-        PLUGIN_ERROR_TWO ("Failed to flush bytes to output channel",
-                          channel_error->message);
-
+        {
       if (channel_error)
         {
+              PLUGIN_ERROR_TWO ("Failed to flush bytes to output channel",
+                                channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
         }
+          else
+            PLUGIN_ERROR ("Failed to flush bytes to output channel");
+        }
       g_free (newline_message);
+      newline_message = NULL;
 
       g_print ("  PIPE: plugin wrote %s\n", message);
     }
@@ -1135,7 +1369,6 @@
   if (data->appletviewer_alive)
     {
       // Shut down the appletviewer.
-      GError* channel_error = NULL;
       gsize bytes_written = 0;
 
       if (data->out_to_appletviewer)
@@ -1143,37 +1376,46 @@
           if (g_io_channel_write_chars (data->out_to_appletviewer, "shutdown",
                                         -1, &bytes_written, &channel_error)
               != G_IO_STATUS_NORMAL)
-            PLUGIN_ERROR_TWO ("Failed to write shutdown message to"
-                              " appletviewer", channel_error->message);
-
+            {
           if (channel_error)
             {
+                  PLUGIN_ERROR_TWO ("Failed to write shutdown message to"
+                                    " appletviewer", channel_error->message);
               g_error_free (channel_error);
               channel_error = NULL;
             }
+              else
+                PLUGIN_ERROR ("Failed to write shutdown message to");
+            }
 
           if (g_io_channel_flush (data->out_to_appletviewer, &channel_error)
               != G_IO_STATUS_NORMAL)
-            PLUGIN_ERROR_TWO ("Failed to write shutdown message to"
-                              " appletviewer", channel_error->message);
-
+            {
           if (channel_error)
             {
+                  PLUGIN_ERROR_TWO ("Failed to write shutdown message to"
+                                    " appletviewer", channel_error->message);
               g_error_free (channel_error);
               channel_error = NULL;
             }
+              else
+                PLUGIN_ERROR ("Failed to write shutdown message to");
+            }
 
           if (g_io_channel_shutdown (data->out_to_appletviewer,
                                      TRUE, &channel_error)
               != G_IO_STATUS_NORMAL)
-            PLUGIN_ERROR_TWO ("Failed to shut down appletviewer"
-                              " output channel", channel_error->message);
-
+            {
           if (channel_error)
             {
+                  PLUGIN_ERROR_TWO ("Failed to shut down appletviewer"
+                                    " output channel", channel_error->message);
               g_error_free (channel_error);
               channel_error = NULL;
             }
+              else
+                PLUGIN_ERROR ("Failed to shut down appletviewer");
+            }
         }
 
       if (data->in_from_appletviewer)
@@ -1181,14 +1423,17 @@
           if (g_io_channel_shutdown (data->in_from_appletviewer,
                                      TRUE, &channel_error)
               != G_IO_STATUS_NORMAL)
-            PLUGIN_ERROR_TWO ("Failed to shut down appletviewer"
-                              " input channel", channel_error->message);
-
+            {
           if (channel_error)
             {
+                  PLUGIN_ERROR_TWO ("Failed to shut down appletviewer"
+                                    " input channel", channel_error->message);
               g_error_free (channel_error);
               channel_error = NULL;
             }
+              else
+                PLUGIN_ERROR ("Failed to shut down appletviewer");
+            }
         }
     }
 
@@ -1307,6 +1552,43 @@
       return NPERR_INVALID_FUNCTABLE_ERROR;
     }
 
+  // Make sure the plugin data directory exists, creating it if
+  // necessary.
+  if (!g_file_test (PLUGIN_DATA_DIRECTORY,
+                    (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
+    {
+      int file_error = 0;
+
+      file_error = g_mkdir (PLUGIN_DATA_DIRECTORY, 0700);
+      if (file_error != 0)
+        {
+          PLUGIN_ERROR_TWO ("Failed to create data directory "
+                            PLUGIN_DATA_DIRECTORY " ",
+                            strerror (errno));
+          return NPERR_GENERIC_ERROR;
+        }
+    }
+
+  // Open the user's documentbase whitelist.
+  whitelist_file = g_io_channel_new_file (WHITELIST_FILENAME,
+                                          "a+", &channel_error);
+  if (!whitelist_file)
+    {
+      if (channel_error)
+        {
+          PLUGIN_ERROR_TWO ("Failed to open whitelist file "
+                            WHITELIST_FILENAME " ",
+                            channel_error->message);
+          g_error_free (channel_error);
+          channel_error = NULL;
+        }
+      else
+        PLUGIN_ERROR ("Failed to open whitelist file "
+                      WHITELIST_FILENAME);
+
+      return NPERR_GENERIC_ERROR;
+    }
+
   // Store in a local table the browser functions that we may use.
   browserFunctions.version = browserTable->version;
   browserFunctions.size = browserTable->size;
@@ -1405,6 +1687,8 @@
   g_mutex_free (plugin_instance_mutex);
   plugin_instance_mutex = NULL;
 
+  g_io_channel_close (whitelist_file);
+
   PLUGIN_DEBUG ("NP_Shutdown return");
 
   return NPERR_NO_ERROR;



From MAILER-DAEMON Mon Jun 05 14:20:19 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnJgZ-0000ss-QG
	for mharc-commit-classpath@gnu.org; Mon, 05 Jun 2006 14:20:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnJgY-0000sl-NO
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 14:20:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnJgW-0000sZ-Tk
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 14:20:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnJgW-0000sW-O6
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 14:20:16 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnJnj-0004CG-2z
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 14:27:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnJgW-00082f-00
	for <commit-classpath@gnu.org>; Mon, 05 Jun 2006 14:20:16 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FnJgV-00082c-K8
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 18:20:16 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnJgV-00082c-K8@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Mon, 05 Jun 2006 18:20:15 +0000
Subject: [commit-cp] classpath ChangeLog native/plugin/gcjwebplugin.cc
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jun 2006 18:20:18 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/05 18:20:15

Modified files:
	.              : ChangeLog 
	native/plugin  : gcjwebplugin.cc 

Log message:
	2006-06-05  Lillian Angel  <langel@redhat.com>
	
	        * native/plugin/gcjwebplugin.cc:
	        Added new field to keep track of initialization.
	        (plugin_start_appletviewer): Fixed to return an error value, if
	        an error was encountered when loading the appletviewer.
	        (GCJ_NEW): Added call to plugin_failed if the loading of the appletviewer
	        has failed.
	        (plugin_failed): New helper function. Shows a warning if the appletviewer
	        has not been installed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7657&r2=1.7658
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/gcjwebplugin.cc?cvsroot=classpath&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7657
retrieving revision 1.7658
diff -u -b -r1.7657 -r1.7658
--- ChangeLog	5 Jun 2006 14:19:59 -0000	1.7657
+++ ChangeLog	5 Jun 2006 18:20:14 -0000	1.7658
@@ -1,5 +1,16 @@
 2006-06-05  Lillian Angel  <langel@redhat.com>
 
+	* native/plugin/gcjwebplugin.cc:
+	Added new field to keep track of initialization.
+	(plugin_start_appletviewer): Fixed to return an error value, if
+	an error was encountered when loading the appletviewer.
+	(GCJ_NEW): Added call to plugin_failed if the loading of the appletviewer
+	has failed.
+	(plugin_failed): New helper function. Shows a warning if the appletviewer
+	has not been installed.
+
+2006-06-05  Lillian Angel  <langel@redhat.com>
+
 	* native/plugin/Makefile.am:
 	Fixed to use a set plugin directory in the .mozilla directory.
 	All applet logs are now stored here, instead of /tmp.

Index: native/plugin/gcjwebplugin.cc
===================================================================
RCS file: /cvsroot/classpath/classpath/native/plugin/gcjwebplugin.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- native/plugin/gcjwebplugin.cc	5 Jun 2006 14:20:00 -0000	1.2
+++ native/plugin/gcjwebplugin.cc	5 Jun 2006 18:20:15 -0000	1.3
@@ -134,6 +134,9 @@
   "The whitelist is a list of the URLs from which you trust"            \
   " applets.\n"                                                         \
   "Your whitelist file is \"" WHITELIST_FILENAME "\"."
+#define FAILURE_MESSAGE                                                     \
+  "This page wants to load an applet.\n"                                    \
+  "There is no appletviewer installed in \"" APPLETVIEWER_EXECUTABLE "\"."  \
 
 // Documentbase retrieval required definition.
 static NS_DEFINE_IID (kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID);
@@ -141,6 +144,10 @@
 // Browser function table.
 static NPNetscapeFuncs browserFunctions;
 
+// Keeps track of initialization. NP_INITIALIZE should only be
+// called once.
+bool initialized = false;
+
 // GCJPluginData stores all the data associated with a single plugin
 // instance.  A separate plugin instance is created for each <APPLET>
 // tag.  For now, each plugin instance spawns its own applet viewer
@@ -192,6 +199,8 @@
 static void plugin_data_new (GCJPluginData** data);
 // Documentbase retrieval.
 static gchar* plugin_get_documentbase (NPP instance);
+// plugin failure handling.
+static bool plugin_failed ();
 // Whitelist handling.
 static bool plugin_user_trusts_documentbase (char* documentbase);
 static bool plugin_ask_user_about_documentbase (char* documentbase);
@@ -204,7 +213,7 @@
 static gboolean plugin_out_pipe_callback (GIOChannel* source,
                                           GIOCondition condition,
                                           gpointer plugin_data);
-static void plugin_start_appletviewer (GCJPluginData* data);
+static NPError plugin_start_appletviewer (GCJPluginData* data);
 static gchar* plugin_create_applet_tag (int16 argc, char* argn[],
                                         char* argv[]);
 static void plugin_send_message_to_appletviewer (GCJPluginData* data,
@@ -368,7 +377,15 @@
   // watch callbacks.
   g_mutex_lock (data->appletviewer_mutex);
 
-  plugin_start_appletviewer (data);
+  np_error = plugin_start_appletviewer (data);
+  
+  // If the appletviewer is not installed, then a dialog box will
+  // show up and the plugin will be killed.
+  if (np_error != NPERR_NO_ERROR)
+    {
+      if (plugin_failed ())
+        goto cleanup_applet_failure; 
+  	}
 
   // Create plugin-to-appletviewer channel.  The default encoding for
   // the file is UTF-8.
@@ -493,6 +510,7 @@
   // Delete output pipe.
   unlink (data->out_pipe_name);
 
+ cleanup_applet_failure:
  cleanup_out_pipe_name:
   g_free (data->out_pipe_name);
   data->out_pipe_name = NULL;
@@ -879,6 +897,32 @@
   return documentbase_copy;
 }
 
+// This function shows a error message if the appletviewer has
+// not been installed. It returns true, if the user presses the
+// ok button.
+static bool
+plugin_failed ()
+{
+  GtkWidget* dialog = NULL;
+  GtkWidget* ok_button = NULL;
+
+  dialog = gtk_message_dialog_new (NULL,
+                                   GTK_DIALOG_MODAL,
+                                   GTK_MESSAGE_WARNING,
+                                   GTK_BUTTONS_NONE,
+                                   FAILURE_MESSAGE);
+  ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
+                                     GTK_STOCK_OK,
+                                     GTK_RESPONSE_OK);
+  gtk_widget_show_all (dialog);
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+      gtk_widget_destroy (dialog);
+      return true;	  
+    }
+  return false;
+}
+
 // plugin_user_trusts_documentbase returns true if the given
 // documentbase is in the documentbase whitelist.  Otherwise it asks
 // the user if he trusts the given documentbase by calling
@@ -1173,10 +1217,11 @@
   return FALSE;
 }
 
-static void
+static NPError
 plugin_start_appletviewer (GCJPluginData* data)
 {
   PLUGIN_DEBUG ("plugin_start_appletviewer");
+  NPError error = NPERR_NO_ERROR;
 
   if (!data->appletviewer_alive)
     {
@@ -1202,6 +1247,7 @@
             }
           else
             PLUGIN_ERROR ("Failed to spawn applet viewer");
+          error = NPERR_GENERIC_ERROR;
           goto cleanup;
         }
 
@@ -1215,6 +1261,7 @@
     }
 
   PLUGIN_DEBUG ("plugin_start_appletviewer return");
+  return error;
 }
 
 // Build up the applet tag string that we'll send to the applet
@@ -1517,7 +1564,9 @@
 {
   PLUGIN_DEBUG ("NP_Initialize");
 
-  if ((browserTable == NULL) || (pluginTable == NULL))
+  if (initialized)
+    return NPERR_NO_ERROR;
+  else if ((browserTable == NULL) || (pluginTable == NULL))
     {
       PLUGIN_ERROR ("Browser or plugin function table is NULL.");
 
@@ -1622,6 +1671,7 @@
   pluginTable->urlnotify = NewNPP_URLNotifyProc (GCJ_URLNotify);
   pluginTable->getvalue = NewNPP_GetValueProc (GCJ_GetValue);
 
+  initialized = true;
   plugin_instance_mutex = g_mutex_new ();
 
   PLUGIN_DEBUG ("NP_Initialize: using " APPLETVIEWER_EXECUTABLE ".");



From MAILER-DAEMON Mon Jun 05 14:38:04 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnJxk-0002xk-A3
	for mharc-commit-classpath@gnu.org; Mon, 05 Jun 2006 14:38:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnJxi-0002wo-LL
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 14:38:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnJxh-0002wc-8W
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 14:38:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnJxh-0002wZ-48
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 14:38:01 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnK4t-0005bn-JC
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 14:45:27 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnJxg-0001GK-00
	for <commit-classpath@gnu.org>; Mon, 05 Jun 2006 14:38:00 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FnJxg-0001GH-4e
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 18:38:00 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnJxg-0001GH-4e@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Mon, 05 Jun 2006 18:38:00 +0000
Subject: [commit-cp] classpath ChangeLog NEWS
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jun 2006 18:38:03 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/05 18:37:59

Modified files:
	.              : ChangeLog NEWS 

Log message:
		* NEWS: Mention VMURLConnection.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7659&r2=1.7660
http://cvs.savannah.gnu.org/viewcvs/classpath/NEWS?cvsroot=classpath&r1=1.146&r2=1.147

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7659
retrieving revision 1.7660
diff -u -b -r1.7659 -r1.7660
--- ChangeLog	5 Jun 2006 18:22:02 -0000	1.7659
+++ ChangeLog	5 Jun 2006 18:37:59 -0000	1.7660
@@ -1,3 +1,7 @@
+2006-06-05  Tom Tromey  <tromey@redhat.com>
+
+	* NEWS: Mention VMURLConnection.
+
 2006-06-05  Lillian Angel  <langel@redhat.com>
 
 	* native/plugin/gcjwebplugin.cc:

Index: NEWS
===================================================================
RCS file: /cvsroot/classpath/classpath/NEWS,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- NEWS	27 May 2006 21:14:05 -0000	1.146
+++ NEWS	5 Jun 2006 18:37:59 -0000	1.147
@@ -21,6 +21,13 @@
   A new configure option --enable-tool-wrappers causes wrapper
   binaries to be built for VMs that support the JNI Invocation API.
 
+Runtime interface changes:
+
+* A new class, VMURLConnection, is used to implement
+  URLConnection.guessContentTypeFromStream.  The reference
+  implementation uses libmagic (and falls back to doing nothing if
+  libmagic is not available).
+
 New in release 0.91 (May 15, 2006)
 
 * Experimental activation (java.rmi.activation) support, including RMI



From MAILER-DAEMON Mon Jun 05 16:36:29 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnLoL-0000lh-AV
	for mharc-commit-classpath@gnu.org; Mon, 05 Jun 2006 16:36:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnLoI-0000js-St
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 16:36:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnLoH-0000ir-7s
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 16:36:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnLoH-0000io-0O
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 16:36:25 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnLvU-0006cr-L5
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 16:43:52 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnLoG-0006km-00
	for <commit-classpath@gnu.org>; Mon, 05 Jun 2006 16:36:24 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FnLoE-0006ka-IB
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 20:36:23 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnLoE-0006ka-IB@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Mon, 05 Jun 2006 20:36:22 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JFrame.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jun 2006 20:36:27 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/05 20:36:22

Modified files:
	.              : ChangeLog 
	javax/swing    : JFrame.java 

Log message:
	2006-06-05  Tania Bento  <tbento@redhat.com>
	
	        * javax/swing/JFrame.java
	        (frameInit): Set background color and fixed layout parameters.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7660&r2=1.7661
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JFrame.java?cvsroot=classpath&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7660
retrieving revision 1.7661
diff -u -b -r1.7660 -r1.7661
--- ChangeLog	5 Jun 2006 18:37:59 -0000	1.7660
+++ ChangeLog	5 Jun 2006 20:36:21 -0000	1.7661
@@ -1,3 +1,8 @@
+2006-06-05  Tania Bento  <tbento@redhat.com>
+
+	* javax/swing/JFrame.java
+	(frameInit): Set background color and fixed layout parameters.
+
 2006-06-05  Tom Tromey  <tromey@redhat.com>
 
 	* NEWS: Mention VMURLConnection.

Index: javax/swing/JFrame.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JFrame.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- javax/swing/JFrame.java	11 May 2006 11:18:42 -0000	1.35
+++ javax/swing/JFrame.java	5 Jun 2006 20:36:22 -0000	1.36
@@ -157,7 +157,8 @@
 
   protected void frameInit()
   {
-    super.setLayout(new BorderLayout(1, 1));
+    super.setLayout(new BorderLayout());
+    setBackground(UIManager.getDefaults().getColor("control"));
     enableEvents(AWTEvent.WINDOW_EVENT_MASK);
     getRootPane(); // will do set/create
 



From MAILER-DAEMON Mon Jun 05 20:07:27 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnP6V-0007fq-Gj
	for mharc-commit-classpath@gnu.org; Mon, 05 Jun 2006 20:07:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnP6T-0007fX-6v
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 20:07:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnP6R-0007fL-NL
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 20:07:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnP6R-0007fH-Ih
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 20:07:23 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnPDh-0005dC-7j
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 20:14:53 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnP6R-0005du-00
	for <commit-classpath@gnu.org>; Mon, 05 Jun 2006 20:07:23 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FnP6Q-0005dp-NB
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 00:07:22 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnP6Q-0005dp-NB@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Tue, 06 Jun 2006 00:07:22 +0000
Subject: [commit-cp] classpath ChangeLog-ssl-nio java/security/Messa... [ssl]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 00:07:25 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl
Changes by:	Casey Marshall <rsdio>	06/06/06 00:07:22

Modified files:
	.              : ChangeLog-ssl-nio 
	java/security  : MessageDigest.java MessageDigestSpi.java 

Log message:
	2006-06-05  C. Scott Marshall  <csm@gnu.org>
	
		* java/security/MessageDigest.java (update): new method.
		* java/security/MessageDigestSpi.java (engineUpdate): new method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/security/MessageDigest.java?cvsroot=classpath&only_with_tag=ssl&r1=1.10.2.5&r2=1.10.2.5.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/java/security/MessageDigestSpi.java?cvsroot=classpath&only_with_tag=ssl&r1=1.4.2.4&r2=1.4.2.4.2.1

Patches:
Index: ChangeLog-ssl-nio
===================================================================
RCS file: /cvsroot/classpath/classpath/Attic/ChangeLog-ssl-nio,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- ChangeLog-ssl-nio	3 Jun 2006 19:52:51 -0000	1.1.2.1
+++ ChangeLog-ssl-nio	6 Jun 2006 00:07:22 -0000	1.1.2.2
@@ -1,3 +1,8 @@
+2006-06-05  C. Scott Marshall  <csm@gnu.org>
+
+	* java/security/MessageDigest.java (update): new method.
+	* java/security/MessageDigestSpi.java (engineUpdate): new method.
+
 2006-06-03  C. Scott Marshall  <csm@gnu.org>
 
 	* gnu/javax/net/ssl/provider/ServerHelloDone.java: made public.

Index: java/security/MessageDigest.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/MessageDigest.java,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.5.2.1
diff -u -b -r1.10.2.5 -r1.10.2.5.2.1
--- java/security/MessageDigest.java	2 Mar 2006 09:33:59 -0000	1.10.2.5
+++ java/security/MessageDigest.java	6 Jun 2006 00:07:22 -0000	1.10.2.5.2.1
@@ -38,6 +38,7 @@
 package java.security;
 
 import gnu.java.security.Engine;
+import java.nio.ByteBuffer;
 
 /**
  * Message digests are secure one-way hash functions that take arbitrary-sized
@@ -224,6 +225,17 @@
   }
 
   /**
+   * Updates the digest with the remaining bytes of a buffer.
+   * 
+   * @param input The input byte buffer.
+   * @since 1.5
+   */
+  public void update (ByteBuffer input)
+  {
+    engineUpdate (input);
+  }
+  
+  /**
    * Computes the final digest of the stored data.
    * 
    * @return a byte array representing the message digest.

Index: java/security/MessageDigestSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/MessageDigestSpi.java,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.4.2.1
diff -u -b -r1.4.2.4 -r1.4.2.4.2.1
--- java/security/MessageDigestSpi.java	2 Aug 2005 20:12:25 -0000	1.4.2.4
+++ java/security/MessageDigestSpi.java	6 Jun 2006 00:07:22 -0000	1.4.2.4.2.1
@@ -37,6 +37,8 @@
 
 package java.security;
 
+import java.nio.ByteBuffer;
+
 /**
    This is the Service Provider Interface (SPI) for MessageDigest
    class in java.security. It provides the back end functionality
@@ -98,6 +100,23 @@
   protected abstract void engineUpdate(byte[]input, int offset, int len);
 
   /**
+   * Updates this digest with the remaining bytes of a byte buffer.
+   * 
+   * @param input The input buffer.
+   * @since 1.5
+   */
+  protected void engineUpdate (ByteBuffer input)
+  {
+    byte[] buf = new byte[1024];
+    while (input.hasRemaining())
+      {
+        int n = Math.min(input.remaining(), buf.length);
+        input.get (buf, 0, n);
+        engineUpdate (buf, 0, n);
+      }
+  }
+  
+  /**
      Computes the final digest of the stored bytes and returns
      them. It performs any necessary padding. The message digest
      should reset sensitive data after performing the digest.



From MAILER-DAEMON Mon Jun 05 20:47:32 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnPjI-0003bP-JA
	for mharc-commit-classpath@gnu.org; Mon, 05 Jun 2006 20:47:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnPjG-0003Za-RV
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 20:47:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnPjG-0003ZD-5f
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 20:47:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnPjG-0003Z0-0S
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 20:47:30 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnPqV-0004Dn-VI
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 20:55:00 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnPjF-0008LL-00
	for <commit-classpath@gnu.org>; Mon, 05 Jun 2006 20:47:29 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FnPjF-0008LI-31
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 00:47:29 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnPjF-0008LI-31@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Tue, 06 Jun 2006 00:47:29 +0000
Subject: [commit-cp] classpath ChangeLog-ssl-nio gnu/javax/net/ssl/p... [ssl]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 00:47:31 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl
Changes by:	Casey Marshall <rsdio>	06/06/06 00:47:29

Modified files:
	.              : ChangeLog-ssl-nio 
	gnu/javax/net/ssl/provider: CipherSuiteList.java 
	                            CompressionMethodList.java 
	                            X500PrincipalList.java 

Log message:
	2006-06-05  Casey Marshall <csm@gnu.org>
	
		* gnu/javax/net/ssl/provider/CipherSuiteList.java: implement
		Iterable<CipherSuite>.
		(iterator): new method.
		* gnu/javax/net/ssl/provider/CompressionMethodList.java: implement
		Iterable<CompressionMethod>.
		(iterator): new method.
		* gnu/javax/net/ssl/provider/X500PrincipalList.java: implement
		Iterable<X500Principal>.
		(iterator): new method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/CipherSuiteList.java?cvsroot=classpath&only_with_tag=ssl&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/CompressionMethodList.java?cvsroot=classpath&only_with_tag=ssl&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/X500PrincipalList.java?cvsroot=classpath&only_with_tag=ssl&r1=1.1.4.1&r2=1.1.4.2

Patches:
Index: ChangeLog-ssl-nio
===================================================================
RCS file: /cvsroot/classpath/classpath/Attic/ChangeLog-ssl-nio,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- ChangeLog-ssl-nio	6 Jun 2006 00:07:22 -0000	1.1.2.2
+++ ChangeLog-ssl-nio	6 Jun 2006 00:47:28 -0000	1.1.2.3
@@ -1,3 +1,15 @@
+2006-06-05  Casey Marshall <csm@gnu.org>
+
+	* gnu/javax/net/ssl/provider/CipherSuiteList.java: implement
+	Iterable<CipherSuite>.
+	(iterator): new method.
+	* gnu/javax/net/ssl/provider/CompressionMethodList.java: implement
+	Iterable<CompressionMethod>.
+	(iterator): new method.
+	* gnu/javax/net/ssl/provider/X500PrincipalList.java: implement
+	Iterable<X500Principal>.
+	(iterator): new method.
+
 2006-06-05  C. Scott Marshall  <csm@gnu.org>
 
 	* java/security/MessageDigest.java (update): new method.

Index: gnu/javax/net/ssl/provider/CipherSuiteList.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/Attic/CipherSuiteList.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -b -r1.1.4.1 -r1.1.4.2
--- gnu/javax/net/ssl/provider/CipherSuiteList.java	3 Jun 2006 07:49:53 -0000	1.1.4.1
+++ gnu/javax/net/ssl/provider/CipherSuiteList.java	6 Jun 2006 00:47:28 -0000	1.1.4.2
@@ -46,7 +46,7 @@
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-public final class CipherSuiteList
+public final class CipherSuiteList implements Iterable<CipherSuite>
 {
   private final ByteBuffer buffer;
   private final ProtocolVersion version;
@@ -191,6 +191,11 @@
     return true;
   }
 
+  public java.util.Iterator<CipherSuite> iterator ()
+  {
+    return new Iterator ();
+  }
+  
   /**
    * An iterator for the elements in this list. The iterator supports
    * only the <code>set</code> method out of the optional methods,

Index: gnu/javax/net/ssl/provider/CompressionMethodList.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/Attic/CompressionMethodList.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -b -r1.1.4.1 -r1.1.4.2
--- gnu/javax/net/ssl/provider/CompressionMethodList.java	3 Jun 2006 07:49:53 -0000	1.1.4.1
+++ gnu/javax/net/ssl/provider/CompressionMethodList.java	6 Jun 2006 00:47:28 -0000	1.1.4.2
@@ -51,7 +51,7 @@
  * A basic list interface to a list of compression methods in an SSL
  * packet.
  */
-public final class CompressionMethodList
+public final class CompressionMethodList implements Iterable<CompressionMethod>
 {
   private final ByteBuffer buffer;
   private int modCount;
@@ -188,6 +188,11 @@
     return true;
   }
 
+  public java.util.Iterator<CompressionMethod> iterator ()
+  {
+    return new Iterator ();
+  }
+  
   /**
    * An iterator for the elements in this list. The iterator supports
    * only the <code>set</code> method out of the optional methods,

Index: gnu/javax/net/ssl/provider/X500PrincipalList.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/Attic/X500PrincipalList.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -b -r1.1.4.1 -r1.1.4.2
--- gnu/javax/net/ssl/provider/X500PrincipalList.java	3 Jun 2006 07:49:53 -0000	1.1.4.1
+++ gnu/javax/net/ssl/provider/X500PrincipalList.java	6 Jun 2006 00:47:28 -0000	1.1.4.2
@@ -49,7 +49,7 @@
 
 import javax.security.auth.x500.X500Principal;
 
-public final class X500PrincipalList
+public final class X500PrincipalList implements Iterable<X500Principal>
 {
   private final ByteBuffer buffer;
   private int modCount;
@@ -184,6 +184,11 @@
     return true;
   }
 
+  public java.util.Iterator<X500Principal> iterator ()
+  {
+    return new Iterator();
+  }
+  
   public class Iterator implements ListIterator<X500Principal>
   {
     private final int modCount;



From MAILER-DAEMON Mon Jun 05 21:01:27 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnPwk-00029P-Mk
	for mharc-commit-classpath@gnu.org; Mon, 05 Jun 2006 21:01:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnPwi-00028d-E5
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 21:01:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnPwg-00028R-PU
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 21:01:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnPwg-00028O-Kp
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 21:01:22 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnQ3w-0006G8-Gc
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 21:08:52 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnPwf-0001Cm-00
	for <commit-classpath@gnu.org>; Mon, 05 Jun 2006 21:01:21 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FnPwf-0001Cg-BQ
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 01:01:21 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnPwf-0001Cg-BQ@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Tue, 06 Jun 2006 01:01:21 +0000
Subject: [commit-cp] classpath ChangeLog-ssl-nio gnu/javax/net/ssl/p... [ssl]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 01:01:24 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl
Changes by:	Casey Marshall <rsdio>	06/06/06 01:01:21

Modified files:
	.              : ChangeLog-ssl-nio 
	gnu/javax/net/ssl/provider: Extension.java 
	jessie-tests   : run-tests.sh 
Added files:
	gnu/javax/net/ssl/provider: ExtensionList.java 
	jessie-tests   : testExtensionsList.java 

Log message:
	2006-06-05  Casey Marshall  <csm@gnu.org>
	
		* gnu/javax/net/ssl/provider/Extension.java: add Javadoc.
		(length): return the length of the extension value.
		(setLength, setType, setValue, setValue): new methods.
		* gnu/javax/net/ssl/provider/ExtensionList.java: new file.
		* jessie-tests/run-tests.sh: add testExtensionList.
		* jessie-tests/testExtensionList.java: new file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/Extension.java?cvsroot=classpath&only_with_tag=ssl&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ExtensionList.java?cvsroot=classpath&only_with_tag=ssl&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/jessie-tests/run-tests.sh?cvsroot=classpath&only_with_tag=ssl&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/jessie-tests/testExtensionsList.java?cvsroot=classpath&only_with_tag=ssl&rev=1.1.2.1

Patches:
Index: ChangeLog-ssl-nio
===================================================================
RCS file: /cvsroot/classpath/classpath/Attic/ChangeLog-ssl-nio,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- ChangeLog-ssl-nio	6 Jun 2006 00:47:28 -0000	1.1.2.3
+++ ChangeLog-ssl-nio	6 Jun 2006 01:01:19 -0000	1.1.2.4
@@ -1,5 +1,14 @@
 2006-06-05  Casey Marshall <csm@gnu.org>
 
+	* gnu/javax/net/ssl/provider/Extension.java: add Javadoc.
+	(length): return the length of the extension value.
+	(setLength, setType, setValue, setValue): new methods.
+	* gnu/javax/net/ssl/provider/ExtensionList.java: new file.
+	* jessie-tests/run-tests.sh: add testExtensionList.
+	* jessie-tests/testExtensionList.java: new file.
+
+2006-06-05  Casey Marshall  <csm@gnu.org>
+
 	* gnu/javax/net/ssl/provider/CipherSuiteList.java: implement
 	Iterable<CipherSuite>.
 	(iterator): new method.
@@ -20,4 +29,3 @@
 	* gnu/javax/net/ssl/provider/ServerHelloDone.java: made public.
 	* jessie-tests/run-tests.sh: add `testServerHelloDone.'
 	* jessie-tests/testServerHelloDone.java: new test.
-

Index: gnu/javax/net/ssl/provider/Extension.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/Extension.java,v
retrieving revision 1.1.4.1.2.1
retrieving revision 1.1.4.1.2.2
diff -u -b -r1.1.4.1.2.1 -r1.1.4.1.2.2
--- gnu/javax/net/ssl/provider/Extension.java	3 Jun 2006 07:49:53 -0000	1.1.4.1.2.1
+++ gnu/javax/net/ssl/provider/Extension.java	6 Jun 2006 01:01:19 -0000	1.1.4.1.2.2
@@ -43,6 +43,17 @@
 
 import java.nio.ByteBuffer;
 
+/**
+ * An SSL hello extension.
+ * 
+ * <pre>
+ * struct {
+ *   ExtensionType extension_type;
+ *   opaque extension_data<0..2^16-1>;
+ * } Extension;</pre>
+ * 
+ * @author csm@gnu.org
+ */
 public final class Extension implements Constructed
 {
 
@@ -64,7 +75,7 @@
 
   public int length ()
   {
-    return (buffer.getShort (2) & 0xFFFF) + 4;
+    return (buffer.getShort (2) & 0xFFFF);
   }
 
   public Type type()
@@ -80,6 +91,30 @@
     return value;
   }
 
+  public void setLength (final int newLength)
+  {
+    if (newLength < 0 || newLength > 65535)
+      throw new IllegalArgumentException ("length is out of bounds");
+    buffer.putShort (2, (short) newLength);
+  }
+  
+  public void setType (final Type type)
+  {
+    buffer.putShort(0, (short) type.getValue());
+  }
+
+  public void setValue (byte[] value)
+  {
+    setValue (value, 0, value.length);
+  }
+  
+  public void setValue (final byte[] value, final int offset, final int length)
+  {
+    if (length != length ())
+      throw new IllegalArgumentException ("length is different than claimed length");
+    ((ByteBuffer) buffer.duplicate().position(4)).put(value, offset, length);
+  }
+  
   public String toString()
   {
     return toString(null);

Index: jessie-tests/run-tests.sh
===================================================================
RCS file: /cvsroot/classpath/classpath/jessie-tests/Attic/run-tests.sh,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -b -r1.1.4.2 -r1.1.4.3
--- jessie-tests/run-tests.sh	3 Jun 2006 19:52:52 -0000	1.1.4.2
+++ jessie-tests/run-tests.sh	6 Jun 2006 01:01:20 -0000	1.1.4.3
@@ -7,7 +7,7 @@
 
 tests="testAlert testCertificate testCertificateRequest \
        testCipherSuiteList testClientHello testCompressionMethodList \
-       testHelloRequest testRecord testServerDHParams \
+       testExtensionList testHelloRequest testRecord testServerDHParams \
        testServerHello testServerHelloDone testServerKeyExchange \
        testServerRSAParams testSignature"
 

Index: gnu/javax/net/ssl/provider/ExtensionList.java
===================================================================
RCS file: gnu/javax/net/ssl/provider/ExtensionList.java
diff -N gnu/javax/net/ssl/provider/ExtensionList.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/javax/net/ssl/provider/ExtensionList.java	6 Jun 2006 01:01:19 -0000	1.1.2.1
@@ -0,0 +1,270 @@
+package gnu.javax.net.ssl.provider;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.ByteBuffer;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+
+/**
+ * A list of extensions, that may appear in either the {@link ClientHello} or
+ * {@link ServerHello}. The form of the extensions list is:
+ * 
+ * <tt>   Extension extensions_list&lt;1..2^16-1&gt;</tt>
+ * 
+ * @author csm
+ */
+public class ExtensionList implements Iterable<Extension>
+{
+  private final ByteBuffer buffer;
+  private int modCount;
+
+  public ExtensionList (ByteBuffer buffer)
+  {
+    this.buffer = buffer;
+    modCount = 0;
+  }
+
+  public Extension get (final int index)
+  {
+    int length = length ();
+    int i;
+    int n = 0;
+    for (i = 2; i < length && n < index; )
+      {
+        int l = buffer.getShort (i+2) & 0xFFFF;
+        i += l + 4;
+        n++;
+      }
+    if (n < index)
+      throw new IndexOutOfBoundsException ("no elemenet at " + index);
+    int el = buffer.getShort (i+2) & 0xFFFF;
+    return new Extension (((ByteBuffer) buffer.duplicate().position(i).limit(i+el+4)).slice());
+  }
+  
+  /**
+   * Returns the number of extensions this list contains.
+   * 
+   * @return The number of extensions.
+   */
+  public int size ()
+  {
+    int length = length ();
+    if (length == 0)
+      return 0;
+    int n = 0;
+    for (int i = 2; i < length; )
+      {
+        int len = buffer.getShort (i+2) & 0xFFFF;
+        i += len + 4;
+        n++;
+      }
+    return n;
+  }
+
+  /**
+   * Returns the length of this extension list, in bytes.
+   * 
+   * @return The length of this extension list, in bytes.
+   */
+  public int length ()
+  {
+    return buffer.getShort (0) & 0xFFFF;
+  }
+  
+  /**
+   * Sets the extension at index <i>i</i> to <i>e</i>. Note that setting an
+   * element at an index <b>may</b> invalidate any other elements that come
+   * after element at index <i>i</i>. In other words, no attempt is made to
+   * move existing elements in this list, and since extensions are variable
+   * length, you can <em>not</em> guarantee that extensions later in the list
+   * will still be valid.
+   * 
+   * <p>Thus, elements of this list <b>must</b> be set in order of increasing
+   * index.
+   * 
+   * @param index The index to set the extension at.
+   * @param e The extension.
+   * @throws java.nio.BufferOverflowException If setting the extension overflows
+   *  the buffer.
+   * @throws IllegalArgumentException If it isn't possible to find the given index
+   *  in the current list (say, if no element index - 1 is set), or if setting
+   *  the extension will overflow the current list length (given by {@link
+   *  #length()}).
+   */
+  public void set (final int index, Extension e)
+  {
+    int length = length();
+    int n = 0;
+    int i;
+    for (i = 2; i < length && n < index; )
+      {
+        int len = buffer.getShort(i+2) & 0xFFFF;
+        i += len + 4;
+        n++;
+      }
+    if (n < index)
+      throw new IllegalArgumentException("nothing set at index " + (index-1)
+                                         + " or insufficient space");
+    if (i + e.length() + 2 > length)
+      throw new IllegalArgumentException("adding this element will exceed the "
+                                         + "list length");
+    buffer.putShort(i, (short) e.type().getValue());
+    buffer.putShort(i+2, (short) e.length());
+    ((ByteBuffer) buffer.duplicate().position(i+4)).put (e.value());
+    modCount++;
+  }
+  
+  /**
+   * Reserve space for an extension at index <i>i</i> in the list. In other
+   * words, this does the job of {@link #set(int, Extension)}, but does not
+   * copy the extension value to the underlying buffer.
+   * 
+   * @param index The index of the extension to reserve space for.
+   * @param t The type of the extension.
+   * @param eLength The number of bytes to reserve for this extension. The total
+   *  number of bytes used by this method is this length, plus four.
+   */
+  public void set (final int index, Extension.Type t, final int eLength)
+  {
+    int length = length ();
+    int n = 0;
+    int i;
+    for (i = 2; i < length && n < index; )
+      {
+        int len = buffer.getShort (i+2) & 0xFFFF;
+        i += len + 4;
+        n++;
+      }
+    if (n < index)
+      throw new IllegalArgumentException ("nothing set at index " + (index-1)
+                                          + " or insufficient space");
+    if (i + eLength + 2 > length)
+      throw new IllegalArgumentException ("adding this element will exceed the "
+                                          + "list length");
+    buffer.putShort(i, (short) t.getValue());
+    buffer.putShort(i+2, (short) eLength);
+    modCount++;
+  }
+  
+  /**
+   * Set the total length of this list, in bytes.
+   * 
+   * @param newLength The new list length.
+   */
+  public void setLength (final int newLength)
+  {
+    if (newLength < 0 || newLength > 65535)
+      throw new IllegalArgumentException ("invalid length");
+    buffer.putShort (0, (short) newLength);
+    modCount++;
+  }
+  
+  public Iterator<Extension> iterator()
+  {
+    return new ExtensionsIterator ();
+  }
+
+  public String toString ()
+  {
+    return toString (null);
+  }
+  
+  public String toString (final String prefix)
+  {
+    StringWriter str = new StringWriter ();
+    PrintWriter out = new PrintWriter (str);
+    if (prefix != null) out.print (prefix);
+    out.println ("ExtensionList {");
+    if (prefix != null) out.print (prefix);
+    out.print ("  length = ");
+    out.print (length ());
+    out.println (";");
+    String subprefix = "  ";
+    if (prefix != null)
+      subprefix = prefix + subprefix;
+    for (Extension e : this)
+      out.println (e.toString(subprefix));
+    if (prefix != null) out.print (prefix);
+    out.println ("};");
+    return str.toString();
+  }
+
+  /**
+   * List iterator interface to an extensions list.
+   * 
+   * @author csm@gnu.org
+   */
+  public final class ExtensionsIterator implements ListIterator<Extension>
+  {
+    private final int modCount;
+    private int index;
+    private final int size;
+    
+    public ExtensionsIterator ()
+    {
+      this.modCount = ExtensionList.this.modCount;
+      index = 0;
+      size = size ();
+    }
+
+    public boolean hasNext()
+    {
+      return index < size;
+    }
+
+    public boolean hasPrevious()
+    {
+      return index > 0;
+    }
+
+    public Extension next() throws NoSuchElementException
+    {
+      if (modCount != ExtensionList.this.modCount)
+        throw new ConcurrentModificationException ();
+      if (!hasNext ())
+        throw new NoSuchElementException ();
+      return get (index++);
+    }
+
+    public Extension previous() throws NoSuchElementException
+    {
+      if (modCount != ExtensionList.this.modCount)
+        throw new ConcurrentModificationException ();
+      if (!hasPrevious ())
+        throw new NoSuchElementException ();
+      return get (--index);
+    }
+
+    public int nextIndex()
+    {
+      if (hasNext ())
+        return index + 1;
+      return index;
+    }
+
+    public int previousIndex()
+    {
+      if (hasPrevious ())
+        return index - 1;
+      return -1;
+    }
+
+    public void add(Extension e)
+    {
+      throw new UnsupportedOperationException ("cannot add items to this iterator");
+    }
+
+    public void remove()
+    {
+      throw new UnsupportedOperationException ("cannot remove items from this iterator");
+    }
+
+    public void set(Extension e)
+    {
+      ExtensionList.this.set (index, e);
+    }
+  }
+}

Index: jessie-tests/testExtensionsList.java
===================================================================
RCS file: jessie-tests/testExtensionsList.java
diff -N jessie-tests/testExtensionsList.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ jessie-tests/testExtensionsList.java	6 Jun 2006 01:01:20 -0000	1.1.2.1
@@ -0,0 +1,64 @@
+import gnu.javax.net.ssl.provider.Extension;
+import gnu.javax.net.ssl.provider.ExtensionList;
+import gnu.javax.net.ssl.provider.Extension.Type;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+
+class testExtensionList
+{
+  public static void main (String[] argv)
+  {
+    try
+      {
+        check ();
+      }
+    catch (Exception x)
+      {
+        System.out.println ("FAIL: caught exception " + x);
+        x.printStackTrace (System.err);
+      }
+  }
+  
+  static void check () throws Exception
+  {
+    ByteBuffer buf = ByteBuffer.allocate(4096);
+    ExtensionList list = new ExtensionList(buf);
+    
+    list.setLength (12);
+    // Max fragment length of 2^9-1
+    list.set (0, Extension.Type.MAX_FRAGMENT_LENGTH, 1); // 2 + 2 + 1
+    list.get (0).setValue (new byte[] { 1 });
+    // Zero-length server name.
+    list.set (1, Extension.Type.SERVER_NAME, 3); // 2 + 2 + 3
+    list.get(1).setValue(new byte[3]);
+    // This is a valid extension list now.
+    
+    if (list.length () == 12)
+      System.out.println ("PASS: length");
+    else
+      System.out.println ("FAIL: length");
+    
+    Extension e = list.get (0);
+    if (e.type() == Extension.Type.MAX_FRAGMENT_LENGTH)
+      System.out.println ("PASS: get(0).type()");
+    else
+      System.out.println ("FAIL: get(0).type()");
+    if (Arrays.equals (e.value(), new byte[] { 1 }))
+      System.out.println ("PASS: get(0).value()");
+    else
+      System.out.println ("FAIL: get(0).value()");
+    
+    e = list.get(1);
+    if (e.type () == Extension.Type.SERVER_NAME)
+      System.out.println ("PASS: get(1).type()");
+    else
+      System.out.println ("FAIL: get(1).type()");
+    if (Arrays.equals(e.value(), new byte[3]))
+      System.out.println ("PASS: get(1).value()");
+    else
+      System.out.println ("FAIL: get(1).value()");
+    
+    System.err.println (list);
+  }
+}
\ No newline at end of file



From MAILER-DAEMON Mon Jun 05 22:22:33 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnRDE-0003ZD-VE
	for mharc-commit-classpath@gnu.org; Mon, 05 Jun 2006 22:22:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnRDE-0003Z8-Fp
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 22:22:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnRDD-0003Yw-Dx
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 22:22:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnRDD-0003Yt-Be
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 22:22:31 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnRKU-0004Bo-7H
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 22:30:02 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnRDB-0000dZ-00
	for <commit-classpath@gnu.org>; Mon, 05 Jun 2006 22:22:29 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FnRDB-0000dW-AC
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 02:22:29 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnRDB-0000dW-AC@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Tue, 06 Jun 2006 02:22:29 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Compo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 02:22:32 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/06 02:22:29

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: ComponentGraphics.java 
	                       GtkVolatileImage.java 
	                       VolatileImageGraphics.java 
	include        : gnu_java_awt_peer_gtk_ComponentGraphics.h 
	                 gnu_java_awt_peer_gtk_GtkVolatileImage.h 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_ComponentGraphics.c 
	                     gnu_java_awt_peer_gtk_GtkVolatileImage.c 

Log message:
	2006-06-05  Sven de Marothy  <sven@physto.se>
	
		* include/gnu_java_awt_peer_gtk_ComponentGraphics.h
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
		* gnu/java/awt/peer/gtk/ComponentGraphics.java
		(initFromVolatile): New method.
		* gnu/java/awt/peer/gtk/GtkVolatileImage.java
		* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
		Reimplement.
		* include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
		(copyArea, drawVolatileImage): New methods.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7661&r2=1.7662
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java?cvsroot=classpath&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c?cvsroot=classpath&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c?cvsroot=classpath&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7661
retrieving revision 1.7662
diff -u -b -r1.7661 -r1.7662
--- ChangeLog	5 Jun 2006 20:36:21 -0000	1.7661
+++ ChangeLog	6 Jun 2006 02:22:27 -0000	1.7662
@@ -1,3 +1,16 @@
+2006-06-05  Sven de Marothy  <sven@physto.se>
+
+	* include/gnu_java_awt_peer_gtk_ComponentGraphics.h
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
+	* gnu/java/awt/peer/gtk/ComponentGraphics.java
+	(initFromVolatile): New method.
+	* gnu/java/awt/peer/gtk/GtkVolatileImage.java
+	* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
+	Reimplement.
+	* include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
+	(copyArea, drawVolatileImage): New methods.
+	
 2006-06-05  Tania Bento  <tbento@redhat.com>
 
 	* javax/swing/JFrame.java

Index: gnu/java/awt/peer/gtk/ComponentGraphics.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnu/java/awt/peer/gtk/ComponentGraphics.java	5 Jun 2006 03:39:14 -0000	1.9
+++ gnu/java/awt/peer/gtk/ComponentGraphics.java	6 Jun 2006 02:22:28 -0000	1.10
@@ -46,6 +46,7 @@
 import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.Shape;
+import java.awt.Point;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
 import java.awt.geom.AffineTransform;
@@ -64,7 +65,11 @@
 public class ComponentGraphics extends CairoGraphics2D
 {
   private GtkComponentPeer component;
-  private long cairo_t;
+  protected long cairo_t;
+
+  ComponentGraphics()
+  {
+  }
 
   private ComponentGraphics(GtkComponentPeer component)
   {
@@ -94,6 +99,11 @@
   private native long initState(GtkComponentPeer component);
 
   /**
+   * Creates a cairo_t for a volatile image
+   */
+  protected native long initFromVolatile( long pixmapPtr, int width, int height);
+
+  /**
    * Grab lock
    */
   private native void start_gdk_drawing();
@@ -194,8 +204,7 @@
   {
     if( img instanceof GtkVolatileImage )
       {
-	((GtkVolatileImage)img).validate( null );
-	drawVolatile( component, img, x, y-20 ,
+	drawVolatile( component, img, x, y - 20,
 		      ((GtkVolatileImage)img).width, 
 		      ((GtkVolatileImage)img).height );
 	return true;
@@ -208,8 +217,7 @@
   {
     if( img instanceof GtkVolatileImage )
       {
-	((GtkVolatileImage)img).validate( null );
-	drawVolatile( component, img, x, y-20, 
+	drawVolatile( component, img, x, y - 20, 
 		      width, height );
 	return true;
       }      

Index: gnu/java/awt/peer/gtk/GtkVolatileImage.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/java/awt/peer/gtk/GtkVolatileImage.java	4 Jun 2006 19:44:39 -0000	1.5
+++ gnu/java/awt/peer/gtk/GtkVolatileImage.java	6 Jun 2006 02:22:28 -0000	1.6
@@ -53,14 +53,7 @@
   /**
    * Don't touch, accessed from native code.
    */
-  private long nativePointer;
-
-  /**
-   * Offscreen image we draw to.
-   */
-  CairoSurface offScreen;
-
-  private boolean needsUpdate = false;
+  long nativePointer;
 
   native long init(GtkComponentPeer component, int width, int height);
 
@@ -68,7 +61,9 @@
 
   native int[] getPixels();
   
-  native void update(GtkImage image);
+  native void copyArea( int x, int y, int w, int h, int dx, int dy );
+
+  native void drawVolatile( long ptr, int x, int y, int w, int h );
 
   public GtkVolatileImage(GtkComponentPeer component, 
 			  int width, int height, ImageCapabilities caps)
@@ -77,7 +72,6 @@
     this.height = height;
     this.caps = caps;
     nativePointer = init( component, width, height );
-    offScreen = new CairoSurface( width, height );
   }
 
   public GtkVolatileImage(int width, int height, ImageCapabilities caps)
@@ -100,11 +94,6 @@
     destroy();
   }
 
-  void invalidate()
-  {
-    needsUpdate = true;
-  }
-
   public BufferedImage getSnapshot()
   {
     CairoSurface cs = new CairoSurface( width, height );
@@ -119,24 +108,17 @@
 
   public Graphics2D createGraphics()
   {
-    invalidate();
-    return offScreen.getGraphics();
+    return new VolatileImageGraphics( this );
   }
 
   public int validate(GraphicsConfiguration gc)
   {
-    if( needsUpdate )
-      {
-	update( offScreen.getGtkImage() );
-	needsUpdate = false;
-	return VolatileImage.IMAGE_RESTORED;
-      }
     return VolatileImage.IMAGE_OK;
   }
 
   public boolean contentsLost()
   {
-    return needsUpdate;
+    return false;
   }
 
   public ImageCapabilities getCapabilities()

Index: gnu/java/awt/peer/gtk/VolatileImageGraphics.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/java/awt/peer/gtk/VolatileImageGraphics.java	3 Jun 2006 22:41:41 -0000	1.1
+++ gnu/java/awt/peer/gtk/VolatileImageGraphics.java	6 Jun 2006 02:22:28 -0000	1.2
@@ -58,72 +58,65 @@
 import java.awt.image.ImageObserver;
 import java.util.WeakHashMap;
 
-public class VolatileImageGraphics extends CairoSurfaceGraphics
+public class VolatileImageGraphics extends ComponentGraphics
 {
   private GtkVolatileImage owner;
 
-  public VolatileImageGraphics(GtkVolatileImage owner)
+  public VolatileImageGraphics(GtkVolatileImage img)
   {
-    super( owner.offScreen );
-    this.owner = owner;
+    this.owner = img;
+    cairo_t = initFromVolatile( owner.nativePointer, img.width, img.height );
+    setup( cairo_t );
+    setClip( new Rectangle( 0, 0, img.width, img.height) );
   }
   
-  VolatileImageGraphics(VolatileImageGraphics copyFrom)
+  private VolatileImageGraphics(VolatileImageGraphics copy)
   {
-    super( copyFrom.owner.offScreen );
-    owner = copyFrom.owner;
-  }
-
-  /**
-   * Abstract methods.
-   */  
-  public Graphics create()
-  {
-    return new VolatileImageGraphics( this );
+    this.owner = copy.owner;
+    initFromVolatile( owner.nativePointer, owner.width, owner.height );
+    setClip( new Rectangle( 0, 0, owner.width, owner.height) );
+    copy( copy, cairo_t );
   }
   
   public void copyAreaImpl(int x, int y, int width, int height, int dx, int dy)
   {
-    surface.copyAreaNative(x, y, width, height, dx, dy, surface.width);
-    owner.invalidate();
+    owner.copyArea(x, y, width, height, dx, dy);
   }
 
-  /**
-   * Overloaded methods that do actual drawing need to enter the gdk threads 
-   * and also do certain things before and after.
-   */
-  public void draw(Shape s)
+  public GraphicsConfiguration getDeviceConfiguration()
   {
-    super.draw(s);
-    Rectangle r = s.getBounds();
-    owner.invalidate();
+    return null;
   }
 
-  public void fill(Shape s)
+  public Graphics create()
   {
-    super.fill(s);
-    Rectangle r = s.getBounds();
-    owner.invalidate();
+    return new VolatileImageGraphics( this );
   }
 
-  public void drawRenderedImage(RenderedImage image, AffineTransform xform)
-  {
-    super.drawRenderedImage(image, xform);
-    owner.invalidate();
-  }
 
-  protected boolean drawImage(Image img, AffineTransform xform,
-			      Color bgcolor, ImageObserver obs)
+  public boolean drawImage(Image img, int x, int y, ImageObserver observer)
+  {
+    if( img instanceof GtkVolatileImage )
   {
-    boolean rv = super.drawImage(img, xform, bgcolor, obs);
-    owner.invalidate();
-    return rv;
+	owner.drawVolatile( ((GtkVolatileImage)img).nativePointer, 
+			    x, y,
+			    ((GtkVolatileImage)img).width, 
+			    ((GtkVolatileImage)img).height );
+	return true;
+      }      
+    return super.drawImage( img, x, y, observer );
   }
 
-  public void drawGlyphVector(GlyphVector gv, float x, float y)
+  public boolean drawImage(Image img, int x, int y, int width, int height,
+                           ImageObserver observer)
+  {
+    if( img instanceof GtkVolatileImage )
   {
-    super.drawGlyphVector(gv, x, y);
-    owner.invalidate();
+	owner.drawVolatile( ((GtkVolatileImage)img).nativePointer, 
+			    x, y, width, height );
+	return true;
+      }      
+    return super.drawImage( img, x, y, width, height, observer );
   }
 }
 

Index: include/gnu_java_awt_peer_gtk_ComponentGraphics.h
===================================================================
RCS file: /sources/classpath/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- include/gnu_java_awt_peer_gtk_ComponentGraphics.h	3 Jun 2006 22:41:41 -0000	1.3
+++ include/gnu_java_awt_peer_gtk_ComponentGraphics.h	6 Jun 2006 02:22:28 -0000	1.4
@@ -11,6 +11,7 @@
 #endif
 
 JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState (JNIEnv *env, jobject, jobject);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile(JNIEnv *env, jobject, jlong, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing (JNIEnv *env, jobject);
 JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender (JNIEnv *env, jclass);

Index: include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
===================================================================
RCS file: /sources/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- include/gnu_java_awt_peer_gtk_GtkVolatileImage.h	3 Jun 2006 22:41:41 -0000	1.1
+++ include/gnu_java_awt_peer_gtk_GtkVolatileImage.h	6 Jun 2006 02:22:28 -0000	1.2
@@ -13,7 +13,8 @@
 JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, jobject, jobject, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy (JNIEnv *env, jobject);
 JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_getPixels (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_update (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_copyArea (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_drawVolatile (JNIEnv *env, jobject, jlong, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	4 Jun 2006 19:44:39 -0000	1.12
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	6 Jun 2006 02:22:28 -0000	1.13
@@ -163,6 +163,43 @@
   return PTR_TO_JLONG(cr);
 }
 
+JNIEXPORT jlong JNICALL 
+Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile
+  (JNIEnv *env  __attribute__ ((unused)), jobject obj __attribute__ ((unused)),
+   jlong ptr, jint width, jint height)
+{
+  Drawable draw;
+  Display * dpy;
+  Visual * vis;
+  GdkDrawable *drawable;
+  cairo_surface_t *surface;
+  cairo_t *cr;
+
+  gdk_threads_enter();
+
+  drawable = JLONG_TO_PTR(GdkDrawable, ptr);
+  g_assert (drawable != NULL);
+
+  draw = gdk_x11_drawable_get_xid(drawable);
+  g_assert (draw != (XID) 0);
+  
+  dpy = gdk_x11_drawable_get_xdisplay(drawable);
+  g_assert (dpy != NULL);
+  
+  vis = gdk_x11_visual_get_xvisual(gdk_drawable_get_visual(drawable));
+  g_assert (vis != NULL);
+  
+  surface = cairo_xlib_surface_create (dpy, draw, vis, width, height);
+  g_assert (surface != NULL);
+
+  cr = cairo_create (surface);
+  g_assert(cr != NULL);
+
+  gdk_threads_leave();
+
+  return PTR_TO_JLONG(cr);
+}
+
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing
   (JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused)))
@@ -220,7 +257,6 @@
   GdkGC *gc;
 
   gdk_threads_enter();
-
   ptr = NSA_GET_PTR (env, peer);
   g_assert (ptr != NULL);
 
@@ -229,14 +265,16 @@
 
   pixmap = cp_gtk_get_pixmap( env, img );
  
-  gc = gdk_gc_new(GDK_DRAWABLE(widget->window));
-  gdk_draw_drawable(GDK_DRAWABLE(widget->window),
+  gc = gdk_gc_new(widget->window);
+  gdk_draw_drawable(widget->window,
 		    gc,
 		    pixmap,
 		    0, 0,
 		    x, y,
 		    w, h);
 
+  g_object_unref( gc );
+
   schedule_flush ();
 
   gdk_threads_leave();

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c	4 Jun 2006 17:52:05 -0000	1.2
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c	6 Jun 2006 02:22:29 -0000	1.3
@@ -146,28 +146,54 @@
 }
 
 /**
- * Update the pixels.
+ * Copy area
  */
 JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkVolatileImage_update
-(JNIEnv *env, jobject obj, jobject gtkimage)
+Java_gnu_java_awt_peer_gtk_GtkVolatileImage_copyArea
+(JNIEnv *env, jobject obj, jint x, jint y, jint w, jint h, jint dx, jint dy)
 {
-  GdkPixmap *pixmap = getNativeObject(env, obj);
   GdkPixbuf *pixbuf;
+  GdkPixmap* pixmap = getNativeObject(env, obj);
 
-  gdk_threads_enter();
-  g_assert( pixmap != NULL );
+  g_assert (pixmap != NULL);
 
-  pixbuf = cp_gtk_image_get_pixbuf (env, gtkimage);
-  g_assert( pixbuf != NULL );
+  gdk_threads_enter();
 
+  pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE, 8, w, h );
+  gdk_pixbuf_get_from_drawable( pixbuf, pixmap, NULL, x, y, 0, 0, w, h );
   gdk_draw_pixbuf (pixmap, NULL, pixbuf,
-		   0, 0, 0, 0,  /* src and dest x, y */
-		   -1, -1, /* full width, height */
+		   0, 0, x + dx, y + dy, 
+		   w, h, 
 		   GDK_RGB_DITHER_NORMAL, 0, 0);
   gdk_threads_leave();
 }
 
+JNIEXPORT void JNICALL 
+Java_gnu_java_awt_peer_gtk_GtkVolatileImage_drawVolatile
+(JNIEnv *env, jobject obj, jlong ptr, jint x, jint y, jint w, jint h)
+{
+  GdkPixmap *dst, *src;
+  GdkGC *gc;
+
+  src = JLONG_TO_PTR(GdkPixmap, ptr);
+  dst = getNativeObject(env, obj);
+  g_assert (src != NULL);
+  g_assert (dst != NULL);
+
+  gdk_threads_enter();
+ 
+  gc = gdk_gc_new( dst );
+  gdk_draw_drawable(dst,
+		    gc,
+		    src,
+		    0, 0,
+		    x, y,
+		    w, h);
+  g_object_unref( gc );
+
+  gdk_threads_leave();
+}
+
 GdkPixmap *cp_gtk_get_pixmap( JNIEnv *env, jobject obj)
 {
   return (GdkPixmap *)getNativeObject(env, obj);



From MAILER-DAEMON Mon Jun 05 23:33:38 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnSK2-0006R0-HH
	for mharc-commit-classpath@gnu.org; Mon, 05 Jun 2006 23:33:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnSK1-0006Qv-3h
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 23:33:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnSK0-0006Qh-G7
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 23:33:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnSK0-0006Qe-BT
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 23:33:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnSRH-0000Ef-VR
	for commit-classpath@gnu.org; Mon, 05 Jun 2006 23:41:08 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnSJy-0006Qn-00
	for <commit-classpath@gnu.org>; Mon, 05 Jun 2006 23:33:34 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FnSJx-0006Qe-2A
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 03:33:33 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnSJx-0006Qe-2A@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Tue, 06 Jun 2006 03:33:33 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JTable.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 03:33:37 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/06 03:33:32

Modified files:
	.              : ChangeLog 
	javax/swing    : JTable.java 

Log message:
	2006-06-06  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JTable.java
		(AccessibleJTableHeaderCell.header): New field,
		(AccessibleJTableHeaderCell.columnIndex): Likewise,
		(AccessibleJTableHeaderCell.AccessibleJTableHeaderCell()): Initialise,
		(AccessibleJTableHeaderCell.getColumnHeaderRenderer): New method,
		(AccessibleJTableHeaderCell.getAccessibleContext): Implemented,
		(AccessibleJTableHeaderCell.getAccessibleRole): Implemented,
		(AccessibleJTable.getAccessibleChild(int)): Overridden,
		(AccessibleJTable.getAccessibleAt): Reimplemented.
	----------------------------------------------------------------------

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7662&r2=1.7663
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JTable.java?cvsroot=classpath&r1=1.114&r2=1.115

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7662
retrieving revision 1.7663
diff -u -b -r1.7662 -r1.7663
--- ChangeLog	6 Jun 2006 02:22:27 -0000	1.7662
+++ ChangeLog	6 Jun 2006 03:33:31 -0000	1.7663
@@ -1,3 +1,15 @@
+2006-06-06  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/JTable.java
+	(AccessibleJTableHeaderCell.header): New field,
+	(AccessibleJTableHeaderCell.columnIndex): Likewise,
+	(AccessibleJTableHeaderCell.AccessibleJTableHeaderCell()): Initialise,
+	(AccessibleJTableHeaderCell.getColumnHeaderRenderer): New method,
+	(AccessibleJTableHeaderCell.getAccessibleContext): Implemented,
+	(AccessibleJTableHeaderCell.getAccessibleRole): Implemented,
+	(AccessibleJTable.getAccessibleChild(int)): Overridden,
+	(AccessibleJTable.getAccessibleAt): Reimplemented.
+
 2006-06-05  Sven de Marothy  <sven@physto.se>
 
 	* include/gnu_java_awt_peer_gtk_ComponentGraphics.h

Index: javax/swing/JTable.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/JTable.java,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- javax/swing/JTable.java	2 Jun 2006 13:32:30 -0000	1.114
+++ javax/swing/JTable.java	6 Jun 2006 03:33:32 -0000	1.115
@@ -829,15 +829,52 @@
       implements Accessible, AccessibleComponent
     {
 
+      JTableHeader header;
+      
+      int columnIndex;
+      
+      /**
+       * 
+       * @param h  the table header.
+       * @param comp
+       * @param r
+       * @param c  the column index.
+       */
       private AccessibleJTableHeaderCell(JTableHeader h, Component comp, int r,
                                          int c)
       {
+        header = h;
+        columnIndex = c;
+      }
         
+      /**
+       * Returns the header renderer.
+       * 
+       * @return The header renderer.
+       */
+      Component getColumnHeaderRenderer()
+      {
+        TableColumn tc = header.getColumnModel().getColumn(columnIndex);
+        TableCellRenderer r = tc.getHeaderRenderer();
+        if (r == null)
+          r = header.getDefaultRenderer();
+        return r.getTableCellRendererComponent(header.getTable(), 
+            tc.getHeaderValue(), false, false, -1, columnIndex);
       }
 
+      /**
+       * Returns the accessible role for the table header cell.
+       * 
+       * @return The accessible role.
+       */
       public AccessibleRole getAccessibleRole()
       {
-        // TODO Auto-generated method stub
+        Component renderer = getColumnHeaderRenderer();
+        if (renderer instanceof Accessible)
+          {
+            Accessible ac = (Accessible) renderer;
+            return ac.getAccessibleContext().getAccessibleRole();
+          }
         return null;
       }
 
@@ -871,10 +908,14 @@
         return null;
       }
 
+      /**
+       * Returns the accessible context.
+       * 
+       * @return <code>this</code>.
+       */
       public AccessibleContext getAccessibleContext()
       {
-        // TODO Auto-generated method stub
-        return null;
+        return this;
       }
 
       public Color getBackground()
@@ -1585,6 +1626,20 @@
     }
 
     /**
+     * Returns the accessible child at the given index.
+     *
+     * @param index  the child index.
+     * 
+     * @return The accessible child.
+     */
+    public Accessible getAccessibleChild(int index)
+    {
+      int r = getAccessibleRow(index);
+      int c = getAccessibleColumn(index);
+      return getAccessibleAt(r, c);  
+    }
+    
+    /**
      * Returns the accessible child (table cell) at the specified row and
      * column.
      *
@@ -1596,7 +1651,12 @@
      */
     public Accessible getAccessibleAt(int r, int c)
     {
-      return getAccessibleChild(r * getAccessibleColumnCount() + c);
+      TableCellRenderer cellRenderer = getCellRenderer(r, c);
+      Component renderer = cellRenderer.getTableCellRendererComponent(
+          JTable.this, getValueAt(r, c), isCellSelected(r, c), false, r, c);
+      if (renderer instanceof Accessible)
+        return (Accessible) renderer;
+      return null;
     }
 
     /**



From MAILER-DAEMON Tue Jun 06 03:53:49 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnWNp-00063x-5m
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 03:53:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnWNm-00062q-AX
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 03:53:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnWNk-0005zf-Md
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 03:53:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnWNk-0005zJ-GI
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 03:53:44 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnWV4-0002UY-Du
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 04:01:18 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnWNi-0007tN-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 03:53:42 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1FnWNi-0007tK-5T
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 07:53:42 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnWNi-0007tK-5T@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Tue, 06 Jun 2006 07:53:42 +0000
Subject: [commit-cp] classpath/java/awt/image BufferedImage.java Cha...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 07:53:46 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/06 07:53:41

Modified files:
	java/awt/image : BufferedImage.java 
	.              : ChangeLog 

Log message:
	2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
	
	        * java/awt/BufferedImage.java: Added fourth 8 to bits4 field.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/image/BufferedImage.java?cvsroot=classpath&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7663&r2=1.7664

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7663
retrieving revision 1.7664
diff -u -b -r1.7663 -r1.7664
--- ChangeLog	6 Jun 2006 03:33:31 -0000	1.7663
+++ ChangeLog	6 Jun 2006 07:53:41 -0000	1.7664
@@ -1,3 +1,7 @@
+2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
+
+	* java/awt/BufferedImage.java: Added fourth 8 to bits4 field.
+
 2006-06-06  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/JTable.java
@@ -922,6 +926,11 @@
 
 2006-05-30  Robert Schuster  <robertschuster@fsfe.org>
 
+	* javax/swing/table/DefaultTableMode.java: Initialize dataVector
+	field early.
+
+2006-05-30  Robert Schuster  <robertschuster@fsfe.org>
+
 	* java/awt/Container.java:
 	(removeAll): Reimplemented, added note.
 



From MAILER-DAEMON Tue Jun 06 05:20:05 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnXjJ-00061V-0h
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 05:20:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnXjF-0005vB-TX
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 05:20:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnXjF-0005tz-9C
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 05:20:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnXjF-0005td-0q
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 05:20:01 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnXqa-0001iO-3P
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 05:27:36 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnXjD-0001hW-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 05:19:59 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FnXjC-0001hT-Hb
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 09:19:59 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnXjC-0001hT-Hb@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Tue, 06 Jun 2006 09:19:58 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JComponent.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 09:20:02 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/06 09:19:58

Modified files:
	.              : ChangeLog 
	javax/swing    : JComponent.java 

Log message:
	2006-06-06  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JComponent.java
		(getInputMap(int)): Throw IllegalArgumentException for unknown 
		condition argument, and added API docs,
		(getInputMap()): Added API docs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7664&r2=1.7665
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.122&r2=1.123

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7664
retrieving revision 1.7665
diff -u -b -r1.7664 -r1.7665
--- ChangeLog	6 Jun 2006 07:53:41 -0000	1.7664
+++ ChangeLog	6 Jun 2006 09:19:57 -0000	1.7665
@@ -1,3 +1,10 @@
+2006-06-06  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/JComponent.java
+	(getInputMap(int)): Throw IllegalArgumentException for unknown 
+	condition argument, and added API docs,
+	(getInputMap()): Added API docs.
+
 2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
 
 	* java/awt/BufferedImage.java: Added fourth 8 to bits4 field.

Index: javax/swing/JComponent.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/JComponent.java,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- javax/swing/JComponent.java	19 May 2006 11:35:43 -0000	1.122
+++ javax/swing/JComponent.java	6 Jun 2006 09:19:58 -0000	1.123
@@ -2361,6 +2361,19 @@
       }
   }
 
+  /**
+   * Returns the input map associated with this component for the given
+   * state/condition.
+   * 
+   * @param condition  the state (one of {@link #WHEN_FOCUSED}, 
+   *     {@link #WHEN_ANCESTOR_OF_FOCUSED_COMPONENT} and 
+   *     {@link #WHEN_IN_FOCUSED_WINDOW}).
+   * 
+   * @return The input map.
+   * @throws IllegalArgumentException if <code>condition</code> is not one of 
+   *             the specified values.
+   * @since 1.3
+   */
   public final InputMap getInputMap(int condition)
   {
     enableEvents(AWTEvent.KEY_EVENT_MASK);
@@ -2383,10 +2396,20 @@
 
       case UNDEFINED_CONDITION:
       default:
-        return null;
+        throw new IllegalArgumentException("Invalid 'condition' argument: " 
+                                           + condition);
       }
   }
 
+  /**
+   * Returns the input map associated with this component for the 
+   * {@link #WHEN_FOCUSED} state.
+   * 
+   * @return The input map.
+   * 
+   * @since 1.3
+   * @see #getInputMap(int)
+   */
   public final InputMap getInputMap()
   {
     return getInputMap(WHEN_FOCUSED);



From MAILER-DAEMON Tue Jun 06 05:39:15 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnY1r-0006pr-G1
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 05:39:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnY1q-0006pl-CK
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 05:39:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnY1n-0006pY-Rf
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 05:39:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnY1n-0006pV-Lu
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 05:39:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnY98-0003Ob-TM
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 05:46:46 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnY1n-0002jq-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 05:39:11 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FnY1m-0002ji-HL
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 09:39:10 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnY1m-0002ji-HL@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Tue, 06 Jun 2006 09:39:10 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/basic BasicTableUI.j...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 09:39:14 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/06 09:39:09

Modified files:
	javax/swing/plaf/basic: BasicTableUI.java 
	.              : ChangeLog 

Log message:
	2006-06-06  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/plaf/basic/BasicTableUI.java
		(getMaximumSize): Don't return null. Fixed calculation of
		table height.
		(getMinimumSize): Don't return null. Fixed calculation of
		table height.
		(getPreferredSize): Fixed calculation of with and height. Added
		API docs.
		(getHeight): New helper method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTableUI.java?cvsroot=classpath&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7665&r2=1.7666

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7665
retrieving revision 1.7666
diff -u -b -r1.7665 -r1.7666
--- ChangeLog	6 Jun 2006 09:19:57 -0000	1.7665
+++ ChangeLog	6 Jun 2006 09:39:08 -0000	1.7666
@@ -1,3 +1,14 @@
+2006-06-06  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/plaf/basic/BasicTableUI.java
+	(getMaximumSize): Don't return null. Fixed calculation of
+	table height.
+	(getMinimumSize): Don't return null. Fixed calculation of
+	table height.
+	(getPreferredSize): Fixed calculation of with and height. Added
+	API docs.
+	(getHeight): New helper method.
+
 2006-06-06  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/JComponent.java



From MAILER-DAEMON Tue Jun 06 06:04:23 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnYQB-0001Ac-MA
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 06:04:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnYQ9-00019g-El
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:04:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnYQ6-00018o-SV
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:04:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnYQ6-00018e-Fl
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:04:18 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnYXR-0005VH-An
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:11:53 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnYQ5-0003kL-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 06:04:17 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1FnYQ4-0003kI-1s
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 10:04:17 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnYQ4-0003kI-1s@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Tue, 06 Jun 2006 10:04:16 +0000
Subject: [commit-cp] classpath includegnu_java_awt_peer_gtk_GdkGraph...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 10:04:21 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/06 10:04:15

Modified files:
	include        : gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h 
	                 Makefile.am 
	.              : configure.ac ChangeLog 
	gnu/java/awt/peer/gtk: GdkGraphicsConfiguration.java 
	                       GdkGraphicsEnvironment.java 
	                       GdkScreenGraphicsDevice.java 
	native/jni/gtk-peer: Makefile.am 
	                     gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c 
Added files:
	include        : gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h 
	native/jni/gtk-peer: gdkdisplay.h 
	                     gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c 

Log message:
	2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
	
	        * include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h: Regenerated.
	        * include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h: New file.
	        * include/Makefile.am: Added
	        gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.
	        * gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java:
	        (GdkGraphicsConfiguration): Rewritten.
	        (getColorModel): Rewritten.
	        (getColorModel(int)): Rewritten.
	        (getBounds): Rewritten.
	        (createCompatibleVolatileImage): Implemented.
	        * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java: Added static
	        initializer.
	        (getDefaultScreenDevice): Rewritten.
	        (nativeGetDefaultScreenDevice): New method.
	        (getScreenDevices): Rewritten.
	        (nativeGetScreenDevices): New method.
	        (nativeInitState): New method.
	        * gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java: Entirely
	        rewritten.
	        (X11DisplayMode): New inner class.
	        * native/jni/gtk-peer/Makefile.am: Added gdkdisplay.h and
	        gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
	        * native/jni/gtk-peer/gdkdisplay.h: New file.
	        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c:
	        (Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_initStaticState):
	        New function.
	        (Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeInitState):
	        New function.
	        (Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment
	        _nativeGetScreenDevices):
	        New function.
	        (Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment
	        _nativeGetDefaultScreenDevice):
	        New function.
	        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c:
	        New file.
	        * configure.ac: Added check for Xrandr library.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/include/Makefile.am?cvsroot=classpath&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&r1=1.156&r2=1.157
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7666&r2=1.7667
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java?cvsroot=classpath&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/Makefile.am?cvsroot=classpath&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gdkdisplay.h?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c?cvsroot=classpath&rev=1.1

Patches:
Index: include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h	30 Apr 2006 10:37:36 -0000	1.3
+++ include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h	6 Jun 2006 10:04:14 -0000	1.4
@@ -10,6 +10,10 @@
 {
 #endif
 
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_initStaticState (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeInitState (JNIEnv *env, jobject);
+JNIEXPORT jobjectArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeGetScreenDevices (JNIEnv *env, jobject);
+JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeGetDefaultScreenDevice (JNIEnv *env, jobject);
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeGetNumFontFamilies (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeGetFontFamilies (JNIEnv *env, jobject, jobjectArray);
 

Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- include/Makefile.am	3 Jun 2006 22:41:41 -0000	1.62
+++ include/Makefile.am	6 Jun 2006 10:04:15 -0000	1.63
@@ -45,6 +45,7 @@
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkRobotPeer.h \
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkTextLayout.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h \

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- configure.ac	2 Jun 2006 20:47:05 -0000	1.156
+++ configure.ac	6 Jun 2006 10:04:15 -0000	1.157
@@ -415,6 +415,13 @@
 		 [true],
 		 [${X_LIBS}])
 
+    dnl Check if we can link against the XRandR library and set
+    dnl HAVE_XRANDR accordingly.
+    AC_CHECK_LIB([Xrandr], [XRRQueryExtension],
+                 [AC_DEFINE(HAVE_XRANDR, 1, [Define to 1 if you have libXrandr.])X_EXTRA_LIBS="$X_EXTRA_LIBS -lXrandr"]],
+                 [true],
+                 [$X_LIBS}])
+
     AC_SUBST(GTK_CFLAGS)
     AC_SUBST(GTK_LIBS)
     AC_SUBST(FREETYPE2_LIBS)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7666
retrieving revision 1.7667
diff -u -b -r1.7666 -r1.7667
--- ChangeLog	6 Jun 2006 09:39:08 -0000	1.7666
+++ ChangeLog	6 Jun 2006 10:04:15 -0000	1.7667
@@ -1,3 +1,43 @@
+2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
+
+	* include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h: Regenerated.
+	* include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h: New file.
+	* include/Makefile.am: Added
+	gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.
+	* gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java:
+	(GdkGraphicsConfiguration): Rewritten.
+	(getColorModel): Rewritten.
+	(getColorModel(int)): Rewritten.
+	(getBounds): Rewritten.
+	(createCompatibleVolatileImage): Implemented.
+	* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java: Added static
+	initializer.
+	(getDefaultScreenDevice): Rewritten.
+	(nativeGetDefaultScreenDevice): New method.
+	(getScreenDevices): Rewritten.
+	(nativeGetScreenDevices): New method.
+	(nativeInitState): New method.
+	* gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java: Entirely
+	rewritten.
+	(X11DisplayMode): New inner class.
+	* native/jni/gtk-peer/Makefile.am: Added gdkdisplay.h and
+	gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
+	* native/jni/gtk-peer/gdkdisplay.h: New file.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c:
+	(Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_initStaticState):
+	New function.
+	(Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeInitState):
+	New function.
+	(Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment
+	_nativeGetScreenDevices):
+	New function.
+	(Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment
+	_nativeGetDefaultScreenDevice):
+	New function.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c:
+	New file.
+	* configure.ac: Added check for Xrandr library.
+
 2006-06-06  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/plaf/basic/BasicTableUI.java

Index: gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java	19 Aug 2005 01:29:26 -0000	1.5
+++ gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java	6 Jun 2006 10:04:15 -0000	1.6
@@ -1,5 +1,5 @@
 /* GdkGraphicsConfiguration.java -- describes characteristics of graphics
-   Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -42,26 +42,33 @@
 import java.awt.GraphicsDevice;
 import java.awt.ImageCapabilities;
 import java.awt.Rectangle;
-import java.awt.Toolkit;
+import java.awt.Transparency;
 
 import java.awt.geom.AffineTransform;
 
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
+import java.awt.image.DirectColorModel;
 import java.awt.image.VolatileImage;
 
 public class GdkGraphicsConfiguration 
   extends GraphicsConfiguration
 {
   GdkScreenGraphicsDevice gdkScreenGraphicsDevice;
-  ColorModel cm;
-  Rectangle bounds;
+  
+  ColorModel opaqueColorModel;
+
+  ColorModel bitmaskColorModel;
+
+  ColorModel translucentColorModel;
 
   public GdkGraphicsConfiguration(GdkScreenGraphicsDevice dev)
   {
-    this.gdkScreenGraphicsDevice = dev;
-    cm = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).getColorModel();
-    bounds = ((GtkToolkit) Toolkit.getDefaultToolkit()).getBounds();
+    gdkScreenGraphicsDevice = dev;
+    
+    opaqueColorModel = new DirectColorModel(32, 0xFF0000, 0xFF00, 0xFF, 0);
+    bitmaskColorModel = new DirectColorModel(32, 0xFF0000, 0xFF00, 0xFF, 0x1000000);
+    translucentColorModel = new DirectColorModel(32, 0xFF0000, 0xFF00, 0xFF, 0xFF000000);
   }
 
   public GraphicsDevice getDevice()
@@ -94,12 +101,21 @@
 
   public ColorModel getColorModel()
   {
-    return cm;
+    return opaqueColorModel;
   }
 
   public ColorModel getColorModel(int transparency)
   {
-    return getColorModel();
+    switch (transparency)
+    {
+      case Transparency.OPAQUE:
+        return opaqueColorModel;
+      case Transparency.BITMASK:
+        return bitmaskColorModel;
+      default:
+      case Transparency.TRANSLUCENT:
+        return translucentColorModel;
+    }
   }
 
   public AffineTransform getDefaultTransform()
@@ -116,7 +132,7 @@
 
   public Rectangle getBounds()
   {
-    return bounds;
+    return gdkScreenGraphicsDevice.getBounds();
   }
 
   public BufferCapabilities getBufferCapabilities()
@@ -133,8 +149,8 @@
 
   public VolatileImage createCompatibleVolatileImage(int width, int height, int transparency)
   {
-      // FIXME: implement
-    return null;
+      // FIXME: support the transparency argument
+    return new GtkVolatileImage(width, height);
   }
 
 }

Index: gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java	29 May 2006 16:14:59 -0000	1.11
+++ gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java	6 Jun 2006 10:04:15 -0000	1.12
@@ -1,5 +1,5 @@
 /* GdkGraphicsEnvironment.java -- information about the graphics environment
-   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,31 +43,64 @@
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.HeadlessException;
-import java.awt.Toolkit;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBuffer;
 import java.util.Locale;
 
 public class GdkGraphicsEnvironment extends GraphicsEnvironment
 {
+  private final int native_state = GtkGenericPeer.getUniqueInteger ();
+  
+  private GdkScreenGraphicsDevice defaultDevice;
+  
+  private GdkScreenGraphicsDevice[] devices;
+  
+  static
+  {
+    System.loadLibrary("gtkpeer");
+
+    initStaticState ();
+  }
+  
+  static native void initStaticState();
+  
   public GdkGraphicsEnvironment ()
   {
+    nativeInitState();
   }
 
+  native void nativeInitState();
+
   public GraphicsDevice[] getScreenDevices ()
   {
-    // FIXME: Support multiple screens, since GDK can.
-    return new GraphicsDevice[] { new GdkScreenGraphicsDevice (this) };
+    if (devices == null)
+      {
+        devices = nativeGetScreenDevices();
   }
 
+    return devices.clone();
+  }
+  
+  private native GdkScreenGraphicsDevice[] nativeGetScreenDevices();
+
   public GraphicsDevice getDefaultScreenDevice ()
   {
     if (GraphicsEnvironment.isHeadless ())
       throw new HeadlessException ();
 
-    return new GdkScreenGraphicsDevice (this);
+    synchronized (GdkGraphicsEnvironment.class)
+      {
+        if (defaultDevice == null)
+          {
+            defaultDevice = nativeGetDefaultScreenDevice();
+          }
+      }
+    
+    return defaultDevice;
   }
 
+  private native GdkScreenGraphicsDevice nativeGetDefaultScreenDevice();
+
   public Graphics2D createGraphics (BufferedImage image)
   {
     DataBuffer db = image.getRaster().getDataBuffer();
@@ -101,4 +134,5 @@
   {
     throw new java.lang.UnsupportedOperationException ();
   }
+  
 }

Index: gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java	19 Aug 2005 01:29:26 -0000	1.6
+++ gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java	6 Jun 2006 10:04:15 -0000	1.7
@@ -1,5 +1,5 @@
 /* GdkScreenGraphicsDevice.java -- information about a screen device
-   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,44 +38,110 @@
 
 package gnu.java.awt.peer.gtk;
 
-import java.awt.Dimension;
 import java.awt.DisplayMode;
+import java.awt.Frame;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
-import java.awt.Toolkit;
+import java.awt.Rectangle;
+import java.awt.Window;
+import java.util.ArrayList;
 
-public class GdkScreenGraphicsDevice extends GraphicsDevice
+class GdkScreenGraphicsDevice extends GraphicsDevice
 {
+  private final int native_state = GtkGenericPeer.getUniqueInteger ();
+  
+  private Window fullscreenWindow;
+  
+  private boolean oldWindowDecorationState;
+  
+  private Rectangle oldWindowBounds;
+  
+  private Rectangle bounds;
+  
+  private GdkGraphicsConfiguration[] configurations;
+  
+  /** The <code>GdkGraphicsEnvironment</code> instance that created this
+   * <code>GdkScreenGraphicsDevice</code>. This is only needed for native
+   * methods which need to access the 'native_state' field storing a pointer
+   * to a GdkDisplay object.
+   */ 
   GdkGraphicsEnvironment env;
 
-  public GdkScreenGraphicsDevice (GdkGraphicsEnvironment e)
+  /** An identifier that is created by Gdk
+   */
+  String idString;
+  
+  /** The display modes supported by this <code>GdkScreenGraphicsDevice</code>.
+   * If the array is <code>null</code> <code>nativeGetDisplayModes</code> has
+   * to be called.
+   */
+  X11DisplayMode[] displayModes;
+
+  /** The non-changeable display mode of this <code>GdkScreenGraphicsDevice
+   * </code>. This field gets initialized by the {@link #init()} method. If it
+   * is still <code>null</code> afterwards, the XRandR extension is available
+   * and display mode changes are possible. If it is non-null XRandR is not
+   * available, no display mode changes are possible and no other native
+   * method must be called. 
+   */
+  DisplayMode fixedDisplayMode;
+  
+  static
   {    
-    super ();
+    System.loadLibrary("gtkpeer");
+
+    initStaticState ();
+  }
+  
+  static native void initStaticState();
+  
+  GdkScreenGraphicsDevice (GdkGraphicsEnvironment e)
+  {
+    super();
     env = e;
+    
+    configurations = new GdkGraphicsConfiguration[1];
+    configurations[0] = new GdkGraphicsConfiguration(this);
   }
 
+  /** This method is called from the native side immediately after
+   * the constructor is run.
+   */
+  void init()
+  {
+    fixedDisplayMode = nativeGetFixedDisplayMode(env);
+  }
+  
+  /** Depending on the availability of the XRandR extension the method returns
+   * the screens' non-changeable display mode or null, meaning that XRandR can
+   * handle display mode changes.
+   */
+  native DisplayMode nativeGetFixedDisplayMode(GdkGraphicsEnvironment env);
+  
   public int getType ()
   {
+    // Gdk manages only raster screens.
     return GraphicsDevice.TYPE_RASTER_SCREEN;
   }
 
   public String getIDstring ()
   {
-    // FIXME: query X for this string
-    return "default GDK device ID string";
+    if (idString == null)
+      idString = nativeGetIDString();
+    
+    return idString;
   }
 
+  private native String nativeGetIDString(); 
+
   public GraphicsConfiguration[] getConfigurations ()
   {
-    // FIXME: query X for the list of possible configurations
-    return new GraphicsConfiguration [] { new GdkGraphicsConfiguration(this) };
+    return (GraphicsConfiguration[]) configurations.clone();
   }
 
   public GraphicsConfiguration getDefaultConfiguration ()
   {
-    
-    // FIXME: query X for default configuration
-    return new GdkGraphicsConfiguration(this);
+    return configurations[0];
   }
 
 
@@ -89,23 +155,193 @@
    */
   public DisplayMode getDisplayMode()
   {
-    // determine display mode
-    Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
-    DisplayMode mode = new DisplayMode(dim.width, dim.height, 0,
-				       DisplayMode.REFRESH_RATE_UNKNOWN);
-    return mode;
+    if (fixedDisplayMode != null)
+      return fixedDisplayMode;
+    
+    synchronized (this)
+      {
+        if (displayModes == null)
+          displayModes = nativeGetDisplayModes(env);
+      }
+
+    int index = nativeGetDisplayModeIndex(env);
+    int rate = nativeGetDisplayModeRate(env);
+    
+    return new DisplayMode(displayModes[index].width,
+                           displayModes[index].height,
+                           DisplayMode.BIT_DEPTH_MULTI,
+                           rate);
+  }
+  
+  native int nativeGetDisplayModeIndex(GdkGraphicsEnvironment env);
+  
+  native int nativeGetDisplayModeRate(GdkGraphicsEnvironment env);
+  
+  public DisplayMode[] getDisplayModes()
+  {
+    if (fixedDisplayMode != null)
+      return new DisplayMode[] { fixedDisplayMode };
+    
+    synchronized (this)
+      {
+        if (displayModes == null)
+          displayModes = nativeGetDisplayModes(env);
   }
 
+    ArrayList list = new ArrayList();
+    for(int i=0;i<displayModes.length;i++)
+      for(int j=0;j<displayModes[i].rates.length;j++)
+        list.add(new DisplayMode(displayModes[i].width,
+                                 displayModes[i].height,
+                                 DisplayMode.BIT_DEPTH_MULTI,
+                                 displayModes[i].rates[j]));
+    
+    return (DisplayMode[]) list.toArray(new DisplayMode[list.size()]);
+  }
+  
+  native X11DisplayMode[] nativeGetDisplayModes(GdkGraphicsEnvironment env);
+
   /**
-   * This device does not yet support fullscreen exclusive mode, so this
-   * returns <code>false</code>.
+   * Real fullscreen exclusive mode is not supported.
    *
    * @return <code>false</code>
    * @since 1.4
    */
   public boolean isFullScreenSupported()
   {
-    return false;
+    return true;
+  }
+  
+  public boolean isDisplayChangeSupported()
+  {
+    return fixedDisplayMode == null;
+  }
+
+  public void setDisplayMode(DisplayMode dm)
+  {
+    if (fixedDisplayMode != null)
+      throw new UnsupportedOperationException("Cannnot change display mode.");
+    
+    if (dm == null)
+      throw new IllegalArgumentException("DisplayMode must not be null.");
+    
+    synchronized (this)
+      {
+        if (displayModes == null)
+          displayModes = nativeGetDisplayModes(env);
   }
 
+    for (int i=0; i<displayModes.length; i++)
+      if (displayModes[i].width == dm.getWidth()
+          && displayModes[i].height == dm.getHeight())
+        {
+          synchronized (this)
+          {
+            nativeSetDisplayMode(env,
+                                 i,
+                                 (short) dm.getRefreshRate());
+          
+            bounds = null;
+          }
+          
+          return;
+        }
+    
+    throw new IllegalArgumentException("Mode not supported by this device.");
+  }
+  
+  native void nativeSetDisplayMode(GdkGraphicsEnvironment env,
+                                int index, short rate);
+  
+  /** A class that simply encapsulates the X11 display mode data.
+   */
+  static class X11DisplayMode
+  {
+    short[] rates;
+    int width;
+    int height;
+    
+    X11DisplayMode(int width, int height, short[] rates)
+    {
+      this.width = width;
+      this.height = height;
+      this.rates = rates;
+    }
+    
+  }
+  
+  public void setFullScreenWindow(Window w)
+  {
+    // Bring old fullscreen window back into its original state.
+    if (fullscreenWindow != null && w != fullscreenWindow)
+      {
+        if (fullscreenWindow instanceof Frame)
+          {
+            // Decoration state can only be switched when the peer is
+            // non-existent. That means we have to dispose the 
+            // Frame.
+            Frame f = (Frame) fullscreenWindow;
+            if (oldWindowDecorationState != f.isUndecorated())
+              {
+                f.dispose();
+                f.setUndecorated(oldWindowDecorationState);
+              }
+          }
+        
+        fullscreenWindow.setBounds(oldWindowBounds);
+
+        if (!fullscreenWindow.isVisible())
+          fullscreenWindow.setVisible(true);
+      }
+    
+    // If applicable remove decoration, then maximize the window and
+    // bring it to the foreground.
+    if (w != null)
+      {
+        if (w instanceof Frame)
+          {
+            Frame f = (Frame) w;
+            oldWindowDecorationState = f.isUndecorated();
+            if (!oldWindowDecorationState)
+              {
+                f.dispose();
+                f.setUndecorated(true);
+              }
+          }
+        
+        oldWindowBounds = w.getBounds();
+    
+        DisplayMode dm = getDisplayMode();
+    
+        w.setBounds(0, 0, dm.getWidth(), dm.getHeight());
+        
+        if (!w.isVisible())
+          w.setVisible(true);
+        
+        w.requestFocus();
+        w.toFront();
+        
+      }
+    
+    fullscreenWindow = w;
+  }
+  
+  public Window getFullScreenWindow()
+  {
+   return fullscreenWindow; 
+  }
+
+  Rectangle getBounds()
+  {
+   synchronized(this)
+     {
+       if (bounds == null)
+         bounds = nativeGetBounds();
+     }
+   
+   return bounds;
+  }
+  
+  native Rectangle nativeGetBounds();
+
 }

Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- native/jni/gtk-peer/Makefile.am	3 Jun 2006 22:41:41 -0000	1.43
+++ native/jni/gtk-peer/Makefile.am	6 Jun 2006 10:04:15 -0000	1.44
@@ -10,6 +10,7 @@
 			gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c \
 			gnu_java_awt_peer_gtk_GdkPixbufDecoder.c \
 			gnu_java_awt_peer_gtk_GdkRobotPeer.c \
+			gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c \
 			gnu_java_awt_peer_gtk_GdkTextLayout.c \
 			gnu_java_awt_peer_gtk_GtkButtonPeer.c \
 			gnu_java_awt_peer_gtk_GtkCanvasPeer.c \
@@ -42,6 +43,7 @@
 			gnu_java_awt_peer_gtk_GtkVolatileImage.c \
 			cairographics2d.h \
 			gthread-jni.c \
+			gdkdisplay.h \
 			gdkfont.h \
 			gthread-jni.h \
 			gtk_jawt.c \

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c	22 Nov 2005 20:41:06 -0000	1.5
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c	6 Jun 2006 10:04:15 -0000	1.6
@@ -1,5 +1,5 @@
 /* gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
    This file is part of GNU Classpath.
 
@@ -35,9 +35,43 @@
    obligated to do so.  If you do not wish to do so, delete this
    exception statement from your version. */
 
+#include <glib.h>
+#include <gdk/gdk.h>
+
 #include "gdkfont.h"
+#include "gdkdisplay.h"
 #include "gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h"
 
+struct state_table *cp_gtk_native_display_state_table;
+
+jclass gdkGraphicsEnvironment_class;
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_initStaticState
+(JNIEnv *env, jclass klazz __attribute__((unused)))
+{
+    gdkGraphicsEnvironment_class = (*env)->NewGlobalRef
+    (env, klazz);
+
+	NSA_DISPLAY_INIT(env, gdkGraphicsEnvironment_class);
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeInitState
+(JNIEnv *env, jobject obj)
+{
+	GdkDisplay *defaultDisplay;
+	
+    gdk_threads_enter();
+    
+    /* Retrieve the default display. */
+    defaultDisplay = gdk_display_get_default();
+    
+    gdk_threads_leave();
+    
+    /* Store display pointer in GdkGraphicsEnvironment instance. */
+    NSA_SET_DISPLAY_PTR(env, obj, (void *) defaultDisplay);
+}
 
 static gint
 cmp_families (const void *a, const void *b)
@@ -101,3 +135,109 @@
   
   return num;
 }
+
+JNIEXPORT jobjectArray JNICALL
+Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeGetScreenDevices
+(JNIEnv *env, jobject obj)
+{
+	jmethodID gdkScreenGraphicsDevice_ctor, gdkScreenGraphicsDevice_init;
+	jclass gdkScreenGraphicsDevice_class;
+	int numScreens = 0, i = 0;
+	GdkDisplay *display;
+	jobjectArray array;
+	jobject instance;
+	
+	gdkScreenGraphicsDevice_class = (*env)->FindClass 
+    (env, "gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice");
+    
+	gdkScreenGraphicsDevice_ctor = (*env)->GetMethodID 
+    (env, gdkScreenGraphicsDevice_class, "<init>",
+     "(Lgnu/java/awt/peer/gtk/GdkGraphicsEnvironment;)V");
+
+	gdkScreenGraphicsDevice_init = (*env)->GetMethodID 
+    (env, gdkScreenGraphicsDevice_class, "init", "()V");
+
+	display = (GdkDisplay *) NSA_GET_DISPLAY_PTR(env, obj);
+	
+	gdk_threads_enter();
+	
+	numScreens = gdk_display_get_n_screens(display);
+	
+	
+	/* Create a suitably sized array. */
+	array = (*env)->NewObjectArray(env,
+                                   numScreens,
+                                   gdkScreenGraphicsDevice_class,
+                                   NULL);
+	
+	/* Create GdkScreenGraphicsDevice instances, store the native pointer to
+	 * the GScreen object with them, run a 2nd initialization phase and
+	 * put the new instance into the result array.
+	 */
+	for ( ; i < numScreens ; i++)
+	{
+		instance = (*env)->NewObject (env, 
+                                      gdkScreenGraphicsDevice_class,
+                                      gdkScreenGraphicsDevice_ctor,
+                                      obj);
+									  
+        NSA_SET_SCREEN_PTR(env,
+                           instance,
+                           gdk_display_get_screen(display, i));
+						   
+        gdk_threads_leave();
+        (*env)->CallVoidMethod(env,
+                               instance,
+                               gdkScreenGraphicsDevice_init);
+		gdk_threads_enter();
+		
+        (*env)->SetObjectArrayElement(env, array, i, instance);
+    }
+	
+    gdk_threads_leave();
+	
+    return array;
+}
+
+JNIEXPORT jobject JNICALL
+Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeGetDefaultScreenDevice
+(JNIEnv *env, jobject obj)
+{
+    jclass gdkScreenGraphicsDevice_class;
+    jmethodID gdkScreenGraphicsDevice_ctor, gdkScreenGraphicsDevice_init;
+    jobject defaultDevice;
+    GdkScreen *defaultScreen;
+    
+    gdkScreenGraphicsDevice_class = (*env)->FindClass 
+    (env, "gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice");
+    
+    gdkScreenGraphicsDevice_ctor = (*env)->GetMethodID 
+    (env, gdkScreenGraphicsDevice_class, "<init>",
+     "(Lgnu/java/awt/peer/gtk/GdkGraphicsEnvironment;)V");
+    
+    gdkScreenGraphicsDevice_init = (*env)->GetMethodID 
+    (env, gdkScreenGraphicsDevice_class, "init", "()V");
+    
+    /* Create the GdkScreenGraphicsDevice instance. */
+    defaultDevice = (*env)->NewObject (env, 
+									   gdkScreenGraphicsDevice_class,
+									   gdkScreenGraphicsDevice_ctor,
+									   obj);
+									   
+    gdk_threads_enter();
+	
+    defaultScreen = gdk_screen_get_default();
+	
+    gdk_threads_leave();
+									   
+	/* Class initialization will have set up the native_state storage
+	 * mechanism for GdkScreenGraphicsDevice.
+	 */
+    NSA_SET_SCREEN_PTR(env, defaultDevice, defaultScreen);
+
+    (*env)->CallVoidMethod(env,
+                           defaultDevice,
+                           gdkScreenGraphicsDevice_init);
+
+    return defaultDevice;	
+}

Index: include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h
===================================================================
RCS file: include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h
diff -N include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h	6 Jun 2006 10:04:15 -0000	1.1
@@ -0,0 +1,26 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice__
+#define __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_initStaticState (JNIEnv *env, jclass);
+JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetFixedDisplayMode (JNIEnv *env, jobject, jobject);
+JNIEXPORT jstring JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetIDString (JNIEnv *env, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetDisplayModeIndex (JNIEnv *env, jobject, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetDisplayModeRate (JNIEnv *env, jobject, jobject);
+JNIEXPORT jobjectArray JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetDisplayModes (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeSetDisplayMode (JNIEnv *env, jobject, jobject, jint, jshort);
+JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetBounds (JNIEnv *env, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice__ */

Index: native/jni/gtk-peer/gdkdisplay.h
===================================================================
RCS file: native/jni/gtk-peer/gdkdisplay.h
diff -N native/jni/gtk-peer/gdkdisplay.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/gtk-peer/gdkdisplay.h	6 Jun 2006 10:04:15 -0000	1.1
@@ -0,0 +1,67 @@
+#ifndef __GDKDISPLAY_H__
+#define __GDKDISPLAY_H__
+
+/* gdkdisplay.h -- Some global stuff related to displays & screens 
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 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"
+
+/* Allows storing GdkDisplay pointers in GdkGraphicsEnvironment instances. */
+extern struct state_table *cp_gtk_native_display_state_table;
+
+/* Allows storing GdkScreen pointers in GdkScreenGraphicsDevice instances. */
+extern struct state_table *cp_gtk_native_screen_state_table;
+
+#define NSA_DISPLAY_INIT(env, clazz) \
+  cp_gtk_native_display_state_table = cp_gtk_init_state_table (env, clazz)
+
+#define NSA_GET_DISPLAY_PTR(env, obj) \
+  cp_gtk_get_state (env, obj, cp_gtk_native_display_state_table)
+
+#define NSA_SET_DISPLAY_PTR(env, obj, ptr) \
+  cp_gtk_set_state (env, obj, cp_gtk_native_display_state_table, (void *)ptr)
+
+#define NSA_SCREEN_INIT(env, clazz) \
+  cp_gtk_native_screen_state_table = cp_gtk_init_state_table (env, clazz)
+
+#define NSA_GET_SCREEN_PTR(env, obj) \
+  cp_gtk_get_state (env, obj, cp_gtk_native_screen_state_table)
+
+#define NSA_SET_SCREEN_PTR(env, obj, ptr) \
+  cp_gtk_set_state (env, obj, cp_gtk_native_screen_state_table, (void *)ptr)
+
+#endif /* __GDKDISPLAY_H__ */

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
===================================================================
RCS file: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
diff -N native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c	6 Jun 2006 10:04:15 -0000	1.1
@@ -0,0 +1,354 @@
+/* gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 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 <jcl.h>
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#ifdef HAVE_XRANDR
+#include <X11/Xlib.h>
+#include <X11/extensions/Xrandr.h>
+#endif
+
+#include "gdkdisplay.h"
+
+#include "gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h"
+
+struct state_table *cp_gtk_native_screen_state_table;
+
+jclass gdkScreenGraphicsDevice_class;
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_initStaticState
+(JNIEnv *env, jclass klazz)
+{
+	gdkScreenGraphicsDevice_class = (*env)->NewGlobalRef
+    (env, klazz);
+
+	NSA_SCREEN_INIT(env, gdkScreenGraphicsDevice_class);
+}
+
+JNIEXPORT jobject JNICALL
+Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetFixedDisplayMode
+(JNIEnv *env, jobject obj, jobject gdkGraphicsEnv __attribute__((unused)))
+{
+	jclass displayMode_class;
+	jmethodID displayMode_ctor;
+	GdkScreen *screen;
+	jobject fixedDisplayMode = NULL;
+#ifdef HAVE_XRANDR
+	int temp1, temp2;
+	GdkDisplay *display;
+
+    display = (GdkDisplay *) NSA_GET_DISPLAY_PTR(env, gdkGraphicsEnv);
+
+	gdk_threads_enter();
+
+	if (!XRRQueryExtension(GDK_DISPLAY_XDISPLAY(display), &temp1, &temp2))
+	  {
+        displayMode_class = (*env)->FindClass(env, "java/awt/DisplayMode");
+        displayMode_ctor = (*env)->GetMethodID(env,
+                                               displayMode_class,
+                                               "<init>",
+                                               "(IIII)V");
+
+        screen = (GdkScreen *) NSA_GET_SCREEN_PTR(env, obj);
+	  	
+	  	fixedDisplayMode = (*env)->NewObject(env,
+	  	                                     displayMode_class,
+	  	                                     displayMode_ctor,
+	  	                                     gdk_screen_get_width(screen),
+	  	                                     gdk_screen_get_height(screen),
+	  	                                     -1,
+	  	                                     0);
+	  }
+
+	gdk_threads_leave();
+	  
+#else
+
+    displayMode_class = (*env)->FindClass(env, "java/awt/DisplayMode");
+    displayMode_ctor = (*env)->GetMethodID(env,
+                                           displayMode_class,
+                                           "<init>",
+                                           "(IIII)V");
+
+    screen = (GdkScreen *) NSA_GET_SCREEN_PTR(env, obj);
+	  	
+    fixedDisplayMode = (*env)->NewObject(env,
+	                                     displayMode_class,
+	                                     displayMode_ctor,
+	                                     gdk_screen_get_width(screen),
+	                                     gdk_screen_get_height(screen),
+	                                     -1,
+	                                     0);
+
+#endif	  
+	return fixedDisplayMode;
+}
+
+JNIEXPORT jstring JNICALL
+Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetIDString
+(JNIEnv *env, jobject obj)
+{
+	GdkScreen *screen;
+	gchar* displayName;
+	jstring string;
+
+    screen = (GdkScreen *) NSA_GET_SCREEN_PTR(env, obj);
+	
+	gdk_threads_enter();
+	
+	displayName = gdk_screen_make_display_name(screen);
+	
+	gdk_threads_leave();
+	
+    string = (*env)->NewStringUTF(env, displayName);
+    
+    g_free(displayName);
+    
+    return string;
+}
+
+JNIEXPORT jint JNICALL
+Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetDisplayModeRate
+(JNIEnv *env, jobject obj __attribute__((unused)), jobject gdkGraphicsEnv __attribute__((unused)))
+{
+#ifdef HAVE_XRANDR
+
+	GdkDisplay *display;
+	XRRScreenConfiguration *config;
+	int rate;
+	
+	display = (GdkDisplay *) NSA_GET_DISPLAY_PTR(env, gdkGraphicsEnv);
+	
+	gdk_threads_enter();
+	
+	config = XRRGetScreenInfo (GDK_DISPLAY_XDISPLAY(display), GDK_ROOT_WINDOW());
+
+	rate = (int) XRRConfigCurrentRate (config);
+
+    XRRFreeScreenConfigInfo (config);
+
+	gdk_threads_leave();
+	
+	return rate;
+#else
+    JCL_ThrowException(env,
+                       "java/lang/InternalError",
+                       "Method should not have been invoked.");
+    
+    return -1;
+#endif    
+}
+
+JNIEXPORT jint JNICALL
+Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetDisplayModeIndex
+(JNIEnv *env, jobject obj __attribute__((unused)), jobject gdkGraphicsEnv __attribute__((unused)))
+{
+#ifdef HAVE_XRANDR	
+
+	GdkDisplay *display;
+	XRRScreenConfiguration *config;
+	SizeID index;
+	Rotation rotation;
+	
+	display = (GdkDisplay *) NSA_GET_DISPLAY_PTR(env, gdkGraphicsEnv);
+	
+	gdk_threads_enter();
+	
+	config = XRRGetScreenInfo (GDK_DISPLAY_XDISPLAY(display), GDK_ROOT_WINDOW());
+
+	index = XRRConfigCurrentConfiguration (config, &rotation);
+
+    XRRFreeScreenConfigInfo (config);
+
+	gdk_threads_leave();
+	
+	return (int) index;
+
+#else
+
+    JCL_ThrowException(env,
+                       "java/lang/InternalError",
+                       "Method should not have been invoked.");
+   
+    return -1;
+   
+#endif	
+}
+
+JNIEXPORT jobjectArray JNICALL
+Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetDisplayModes
+(JNIEnv *env, jobject obj __attribute__((unused)), jobject gdkGraphicsEnv __attribute__((unused)))
+{
+#ifdef HAVE_XRANDR
+	GdkDisplay *display;
+	XRRScreenConfiguration *config;
+	XRRScreenSize *screenSizes;
+	int nsizes = 0, nrates = 0, i = 0;
+	jclass x11DisplayMode_class;
+	jmethodID x11DisplayMode_ctor;
+	jobjectArray array;
+	jobject instance;
+	short *rates;
+	jshortArray shortArray;
+	
+	display = (GdkDisplay *) NSA_GET_DISPLAY_PTR(env, gdkGraphicsEnv);
+	
+	gdk_threads_enter();
+	
+	config = XRRGetScreenInfo (GDK_DISPLAY_XDISPLAY(display), GDK_ROOT_WINDOW());
+	
+	screenSizes = XRRConfigSizes(config, &nsizes);
+	
+	x11DisplayMode_class = (*env)->FindClass(env, "gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice$X11DisplayMode");
+    
+	x11DisplayMode_ctor = (*env)->GetMethodID(env, x11DisplayMode_class, "<init>", "(II[S)V");
+
+	array = (*env)->NewObjectArray(env, nsizes, x11DisplayMode_class, NULL);
+
+	for (; i < nsizes ; i++)
+	  {
+	  	/* Retrieves refresh rate information. */
+	  	rates = XRRConfigRates(config, i, &nrates);
+	  	
+	  	/* Create a Java int array and put them in. */
+	  	shortArray = (*env)->NewIntArray(env, nrates);
+		(*env)->SetShortArrayRegion(env, shortArray, 0, nrates, (jshort *) rates);
+	  	
+	  	/* Create a GdkScreenGraphicsDevice.X11DisplayMode instance. */
+        instance = (*env)->NewObject(env,
+									 x11DisplayMode_class,
+									 x11DisplayMode_ctor,
+									 screenSizes[i].width,
+									 screenSizes[i].height,
+									 shortArray);
+									 
+		/* Put it into the result array. */
+        (*env)->SetObjectArrayElement(env, array, i, instance);
+	  }
+	  
+	/* Free everything acquired by xlib. */
+	XRRFreeScreenConfigInfo (config);
+
+	gdk_threads_leave();
+	
+	return array;
+#else
+    JCL_ThrowException(env,
+                       "java/lang/InternalError",
+                       "Method should not have been invoked.");
+    
+    return NULL;
+   
+#endif	
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeSetDisplayMode
+(JNIEnv *env, jobject obj __attribute__((unused)), jobject gdkGraphicsEnv __attribute__((unused)), jint index __attribute__((unused)), jshort rate __attribute__((unused)))
+{
+#ifdef HAVE_XRANDR
+	GdkDisplay *display;
+	XRRScreenConfiguration *config;
+	Rotation rotation;
+	
+	display = (GdkDisplay *) NSA_GET_DISPLAY_PTR(env, gdkGraphicsEnv);
+	
+	gdk_threads_enter();
+	
+	config = XRRGetScreenInfo (GDK_DISPLAY_XDISPLAY(display), GDK_ROOT_WINDOW());
+
+	/* The rotation is not exposed to the Java API. So we retrieve its current
+	 * value and set it to the same when switching resolution.
+	 */
+	XRRConfigCurrentConfiguration (config, &rotation);
+	
+	XRRSetScreenConfigAndRate (GDK_DISPLAY_XDISPLAY(display),
+                        		   config,
+                               GDK_ROOT_WINDOW(),
+                               index,
+                               rotation,
+                               rate,
+                               CurrentTime);
+	
+	XRRFreeScreenConfigInfo(config);
+	
+	gdk_threads_leave();
+
+#else
+    JCL_ThrowException(env,
+                       "java/lang/InternalError",
+                       "Method should not have been invoked.");
+#endif	
+}
+
+JNIEXPORT jobject JNICALL
+Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetBounds
+(JNIEnv *env, jobject obj)
+{
+	jclass rectangle_class;
+	jmethodID rectangle_ctor;
+	GdkScreen *screen;
+	GdkWindow *window;
+	int x, y, w, h;
+	jobject instance;
+    
+	rectangle_class = (*env)->FindClass(env, "java/awt/Rectangle");
+    
+    rectangle_ctor = (*env)->GetMethodID 
+    (env, rectangle_class, "<init>", "(IIII)V");
+
+    screen = (GdkScreen *) NSA_GET_SCREEN_PTR(env, obj);
+
+	gdk_threads_enter();
+	
+	window = gdk_screen_get_root_window(screen);
+	
+	gdk_window_get_geometry(window, &x, &y, &w, &h, NULL);
+
+	gdk_threads_leave();
+	
+    instance = (*env)->NewObject(env,
+								 rectangle_class,
+								 rectangle_ctor,
+								 x, y, w, h);
+	
+	return instance;
+}



From MAILER-DAEMON Tue Jun 06 06:07:11 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnYSs-0001f5-TT
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 06:07:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnYSq-0001eD-Vz
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:07:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnYSq-0001db-6K
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:07:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnYSp-0001dN-QV
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:07:07 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnYaB-0005l4-7y
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:14:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnYSo-0003nD-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 06:07:06 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1FnYSo-0003n6-62
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 10:07:06 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnYSo-0003n6-62@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Tue, 06 Jun 2006 10:07:06 +0000
Subject: [commit-cp] classpath ChangeLog configure.ac
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 10:07:09 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/06 10:07:05

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
	
	        * configure.ac: Added missing { to expression.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7667&r2=1.7668
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&r1=1.157&r2=1.158

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7667
retrieving revision 1.7668
diff -u -b -r1.7667 -r1.7668
--- ChangeLog	6 Jun 2006 10:04:15 -0000	1.7667
+++ ChangeLog	6 Jun 2006 10:07:05 -0000	1.7668
@@ -1,5 +1,9 @@
 2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
 
+	* configure.ac: Added missing { to expression.
+
+2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
+
 	* include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h: Regenerated.
 	* include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h: New file.
 	* include/Makefile.am: Added

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- configure.ac	6 Jun 2006 10:04:15 -0000	1.157
+++ configure.ac	6 Jun 2006 10:07:05 -0000	1.158
@@ -420,7 +420,7 @@
     AC_CHECK_LIB([Xrandr], [XRRQueryExtension],
                  [AC_DEFINE(HAVE_XRANDR, 1, [Define to 1 if you have libXrandr.])X_EXTRA_LIBS="$X_EXTRA_LIBS -lXrandr"]],
                  [true],
-                 [$X_LIBS}])
+                 [${X_LIBS}])
 
     AC_SUBST(GTK_CFLAGS)
     AC_SUBST(GTK_LIBS)



From MAILER-DAEMON Tue Jun 06 06:19:54 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnYfC-0007xD-5W
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 06:19:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnYfA-0007wH-5H
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:19:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnYf9-0007vx-EP
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:19:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnYf9-0007vu-8F
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:19:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnYmU-0006qk-Tb
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:27:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnYf8-00040z-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 06:19:50 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1FnYf7-00040w-7F
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 10:19:50 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnYf7-00040w-7F@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Tue, 06 Jun 2006 10:19:49 +0000
Subject: [commit-cp] classpath ChangeLog configure.ac
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 10:19:53 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/06 10:19:49

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
	
	        * configure.ac: Added missing [ to expression.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7668&r2=1.7669
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&r1=1.158&r2=1.159

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7668
retrieving revision 1.7669
diff -u -b -r1.7668 -r1.7669
--- ChangeLog	6 Jun 2006 10:07:05 -0000	1.7668
+++ ChangeLog	6 Jun 2006 10:19:48 -0000	1.7669
@@ -1,5 +1,9 @@
 2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
 
+	* configure.ac: Added missing [ to expression.
+
+2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
+
 	* configure.ac: Added missing { to expression.
 
 2006-06-06  Robert Schuster  <robertschuster@fsfe.org>

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- configure.ac	6 Jun 2006 10:07:05 -0000	1.158
+++ configure.ac	6 Jun 2006 10:19:48 -0000	1.159
@@ -418,7 +418,7 @@
     dnl Check if we can link against the XRandR library and set
     dnl HAVE_XRANDR accordingly.
     AC_CHECK_LIB([Xrandr], [XRRQueryExtension],
-                 [AC_DEFINE(HAVE_XRANDR, 1, [Define to 1 if you have libXrandr.])X_EXTRA_LIBS="$X_EXTRA_LIBS -lXrandr"]],
+                 [AC_DEFINE(HAVE_XRANDR, 1, [Define to 1 if you have libXrandr.])[X_EXTRA_LIBS="$X_EXTRA_LIBS -lXrandr"]],
                  [true],
                  [${X_LIBS}])
 



From MAILER-DAEMON Tue Jun 06 06:46:52 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnZ5I-00015K-9z
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 06:46:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnZ5F-00014l-97
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:46:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnZ5D-00014Z-PX
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:46:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnZ5D-00014W-JW
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:46:47 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnZCZ-0000Ub-8N
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:54:23 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnZ5C-000553-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 06:46:46 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FnZ5C-00054y-57
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 10:46:46 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnZ5C-00054y-57@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Tue, 06 Jun 2006 10:46:46 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/basic BasicTextUI.ja...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 10:46:49 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/06 10:46:45

Modified files:
	javax/swing/plaf/basic: BasicTextUI.java 
	.              : ChangeLog 
Added files:
	javax/swing/plaf/basic: SharedUIDefaults.java 

Log message:
	2006-06-06  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/plaf/basic/BasicTextUI.java
		(installKeyboardActions): Use shared input map. Correctly
		install the input/action maps in the component's input/action
		map hierarchies.
		(getActionMap): New helper method for fetching an ActionMap from
		the UIManager or creating a default one if there is none supplied
		by the UIManager.
		(createActionMap): Add the TransferHandler's actions here. Made
		method private.
		(getInputMap): Leave out unnecessary method parameter. Load
		shared input map.
		* javax/swing/plaf/basic/SharedUIDefaults.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTextUI.java?cvsroot=classpath&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/SharedUIDefaults.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7669&r2=1.7670

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7669
retrieving revision 1.7670
diff -u -b -r1.7669 -r1.7670
--- ChangeLog	6 Jun 2006 10:19:48 -0000	1.7669
+++ ChangeLog	6 Jun 2006 10:46:43 -0000	1.7670
@@ -1,3 +1,18 @@
+2006-06-06  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/plaf/basic/BasicTextUI.java
+	(installKeyboardActions): Use shared input map. Correctly
+	install the input/action maps in the component's input/action
+	map hierarchies.
+	(getActionMap): New helper method for fetching an ActionMap from
+	the UIManager or creating a default one if there is none supplied
+	by the UIManager.
+	(createActionMap): Add the TransferHandler's actions here. Made
+	method private.
+	(getInputMap): Leave out unnecessary method parameter. Load
+	shared input map.
+	* javax/swing/plaf/basic/SharedUIDefaults.java: New file.
+
 2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
 
 	* configure.ac: Added missing [ to expression.




From MAILER-DAEMON Tue Jun 06 06:57:45 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnZFp-0005Pl-AC
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 06:57:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnZFn-0005Ng-CN
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:57:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnZFm-0005NR-LC
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:57:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnZFm-0005NO-FI
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 06:57:42 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnZN8-0001Gr-BQ
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 07:05:18 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnZFj-0005qy-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 06:57:39 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1FnZFi-0005qv-0i
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 10:57:39 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnZFi-0005qv-0i@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Tue, 06 Jun 2006 10:57:38 +0000
Subject: [commit-cp] classpath/gnu/java/awt/peer/gtk GdkGraphicsEnvi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 10:57:43 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/06 10:57:37

Modified files:
	gnu/java/awt/peer/gtk: GdkGraphicsEnvironment.java 
	.              : ChangeLog 

Log message:
	2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
	
	        * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
	        (getScreenDevices): Added explicit cast.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java?cvsroot=classpath&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7670&r2=1.7671

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7670
retrieving revision 1.7671
diff -u -b -r1.7670 -r1.7671
--- ChangeLog	6 Jun 2006 10:46:43 -0000	1.7670
+++ ChangeLog	6 Jun 2006 10:57:37 -0000	1.7671
@@ -1,3 +1,8 @@
+2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
+
+	* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
+	(getScreenDevices): Added explicit cast.
+
 2006-06-06  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/plaf/basic/BasicTextUI.java



From MAILER-DAEMON Tue Jun 06 08:14:03 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnaRf-0004aZ-0z
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 08:14:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnaRc-0004ZU-Qz
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:14:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnaRb-0004YT-7f
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:14:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnaRa-0004YI-W5
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:13:59 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnaYx-0000OT-P6
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:21:35 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnaRC-00086H-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 08:13:34 -0400
Received: from dog by savannah.gnu.org with local (Exim 4.50)
	id 1FnaRB-00086D-ED
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 12:13:34 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnaRB-00086D-ED@savannah.gnu.org>
From: Chris Burdess <d09@hush.ai>
Date: Tue, 06 Jun 2006 12:13:33 +0000
Subject: [commit-cp] classpath ChangeLog gnu/xml/transform/Transform...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 12:14:01 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Chris Burdess <dog>	06/06/06 12:13:33

Modified files:
	.              : ChangeLog 
	gnu/xml/transform: TransformerImpl.java 

Log message:
	2006-06-06  Chris Burdess  <dog@gnu.org>
	
		* gnu/xml/transform/TransformerImpl.java: Check type of created
		  document.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7671&r2=1.7672
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/xml/transform/TransformerImpl.java?cvsroot=classpath&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7671
retrieving revision 1.7672
diff -u -b -r1.7671 -r1.7672
--- ChangeLog	6 Jun 2006 10:57:37 -0000	1.7671
+++ ChangeLog	6 Jun 2006 12:13:32 -0000	1.7672
@@ -1,3 +1,8 @@
+2006-06-06  Chris Burdess  <dog@gnu.org>
+
+	* gnu/xml/transform/TransformerImpl.java: Check type of created
+	  document.
+
 2006-06-06  Robert Schuster  <robertschuster@fsfe.org>
 
 	* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:

Index: gnu/xml/transform/TransformerImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/transform/TransformerImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gnu/xml/transform/TransformerImpl.java	10 Mar 2006 09:12:27 -0000	1.12
+++ gnu/xml/transform/TransformerImpl.java	6 Jun 2006 12:13:33 -0000	1.13
@@ -238,7 +238,7 @@
       outputProperties.getProperty(OutputKeys.CDATA_SECTION_ELEMENTS);
     boolean indent =
       "yes".equals(outputProperties.getProperty(OutputKeys.INDENT));
-    if (created)
+    if (created && parent instanceof DomDocument)
       {
         // Discover document element
         DomDocument resultDoc = (DomDocument) parent;



From MAILER-DAEMON Tue Jun 06 08:21:28 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnaYq-0007yi-Fl
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 08:21:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnaYo-0007xx-4E
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:21:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnaYn-0007xk-NT
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:21:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnaYn-0007xh-H4
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:21:25 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnagA-00017Z-Bv
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:29:02 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnaYl-0008Ec-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 08:21:23 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FnaYk-0008EZ-A2
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 12:21:23 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnaYk-0008EZ-A2@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Tue, 06 Jun 2006 12:21:22 +0000
Subject: [commit-cp] classpath/javax/swing/plaf basicBasicInternalFr...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 12:21:26 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/06 12:21:22

Modified files:
	javax/swing/plaf/basic: BasicInternalFrameUI.java 
	javax/swing/plaf/metal: MetalInternalFrameUI.java 
	.              : ChangeLog 

Log message:
	2006-06-06  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/plaf/basic/BasicInternalFrameUI.java
		(ShowSystemMenuAction): New class.
		(installKeyboardActions): Implemented.
		(uninstallKeyboardActions): Implemented.
		* javax/swing/plaf/metal/MetalInternalFrameUI.java
		(installKeyboardActions): Overridden to remove showSystemMenu action.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java?cvsroot=classpath&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7672&r2=1.7673

Patches:


Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7672
retrieving revision 1.7673
diff -u -b -r1.7672 -r1.7673
--- ChangeLog	6 Jun 2006 12:13:32 -0000	1.7672
+++ ChangeLog	6 Jun 2006 12:21:21 -0000	1.7673
@@ -1,3 +1,12 @@
+2006-06-06  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/plaf/basic/BasicInternalFrameUI.java
+	(ShowSystemMenuAction): New class.
+	(installKeyboardActions): Implemented.
+	(uninstallKeyboardActions): Implemented.
+	* javax/swing/plaf/metal/MetalInternalFrameUI.java
+	(installKeyboardActions): Overridden to remove showSystemMenu action.
+
 2006-06-06  Chris Burdess  <dog@gnu.org>
 
 	* gnu/xml/transform/TransformerImpl.java: Check type of created



From MAILER-DAEMON Tue Jun 06 08:54:44 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fnb52-0008Lt-IE
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 08:54:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fnb50-0008La-Hn
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:54:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fnb4y-0008LO-Tk
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:54:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fnb4y-0008LL-Nx
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:54:40 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnbCL-0004H0-PC
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 09:02:17 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fnb4x-0002B5-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 08:54:39 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fnb4x-0002B0-CF
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 12:54:39 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fnb4x-0002B0-CF@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Tue, 06 Jun 2006 12:54:39 +0000
Subject: [commit-cp] classpath/javax/swing JMenuBar.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 12:54:42 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/06 12:54:39

Modified files:
	javax/swing    : JMenuBar.java 
	.              : ChangeLog 

Log message:
	2006-06-06  Roman Kennke  <kennke@aicas.com>
	
		PR 27522
		* javax/swing/JMenuBar.java
		(processKeyBindingHelper): Added null check to prevent NPE.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JMenuBar.java?cvsroot=classpath&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7673&r2=1.7674

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7673
retrieving revision 1.7674
diff -u -b -r1.7673 -r1.7674
--- ChangeLog	6 Jun 2006 12:21:21 -0000	1.7673
+++ ChangeLog	6 Jun 2006 12:54:37 -0000	1.7674
@@ -1,5 +1,11 @@
 2006-06-06  Roman Kennke  <kennke@aicas.com>
 
+	PR 27522
+	* javax/swing/JMenuBar.java
+	(processKeyBindingHelper): Added null check to prevent NPE.
+
+2006-06-06  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/plaf/basic/BasicInternalFrameUI.java
 	(ShowSystemMenuAction): New class.
 	(installKeyboardActions): Implemented.



From MAILER-DAEMON Tue Jun 06 08:57:35 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fnb7n-0001Ql-2k
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 08:57:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fnb7k-0001PY-Am
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:57:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fnb7i-0001PE-Kk
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:57:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fnb7i-0001PB-EQ
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 08:57:30 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnbF5-0004ib-Ei
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 09:05:07 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fnb7h-0002Hj-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 08:57:29 -0400
Received: from audriusa by savannah.gnu.org with local (Exim 4.50)
	id 1Fnb7g-0002Hd-14
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 12:57:29 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fnb7g-0002Hd-14@savannah.gnu.org>
From: Audrius Meskauskas <audriusa@bluewin.ch>
Date: Tue, 06 Jun 2006 12:57:28 +0000
Subject: [commit-cp] classpath/gnu/javax/swing/text/html/parser html...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 12:57:32 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Audrius Meskauskas <audriusa>	06/06/06 12:57:27

Modified files:
	gnu/javax/swing/text/html/parser: htmlAttributeSet.java 
	.              : ChangeLog 
Added files:
	gnu/javax/swing/text/html/parser: SmallHtmlAttributeSet.java 

Log message:
	2006-06-06  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
	
		* gnu/javax/swing/text/html/htmlAttributeSet.java
		(clone): New method. (copyAttributes): New method.
		(getResolveParent): Comment fix. (getAttribute):
		Rewritten. (addAttribute): Rewritten.
		* gnu/javax/swing/text/html/SmallHtmlAttributeSet.java:
		New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7674&r2=1.7675

Patches:

Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7674
retrieving revision 1.7675
diff -u -b -r1.7674 -r1.7675
--- ChangeLog	6 Jun 2006 12:54:37 -0000	1.7674
+++ ChangeLog	6 Jun 2006 12:57:27 -0000	1.7675
@@ -1,3 +1,12 @@
+2006-06-06  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
+	* gnu/javax/swing/text/html/htmlAttributeSet.java
+	(clone): New method. (copyAttributes): New method.
+	(getResolveParent): Comment fix. (getAttribute):
+	Rewritten. (addAttribute): Rewritten.
+	* gnu/javax/swing/text/html/SmallHtmlAttributeSet.java:
+	New file.
+
 2006-06-06  Roman Kennke  <kennke@aicas.com>
 
 	PR 27522




From MAILER-DAEMON Tue Jun 06 09:21:27 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnbUt-0003r9-JO
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 09:21:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnbUs-0003ql-62
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 09:21:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnbUr-0003qJ-7o
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 09:21:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnbUr-0003qE-1f
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 09:21:25 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnbcE-00078Q-DK
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 09:29:02 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnbUo-0003Jq-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 09:21:22 -0400
Received: from dog by savannah.gnu.org with local (Exim 4.50)
	id 1FnbUn-0003Jn-QP
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 13:21:22 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnbUn-0003Jn-QP@savannah.gnu.org>
From: Chris Burdess <d09@hush.ai>
Date: Tue, 06 Jun 2006 13:21:21 +0000
Subject: [commit-cp] classpath ChangeLog gnu/xml/transform/Transform...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 13:21:26 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Chris Burdess <dog>	06/06/06 13:21:21

Modified files:
	.              : ChangeLog 
	gnu/xml/transform: TransformerImpl.java 

Log message:
	2006-06-06  Chris Burdess  <dog@gnu.org>
	
		* gnu/xml/transform/TransformerImpl.java: Check type of created
		  document (more cases).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7675&r2=1.7676
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/xml/transform/TransformerImpl.java?cvsroot=classpath&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7675
retrieving revision 1.7676
diff -u -b -r1.7675 -r1.7676
--- ChangeLog	6 Jun 2006 12:57:27 -0000	1.7675
+++ ChangeLog	6 Jun 2006 13:21:20 -0000	1.7676
@@ -1,3 +1,8 @@
+2006-06-06  Chris Burdess  <dog@gnu.org>
+
+	* gnu/xml/transform/TransformerImpl.java: Check type of created
+	  document (more cases).
+
 2006-06-06  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	* gnu/javax/swing/text/html/htmlAttributeSet.java

Index: gnu/xml/transform/TransformerImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/transform/TransformerImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gnu/xml/transform/TransformerImpl.java	6 Jun 2006 12:13:33 -0000	1.13
+++ gnu/xml/transform/TransformerImpl.java	6 Jun 2006 13:21:21 -0000	1.14
@@ -320,7 +320,7 @@
       }
     if (indent)
       {
-        if (created)
+        if (created && parent instanceof DomDocument)
           {
             DomDocument domDoc = (DomDocument) parent;
             domDoc.setBuilding(true);
@@ -332,7 +332,7 @@
           (Document) parent :
           parent.getOwnerDocument();
         reindent(resultDoc, parent, 0);
-        if (created)
+        if (created && parent instanceof DomDocument)
           {
             DomDocument domDoc = (DomDocument) parent;
             domDoc.setBuilding(false);



From MAILER-DAEMON Tue Jun 06 09:51:43 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnbyB-0006Oc-AJ
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 09:51:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fnby9-0006OR-RS
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 09:51:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fnby8-0006OF-HT
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 09:51:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fnby8-0006OC-BA
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 09:51:40 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fnc5V-0001nm-U7
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 09:59:18 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fnby7-0006bs-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 09:51:39 -0400
Received: from audriusa by savannah.gnu.org with local (Exim 4.50)
	id 1Fnby6-0006bp-KR
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 13:51:38 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fnby6-0006bp-KR@savannah.gnu.org>
From: Audrius Meskauskas <audriusa@bluewin.ch>
Date: Tue, 06 Jun 2006 13:51:38 +0000
Subject: [commit-cp] classpath/gnu/javax/swing/text/html/parser html...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 13:51:42 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Audrius Meskauskas <audriusa>	06/06/06 13:51:38

Modified files:
	gnu/javax/swing/text/html/parser: htmlAttributeSet.java 
	.              : ChangeLog 

Log message:
	2006-06-06  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
	
		* gnu/javax/swing/text/html/htmlAttributeSet.java
		(getAttributeNames): Rewritten

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7676&r2=1.7677

Patches:

Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7676
retrieving revision 1.7677
diff -u -b -r1.7676 -r1.7677
--- ChangeLog	6 Jun 2006 13:21:20 -0000	1.7676
+++ ChangeLog	6 Jun 2006 13:51:36 -0000	1.7677
@@ -1,3 +1,8 @@
+2006-06-06  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
+	* gnu/javax/swing/text/html/htmlAttributeSet.java
+	(getAttributeNames): Rewritten
+
 2006-06-06  Chris Burdess  <dog@gnu.org>
 
 	* gnu/xml/transform/TransformerImpl.java: Check type of created



From MAILER-DAEMON Tue Jun 06 10:12:56 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FncIi-0008HY-07
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 10:12:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FncIg-0008Gb-Ng
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 10:12:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FncIf-0008Fg-1k
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 10:12:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FncIe-0008FY-OW
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 10:12:52 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FncQ2-0005Ou-NR
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 10:20:30 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FncIe-0007I2-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 10:12:52 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FncId-0007Hy-3I
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 14:12:52 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FncId-0007Hy-3I@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Tue, 06 Jun 2006 14:12:51 +0000
Subject: [commit-cp] classpath/javax/swing MenuSelectionManager.java...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 14:12:55 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/06 14:12:50

Modified files:
	javax/swing    : MenuSelectionManager.java 
	.              : ChangeLog 

Log message:
	2006-06-06  Roman Kennke  <kennke@aicas.com>
	
		PR 27523
		* javax/swing/MenuSelectionManager.java
		(processKeyEvent): Added check to avoid
		ArrayIndexOutOfBoundsException.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/MenuSelectionManager.java?cvsroot=classpath&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7677&r2=1.7678

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7677
retrieving revision 1.7678
diff -u -b -r1.7677 -r1.7678
--- ChangeLog	6 Jun 2006 13:51:36 -0000	1.7677
+++ ChangeLog	6 Jun 2006 14:12:50 -0000	1.7678
@@ -1,3 +1,10 @@
+2006-06-06  Roman Kennke  <kennke@aicas.com>
+
+	PR 27523
+	* javax/swing/MenuSelectionManager.java
+	(processKeyEvent): Added check to avoid
+	ArrayIndexOutOfBoundsException.
+
 2006-06-06  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	* gnu/javax/swing/text/html/htmlAttributeSet.java



From MAILER-DAEMON Tue Jun 06 11:12:14 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FndE6-0002Tn-6P
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 11:12:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FndE5-0002Ti-2s
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 11:12:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FndE4-0002TV-GK
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 11:12:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FndE4-0002TS-Ax
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 11:12:12 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FndLS-0002iv-P9
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 11:19:50 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FndE3-0001A1-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 11:12:11 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FndE2-00019y-RR
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:12:11 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FndE2-00019y-RR@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Tue, 06 Jun 2006 15:12:10 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JSplitPane.java...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 15:12:13 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/06 15:12:10

Modified files:
	.              : ChangeLog 
	javax/swing    : JSplitPane.java 
	javax/swing/plaf/basic: BasicLookAndFeel.java 
	                        BasicSplitPaneUI.java 

Log message:
	2006-06-06  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JSplitPane.java
		(AccessibleJSplitPane): API doc fixes,
		(setDividerLocation): Likewise,
		* javax/swing/plaf/basic/BasicLookAndFeel.java
		(initComponentDefaults): Additions to SplitPane.ancestorInputMap,
		* javax/swing/plaf/basic/BasicSplitPaneUI.java
		(getInputMap): New method,
		(getActionMap): New method,
		(createActionMap): New method,
		(installKeyboardActions): Implemented,
		(uninstallKeyboardActions): Implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7678&r2=1.7679
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JSplitPane.java?cvsroot=classpath&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java?cvsroot=classpath&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java?cvsroot=classpath&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7678
retrieving revision 1.7679
diff -u -b -r1.7678 -r1.7679
--- ChangeLog	6 Jun 2006 14:12:50 -0000	1.7678
+++ ChangeLog	6 Jun 2006 15:12:08 -0000	1.7679
@@ -1,3 +1,17 @@
+2006-06-06  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/JSplitPane.java
+	(AccessibleJSplitPane): API doc fixes,
+	(setDividerLocation): Likewise,
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	(initComponentDefaults): Additions to SplitPane.ancestorInputMap,
+	* javax/swing/plaf/basic/BasicSplitPaneUI.java
+	(getInputMap): New method,
+	(getActionMap): New method,
+	(createActionMap): New method,
+	(installKeyboardActions): Implemented,
+	(uninstallKeyboardActions): Implemented.
+
 2006-06-06  Roman Kennke  <kennke@aicas.com>
 
 	PR 27523

Index: javax/swing/JSplitPane.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/JSplitPane.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- javax/swing/JSplitPane.java	3 May 2006 18:04:12 -0000	1.17
+++ javax/swing/JSplitPane.java	6 Jun 2006 15:12:10 -0000	1.18
@@ -108,7 +108,7 @@
 
     /**
      * Returns an object that provides access to the current, minimum and 
-     * maximum values for the {@link JSlider}.  Since this class implements 
+     * maximum values for the {@link JSplitPane}.  Since this class implements 
      * {@link AccessibleValue}, it returns itself.
      *
      * @return The accessible value.
@@ -136,9 +136,9 @@
      * listeners.  If the supplied value is <code>null</code>, this method 
      * does nothing and returns <code>false</code>.
      *
-     * @param value  the new slider value (<code>null</code> permitted).
+     * @param value  the new divider location (<code>null</code> permitted).
      *
-     * @return <code>true</code> if the slider value is updated, and 
+     * @return <code>true</code> if the divider location value is updated, and 
      *     <code>false</code> otherwise.
      */
     public boolean setCurrentAccessibleValue(Number value)
@@ -699,7 +699,8 @@
    * @param proportionalLocation A double that describes the location of the
    *        divider.
    *
-   * @throws IllegalArgumentException DOCUMENT ME!
+   * @throws IllegalArgumentException if <code>proportionalLocation</code> is
+   *     not in the range from 0.0 to 1.0 inclusive.
    */
   public void setDividerLocation(double proportionalLocation)
   {

Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- javax/swing/plaf/basic/BasicLookAndFeel.java	10 Apr 2006 21:06:55 -0000	1.90
+++ javax/swing/plaf/basic/BasicLookAndFeel.java	6 Jun 2006 15:12:10 -0000	1.91
@@ -1,5 +1,5 @@
 /* BasicLookAndFeel.java --
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -1147,14 +1147,16 @@
         "F8",  "startResize",
         "END",  "selectMax",
         "HOME",  "selectMin",
-        "LEFT",  "negativeIncremnent",
+        "LEFT",  "negativeIncrement",
         "KP_UP", "negativeIncrement",
         "KP_DOWN", "positiveIncrement",
         "UP",  "negativeIncrement",
         "RIGHT", "positiveIncrement",
         "KP_LEFT", "negativeIncrement",
         "DOWN",  "positiveIncrement",
-        "KP_RIGHT", "positiveIncrement"
+        "KP_RIGHT", "positiveIncrement",
+        "shift ctrl pressed TAB", "focusOutBackward",
+        "ctrl pressed TAB", "focusOutForward"
       }),
       "SplitPane.background", new ColorUIResource(light),
       "SplitPane.border", new BasicBorders.SplitPaneBorder(null, null),

Index: javax/swing/plaf/basic/BasicSplitPaneUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- javax/swing/plaf/basic/BasicSplitPaneUI.java	17 Apr 2006 07:41:05 -0000	1.28
+++ javax/swing/plaf/basic/BasicSplitPaneUI.java	6 Jun 2006 15:12:10 -0000	1.29
@@ -1,5 +1,5 @@
 /* BasicSplitPaneUI.java --
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,8 +38,6 @@
 
 package javax.swing.plaf.basic;
 
-import gnu.classpath.NotImplementedException;
-
 import java.awt.Canvas;
 import java.awt.Color;
 import java.awt.Component;
@@ -57,11 +55,17 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
+import javax.swing.AbstractAction;
+import javax.swing.ActionMap;
+import javax.swing.InputMap;
 import javax.swing.JComponent;
+import javax.swing.JSlider;
 import javax.swing.JSplitPane;
 import javax.swing.KeyStroke;
 import javax.swing.LookAndFeel;
+import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
+import javax.swing.plaf.ActionMapUIResource;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.SplitPaneUI;
 import javax.swing.plaf.UIResource;
@@ -1046,21 +1050,143 @@
   }
 
   /**
-   * This method installs the keyboard actions for the JSplitPane.
+   * Returns the input map for the specified condition.
+   * 
+   * @param condition  the condition.
+   * 
+   * @return The input map.
+   */
+  InputMap getInputMap(int condition) 
+  {
+    if (condition == JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+      return (InputMap) UIManager.get("SplitPane.ancestorInputMap");
+    return null;
+  }
+
+  /**
+   * Returns the action map for the {@link JSplitPane}.  All sliders share
+   * a single action map which is created the first time this method is 
+   * called, then stored in the UIDefaults table for subsequent access.
+   * 
+   * @return The shared action map.
+   */
+  ActionMap getActionMap() 
+  {
+    ActionMap map = (ActionMap) UIManager.get("SplitPane.actionMap");
+
+    if (map == null) // first time here
+      {
+        map = createActionMap();
+        if (map != null)
+          UIManager.put("SplitPane.actionMap", map);
+      }
+    return map;
+  }
+
+  /**
+   * Creates the action map shared by all {@link JSlider} instances.
+   * This method is called once by {@link #getActionMap()} when it 
+   * finds no action map in the UIDefaults table...after the map is 
+   * created, it gets added to the defaults table so that subsequent 
+   * calls to {@link #getActionMap()} will return the same shared 
+   * instance.
+   * 
+   * @return The action map.
+   */
+  ActionMap createActionMap()
+  {
+    ActionMap map = new ActionMapUIResource();
+    map.put("toggleFocus", 
+            new AbstractAction("toggleFocus") {
+              public void actionPerformed(ActionEvent event)
+              {
+                // FIXME: What to do here?
+              }
+            }
+    );
+    map.put("startResize", 
+            new AbstractAction("startResize") {
+              public void actionPerformed(ActionEvent event)
+              {
+                splitPane.requestFocus();
+              }
+            }
+    );
+    map.put("selectMax", 
+            new AbstractAction("selectMax") {
+              public void actionPerformed(ActionEvent event)
+              {
+                splitPane.setDividerLocation(1.0);
+              }
+            }
+    );
+    map.put("selectMin", 
+            new AbstractAction("selectMin") {
+              public void actionPerformed(ActionEvent event)
+              {
+                splitPane.setDividerLocation(0.0);
+              }
+            }
+    );
+    map.put("negativeIncrement", 
+            new AbstractAction("negativeIncrement") {
+              public void actionPerformed(ActionEvent event)
+              {
+                setDividerLocation(splitPane, Math.max(dividerLocation 
+                    - KEYBOARD_DIVIDER_MOVE_OFFSET, 0));
+              }
+            }
+    );
+    map.put("positiveIncrement", 
+            new AbstractAction("positiveIncrement") {
+              public void actionPerformed(ActionEvent event)
+              {
+                setDividerLocation(splitPane, dividerLocation 
+                    + KEYBOARD_DIVIDER_MOVE_OFFSET);
+              }
+            }
+    );
+    map.put("focusOutBackward",
+            new AbstractAction("focusOutBackward") {
+              public void actionPerformed(ActionEvent event)
+              {
+                // FIXME: implement this
+              }
+            }
+    );    
+    map.put("focusOutForward",
+            new AbstractAction("focusOutForward") {
+              public void actionPerformed(ActionEvent event)
+              {
+                // FIXME: implement this
+              }
+            }
+    );    
+    return map;
+  }
+
+  /**
+   * Installs any keyboard actions. The list of keys that need to be bound are
+   * listed in Basic look and feel's defaults.
    */
   protected void installKeyboardActions()
-    throws NotImplementedException
   {
-    // FIXME: implement.
+    InputMap keyMap = getInputMap(
+        JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+    SwingUtilities.replaceUIInputMap(splitPane, 
+        JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, keyMap);
+    ActionMap map = getActionMap();
+    SwingUtilities.replaceUIActionMap(splitPane, map);
   }
 
   /**
    * This method reverses the work done in installKeyboardActions.
    */
   protected void uninstallKeyboardActions()
-    throws NotImplementedException
   {
-    // FIXME: implement.
+    SwingUtilities.replaceUIActionMap(splitPane, null);
+    SwingUtilities.replaceUIInputMap(splitPane, 
+        JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, null);
   }
 
   /**



From MAILER-DAEMON Tue Jun 06 11:28:06 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FndTS-0003Gp-KU
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 11:28:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FndTS-0003G9-1R
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 11:28:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FndTQ-0003Ee-NG
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 11:28:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FndTQ-0003EU-JA
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 11:28:04 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fndap-0003zI-4j
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 11:35:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FndTK-0001h8-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 11:27:58 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FndTJ-0001h5-I7
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:27:58 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FndTJ-0001h5-I7@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Tue, 06 Jun 2006 15:27:57 +0000
Subject: [commit-cp] classpath ChangeLog native/plugin/gcjwebplugin.cc
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 15:28:06 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/06 15:27:57

Modified files:
	.              : ChangeLog 
	native/plugin  : gcjwebplugin.cc 

Log message:
	2006-06-06  Lillian Angel  <langel@redhat.com>
	
	        * native/plugin/gcjwebplugin.cc:
	        Fixed failure message and commenting.
	        (NP_Initialize): Added more comments.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7679&r2=1.7680
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/gcjwebplugin.cc?cvsroot=classpath&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7679
retrieving revision 1.7680
diff -u -b -r1.7679 -r1.7680
--- ChangeLog	6 Jun 2006 15:12:08 -0000	1.7679
+++ ChangeLog	6 Jun 2006 15:27:56 -0000	1.7680
@@ -1,3 +1,9 @@
+2006-06-06  Lillian Angel  <langel@redhat.com>
+	
+	* native/plugin/gcjwebplugin.cc:
+	Fixed failure message and commenting.
+	(NP_Initialize): Added more comments.
+
 2006-06-06  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/JSplitPane.java

Index: native/plugin/gcjwebplugin.cc
===================================================================
RCS file: /cvsroot/classpath/classpath/native/plugin/gcjwebplugin.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- native/plugin/gcjwebplugin.cc	5 Jun 2006 18:20:15 -0000	1.3
+++ native/plugin/gcjwebplugin.cc	6 Jun 2006 15:27:57 -0000	1.4
@@ -136,7 +136,8 @@
   "Your whitelist file is \"" WHITELIST_FILENAME "\"."
 #define FAILURE_MESSAGE                                                     \
   "This page wants to load an applet.\n"                                    \
-  "There is no appletviewer installed in \"" APPLETVIEWER_EXECUTABLE "\"."  \
+  "The appletviewer is missing or not installed properly in \""         \
+  APPLETVIEWER_EXECUTABLE "\"."        
 
 // Documentbase retrieval required definition.
 static NS_DEFINE_IID (kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID);
@@ -144,7 +145,7 @@
 // Browser function table.
 static NPNetscapeFuncs browserFunctions;
 
-// Keeps track of initialization. NP_INITIALIZE should only be
+// Keeps track of initialization. NP_Initialize should only be
 // called once.
 bool initialized = false;
 
@@ -1559,6 +1560,11 @@
 // implement and initializes a local table with browser functions that
 // we may wish to call.  Called once, after browser startup and before
 // the first plugin instance is created.
+// The field 'initialized' is set to true once this function has
+// finished. If 'initialized' is already true at the beginning of
+// this function, then it is evident that NP_Initialize has already
+// been called. There is no need to call this function more than twice and
+// this workaround avoids any duplicate calls.
 NPError
 NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
 {



From MAILER-DAEMON Tue Jun 06 11:35:02 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FndaA-0006KD-3M
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 11:35:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fnda9-0006Ju-0m
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 11:35:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fnda7-0006JS-KR
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 11:35:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fnda7-0006JN-AJ
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 11:34:59 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FndhV-0004yD-SW
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 11:42:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fnda6-000226-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 11:34:58 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fnda5-00021y-4L
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:34:58 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fnda5-00021y-4L@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Tue, 06 Jun 2006 15:34:57 +0000
Subject: [commit-cp] classpath/javax/swing JTree.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 15:35:01 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/06 15:34:56

Modified files:
	javax/swing    : JTree.java 
	.              : ChangeLog 

Log message:
	2006-06-06  Roman Kennke  <kennke@aicas.com>
	
		PR 27651
		* javax/swing/JTree.java
		(JTree(TreeModel)): Call updateUI() before setModel().
		(setModel): Don't call updateUI here.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JTree.java?cvsroot=classpath&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7680&r2=1.7681

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7680
retrieving revision 1.7681
diff -u -b -r1.7680 -r1.7681
--- ChangeLog	6 Jun 2006 15:27:56 -0000	1.7680
+++ ChangeLog	6 Jun 2006 15:34:56 -0000	1.7681
@@ -1,3 +1,10 @@
+2006-06-06  Roman Kennke  <kennke@aicas.com>
+
+	PR 27651
+	* javax/swing/JTree.java
+	(JTree(TreeModel)): Call updateUI() before setModel().
+	(setModel): Don't call updateUI here.
+
 2006-06-06  Lillian Angel  <langel@redhat.com>
 	
 	* native/plugin/gcjwebplugin.cc:
@@ -20,6 +27,13 @@
 
 2006-06-06  Roman Kennke  <kennke@aicas.com>
 
+	PR 27651
+	* javax/swing/JTree.java
+	(JTree(TreeModel)): Call updateUI() before setModel().
+	(setModel): Don't call updateUI here.
+
+2006-06-06  Roman Kennke  <kennke@aicas.com>
+
 	PR 27523
 	* javax/swing/MenuSelectionManager.java
 	(processKeyEvent): Added check to avoid



From MAILER-DAEMON Tue Jun 06 12:01:46 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fne02-0001m1-O3
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 12:01:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fne01-0001lG-3K
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 12:01:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fndzz-0001kr-Rf
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 12:01:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fndzz-0001km-9H
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 12:01:43 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fne7O-0007Ot-3i
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 12:09:22 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fndzy-0003aW-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 12:01:42 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1Fndzx-0003aT-Jk
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 16:01:42 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fndzx-0003aT-Jk@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Tue, 06 Jun 2006 16:01:41 +0000
Subject: [commit-cp] classpath ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 16:01:45 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/06 16:01:41

Modified files:
	.              : ChangeLog 

Log message:
	Removed Roman's duplicated entry.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7681&r2=1.7682

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7681
retrieving revision 1.7682
diff -u -b -r1.7681 -r1.7682
--- ChangeLog	6 Jun 2006 15:34:56 -0000	1.7681
+++ ChangeLog	6 Jun 2006 16:01:41 -0000	1.7682
@@ -27,13 +27,6 @@
 
 2006-06-06  Roman Kennke  <kennke@aicas.com>
 
-	PR 27651
-	* javax/swing/JTree.java
-	(JTree(TreeModel)): Call updateUI() before setModel().
-	(setModel): Don't call updateUI here.
-
-2006-06-06  Roman Kennke  <kennke@aicas.com>
-
 	PR 27523
 	* javax/swing/MenuSelectionManager.java
 	(processKeyEvent): Added check to avoid



From MAILER-DAEMON Tue Jun 06 13:21:06 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnfEo-0002Km-Cx
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 13:21:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnfEm-0002KR-T0
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 13:21:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnfEk-0002Jo-Hj
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 13:21:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnfEk-0002Jl-BS
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 13:21:02 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnfMA-0001JO-1i
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 13:28:42 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnfEj-0005sT-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 13:21:01 -0400
Received: from audriusa by savannah.gnu.org with local (Exim 4.50)
	id 1FnfEh-0005sN-Tf
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 17:21:00 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnfEh-0005sN-Tf@savannah.gnu.org>
From: Audrius Meskauskas <audriusa@bluewin.ch>
Date: Tue, 06 Jun 2006 17:20:59 +0000
Subject: [commit-cp] classpath/gnu/javax/swing/text/html CharacterAt...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 17:21:05 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Audrius Meskauskas <audriusa>	06/06/06 17:20:59

Modified files:
	gnu/javax/swing/text/html: CharacterAttributeTranslator.java 
	.              : ChangeLog 

Log message:
	2006-06-06  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
	
		* gnu/javax/swing/text/html/CharacterAttributeTranslator.java
		(getColor): Added support for "rgb(red, green, blue)" notation.
		(translateTag): Use Boolean.TRUE, not new Boolean

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7682&r2=1.7683

Patches:

Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7682
retrieving revision 1.7683
diff -u -b -r1.7682 -r1.7683
--- ChangeLog	6 Jun 2006 16:01:41 -0000	1.7682
+++ ChangeLog	6 Jun 2006 17:20:59 -0000	1.7683
@@ -1,3 +1,9 @@
+2006-06-06  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
+	* gnu/javax/swing/text/html/CharacterAttributeTranslator.java
+	(getColor): Added support for "rgb(red, green, blue)" notation.
+	(translateTag): Use Boolean.TRUE, not new Boolean().
+
 2006-06-06  Roman Kennke  <kennke@aicas.com>
 
 	PR 27651



From MAILER-DAEMON Tue Jun 06 13:26:26 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnfJy-0004XF-93
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 13:26:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnfJx-0004Vl-2M
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 13:26:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnfJv-0004U7-SN
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 13:26:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnfJv-0004U1-PA
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 13:26:23 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnfRL-0001kS-JB
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 13:34:03 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnfJu-0005wT-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 13:26:22 -0400
Received: from audriusa by savannah.gnu.org with local (Exim 4.50)
	id 1FnfJu-0005wQ-1s
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 17:26:22 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnfJu-0005wQ-1s@savannah.gnu.org>
From: Audrius Meskauskas <audriusa@bluewin.ch>
Date: Tue, 06 Jun 2006 17:26:22 +0000
Subject: [commit-cp] classpath/gnu/javax/swing/text/html CharacterAt...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 17:26:25 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Audrius Meskauskas <audriusa>	06/06/06 17:26:21

Modified files:
	gnu/javax/swing/text/html: CharacterAttributeTranslator.java 
	.              : ChangeLog 

Log message:
	2006-06-06  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
	
		* gnu/javax/swing/text/html/CharacterAttributeTranslator.java
		(getColor): Removed debugging code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7683&r2=1.7684

Patches:

Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7683
retrieving revision 1.7684
diff -u -b -r1.7683 -r1.7684
--- ChangeLog	6 Jun 2006 17:20:59 -0000	1.7683
+++ ChangeLog	6 Jun 2006 17:26:21 -0000	1.7684
@@ -1,6 +1,11 @@
 2006-06-06  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	* gnu/javax/swing/text/html/CharacterAttributeTranslator.java
+	(getColor): Removed debugging code.
+
+2006-06-06  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
+	* gnu/javax/swing/text/html/CharacterAttributeTranslator.java
 	(getColor): Added support for "rgb(red, green, blue)" notation.
 	(translateTag): Use Boolean.TRUE, not new Boolean().
 



From MAILER-DAEMON Tue Jun 06 14:27:50 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FngHO-0007zy-EC
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 14:27:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FngHM-0007zR-5G
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 14:27:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FngHK-0007xh-5A
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 14:27:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FngHK-0007xe-2g
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 14:27:46 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FngOk-0006xX-Ei
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 14:35:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FngHJ-0007yC-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 14:27:45 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FngHI-0007y9-Fo
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 18:27:45 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FngHI-0007y9-Fo@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 06 Jun 2006 18:27:44 +0000
Subject: [commit-cp] classpath ChangeLog java/security/UnresolvedPer...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 18:27:48 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/06 18:27:44

Modified files:
	.              : ChangeLog 
	java/security  : UnresolvedPermission.java 

Log message:
		* java/security/UnresolvedPermission.java (getUnresolvedType): New
		method.
		(getUnresolvedName): New method.
		(getUnresolvedActions): New method.
		(getUnresolvedCerts): New method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7684&r2=1.7685
http://cvs.savannah.gnu.org/viewcvs/classpath/java/security/UnresolvedPermission.java?cvsroot=classpath&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7684
retrieving revision 1.7685
diff -u -b -r1.7684 -r1.7685
--- ChangeLog	6 Jun 2006 17:26:21 -0000	1.7684
+++ ChangeLog	6 Jun 2006 18:27:43 -0000	1.7685
@@ -1,3 +1,11 @@
+2006-06-06  Tom Tromey  <tromey@redhat.com>
+
+	* java/security/UnresolvedPermission.java (getUnresolvedType): New
+	method.
+	(getUnresolvedName): New method.
+	(getUnresolvedActions): New method.
+	(getUnresolvedCerts): New method.
+
 2006-06-06  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	* gnu/javax/swing/text/html/CharacterAttributeTranslator.java

Index: java/security/UnresolvedPermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/UnresolvedPermission.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- java/security/UnresolvedPermission.java	2 Jul 2005 20:32:40 -0000	1.11
+++ java/security/UnresolvedPermission.java	6 Jun 2006 18:27:44 -0000	1.12
@@ -201,6 +201,47 @@
   {
     return new UnresolvedPermissionCollection();
   }
+
+  /**
+   * Return the name of the class of the unresolved permission.
+   * @since 1.5
+   */
+  public String getUnresolvedType()
+  {
+    return type;
+  }
+
+  /**
+   * Return the name of the unresolved permission.
+   * @since 1.5
+   */
+  public String getUnresolvedName()
+  {
+    return name;
+  }
+
+  /**
+   * Return the actions of the unresolved permission, or null
+   * if there are no actions.
+   * @since 1.5
+   */
+  public String getUnresolvedActions()
+  {
+    return actions;
+  }
+
+  /**
+   * Return the certificates of the unresolved permission.
+   * If there are no certificates, null is returned.  Otherwise,
+   * a new array is returned.
+   * @since 1.5
+   */
+  public Certificate[] getUnresolvedCerts()
+  {
+    if (certs == null)
+      return null;
+    return (Certificate[]) certs.clone();
+  }
 } // class UnresolvedPermission
 
 /**



From MAILER-DAEMON Tue Jun 06 15:11:21 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FngxV-0000of-P7
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 15:11:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FngxT-0000nr-NG
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:11:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FngxS-0000nK-Uz
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:11:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FngxS-0000n7-Hn
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:11:18 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fnh4t-0002H2-8w
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:18:59 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FngxR-0001Mz-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 15:11:17 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FngxR-0001Mw-39
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 19:11:17 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FngxR-0001Mw-39@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 06 Jun 2006 19:11:17 +0000
Subject: [commit-cp] classpath ChangeLog include/jni.h
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 19:11:19 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/06 19:11:16

Modified files:
	.              : ChangeLog 
	include        : jni.h 

Log message:
		* include/jni.h (JDK1_1InitArgs): New struct.
		(JDK1_1AttachArgs): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7685&r2=1.7686
http://cvs.savannah.gnu.org/viewcvs/classpath/include/jni.h?cvsroot=classpath&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7685
retrieving revision 1.7686
diff -u -b -r1.7685 -r1.7686
--- ChangeLog	6 Jun 2006 18:27:43 -0000	1.7685
+++ ChangeLog	6 Jun 2006 19:11:16 -0000	1.7686
@@ -1,5 +1,10 @@
 2006-06-06  Tom Tromey  <tromey@redhat.com>
 
+	* include/jni.h (JDK1_1InitArgs): New struct.
+	(JDK1_1AttachArgs): Likewise.
+
+2006-06-06  Tom Tromey  <tromey@redhat.com>
+
 	* java/security/UnresolvedPermission.java (getUnresolvedType): New
 	method.
 	(getUnresolvedName): New method.

Index: include/jni.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/jni.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- include/jni.h	2 Jul 2005 20:32:22 -0000	1.6
+++ include/jni.h	6 Jun 2006 19:11:16 -0000	1.7
@@ -1,5 +1,5 @@
 /* jni.h
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005  Free Software Foundation
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006  Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -1584,6 +1584,45 @@
   jboolean ignoreUnrecognized;
 } JavaVMInitArgs;
 
+typedef struct JDK1_1InitArgs
+{
+  /* VM version.  Should be JNI_VERSION_1_1.  Note that before JDK
+     1.1.2, this field was named 'reserved0'.  (I don't know what the
+     current 'reserved0' field was named then.)  */
+  jint version;
+
+  /* A null-terminated array of environment strings, each of the form
+     "KEY=VALUE".  This is used to set system properties.  Note that
+     before JDK 1.1.2, this field was named 'reserved1'.  */
+  char **properties;
+
+  jint checkSource;
+  jint nativeStackSize;
+  jint javaStackSize;
+  jint minHeapSize;
+  jint maxHeapSize;
+  jint verifyMode;
+  const char *classpath;
+
+  jint (*vfprintf) (FILE *file, const char *fmt, va_list args);
+  void (*exit) (jint value);
+  void (*abort) ();
+
+  jint enableClassGC;
+  jint enableVerboseGC;
+  jint disableAsyncGC;
+
+  jint reserved0;
+  jint reserved1;
+  jint reserved2;
+} JDK1_1InitArgs;
+
+typedef struct JDK1_1AttachArgs
+{
+  /* Dummy field since C cannot have empty structs.  The name and type
+     are chosen to comply with the spec.  */
+  void *__padding;
+} JDK1_1AttachArgs;
 
 
 /* Keep c-font-lock-extra-types in alphabetical order. */



From MAILER-DAEMON Tue Jun 06 15:39:59 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnhPD-0003Td-29
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 15:39:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnhPA-0003RX-Uc
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:39:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnhP9-0003QP-8y
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:39:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnhP9-0003Q9-5t
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:39:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnhWa-0004no-6b
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:47:36 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnhP8-00030g-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 15:39:54 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FnhP7-00030c-KM
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 19:39:54 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnhP7-00030c-KM@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 06 Jun 2006 19:39:53 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/text/html/HTMLD...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 19:39:57 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/06 19:39:53

Modified files:
	.              : ChangeLog 
	javax/swing/text/html: HTMLDocument.java 

Log message:
		* javax/swing/text/html/HTMLDocument.java (SpecialAction.start):
		Implement.
		(SpecialAction.end): Removed.
		(IsindexAction.end): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7686&r2=1.7687
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/HTMLDocument.java?cvsroot=classpath&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7686
retrieving revision 1.7687
diff -u -b -r1.7686 -r1.7687
--- ChangeLog	6 Jun 2006 19:11:16 -0000	1.7686
+++ ChangeLog	6 Jun 2006 19:39:52 -0000	1.7687
@@ -1,5 +1,12 @@
 2006-06-06  Tom Tromey  <tromey@redhat.com>
 
+	* javax/swing/text/html/HTMLDocument.java (SpecialAction.start):
+	Implement.
+	(SpecialAction.end): Removed.
+	(IsindexAction.end): Likewise.
+
+2006-06-06  Tom Tromey  <tromey@redhat.com>
+
 	* include/jni.h (JDK1_1InitArgs): New struct.
 	(JDK1_1AttachArgs): Likewise.
 

Index: javax/swing/text/html/HTMLDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/HTMLDocument.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- javax/swing/text/html/HTMLDocument.java	17 May 2006 19:28:22 -0000	1.30
+++ javax/swing/text/html/HTMLDocument.java	6 Jun 2006 19:39:53 -0000	1.31
@@ -677,17 +677,6 @@
         // FIXME: Implement.
         print ("IsindexAction.start not implemented");
       }
-      
-      /**
-       * Called when an end tag is seen for one of the types of tags associated
-       * with this Action.
-       */
-      public void end(HTML.Tag t)
-        throws NotImplementedException
-      {
-        // FIXME: Implement.
-        print ("IsindexAction.end not implemented");
-      } 
     }
     
     public class ParagraphAction extends BlockAction
@@ -745,21 +734,8 @@
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
-        throws NotImplementedException
       {
-        // FIXME: Implement.
-        print ("SpecialAction.start not implemented");
-      }
-      
-      /**
-       * Called when an end tag is seen for one of the types of tags associated
-       * with this Action.
-       */
-      public void end(HTML.Tag t)
-        throws NotImplementedException
-      {
-        // FIXME: Implement.
-        print ("SpecialAction.end not implemented");
+        addSpecialElement(t, a);
       }                
     }
     



From MAILER-DAEMON Tue Jun 06 15:56:21 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fnhf3-0001Ha-73
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 15:56:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fnhf1-0001Gk-T3
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:56:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fnhf1-0001GT-9Y
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:56:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fnhf1-0001GQ-6z
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 15:56:19 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnhmS-0006BI-5e
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 16:04:00 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fnhf0-0003A3-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 15:56:18 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fnhez-0003A0-LM
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 19:56:18 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fnhez-0003A0-LM@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 06 Jun 2006 19:56:17 +0000
Subject: [commit-cp] classpath/javax/swing/text StyleContext.java Ch...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 19:56:20 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/06 19:56:17

Modified files:
	javax/swing/text: StyleContext.java 
	.              : ChangeLog 

Log message:
		* javax/swing/text/StyleContext.java (registerStaticAttributeKey):
		Javadoc fix.
		(writeAttributeSet): Implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/StyleContext.java?cvsroot=classpath&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7687&r2=1.7688

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7687
retrieving revision 1.7688
diff -u -b -r1.7687 -r1.7688
--- ChangeLog	6 Jun 2006 19:39:52 -0000	1.7687
+++ ChangeLog	6 Jun 2006 19:56:17 -0000	1.7688
@@ -1,5 +1,11 @@
 2006-06-06  Tom Tromey  <tromey@redhat.com>
 
+	* javax/swing/text/StyleContext.java (registerStaticAttributeKey):
+	Javadoc fix.
+	(writeAttributeSet): Implemented.
+
+2006-06-06  Tom Tromey  <tromey@redhat.com>
+
 	* javax/swing/text/html/HTMLDocument.java (SpecialAction.start):
 	Implement.
 	(SpecialAction.end): Removed.



From MAILER-DAEMON Tue Jun 06 16:45:32 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FniQd-0006eQ-VH
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 16:45:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FniQb-0006bv-LL
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 16:45:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FniQa-0006bg-EW
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 16:45:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FniQa-0006bd-8e
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 16:45:28 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FniY1-0001qo-Iw
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 16:53:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FniQY-0005et-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 16:45:26 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FniQX-0005ep-LB
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 20:45:26 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FniQX-0005ep-LB@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Tue, 06 Jun 2006 20:45:25 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 20:45:30 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/06 20:45:25

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicSplitPaneUI.java 
	javax/swing/plaf/metal: MetalSplitPaneDivider.java 

Log message:
	2006-06-06  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/plaf/metal/MetalSplitPaneDivider.java
		(paint): If has focus, paint special background color,
		* javax/swing/plaf/basic/BasicSplitPaneUI.java
		(FocusHandler.focusGained): Implemented,
		(FocusHandler.focusLost): Implemented.
	----------------------------------------------------------------------

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7688&r2=1.7689
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java?cvsroot=classpath&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java?cvsroot=classpath&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7688
retrieving revision 1.7689
diff -u -b -r1.7688 -r1.7689
--- ChangeLog	6 Jun 2006 19:56:17 -0000	1.7688
+++ ChangeLog	6 Jun 2006 20:45:22 -0000	1.7689
@@ -1,3 +1,11 @@
+2006-06-06  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/plaf/metal/MetalSplitPaneDivider.java
+	(paint): If has focus, paint special background color,
+	* javax/swing/plaf/basic/BasicSplitPaneUI.java
+	(FocusHandler.focusGained): Implemented,
+	(FocusHandler.focusLost): Implemented.
+
 2006-06-06  Tom Tromey  <tromey@redhat.com>
 
 	* javax/swing/text/StyleContext.java (registerStaticAttributeKey):

Index: javax/swing/plaf/basic/BasicSplitPaneUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- javax/swing/plaf/basic/BasicSplitPaneUI.java	6 Jun 2006 15:12:10 -0000	1.29
+++ javax/swing/plaf/basic/BasicSplitPaneUI.java	6 Jun 2006 20:45:25 -0000	1.30
@@ -680,7 +680,9 @@
      */
     public void focusGained(FocusEvent ev)
     {
-      // FIXME: implement.
+      // repaint the divider because its background color may change due to
+      // the focus state...
+      divider.repaint();
     }
 
     /**
@@ -690,7 +692,9 @@
      */
     public void focusLost(FocusEvent ev)
     {
-      // FIXME: implement.
+      // repaint the divider because its background color may change due to
+      // the focus state...
+      divider.repaint();
     }
   }
 

Index: javax/swing/plaf/metal/MetalSplitPaneDivider.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- javax/swing/plaf/metal/MetalSplitPaneDivider.java	11 May 2006 17:05:55 -0000	1.8
+++ javax/swing/plaf/metal/MetalSplitPaneDivider.java	6 Jun 2006 20:45:25 -0000	1.9
@@ -1,5 +1,5 @@
 /* MetalSplitPaneDivider.java
-Copyright (C) 2005 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,15 +47,15 @@
 
 import javax.swing.JSplitPane;
 import javax.swing.SwingConstants;
+import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.plaf.basic.BasicArrowButton;
 import javax.swing.plaf.basic.BasicSplitPaneDivider;
 
 /**
- * The divider that is used by the MetalSplitPaneUI.
+ * The divider that is used by the {@link MetalSplitPaneUI}.
  *
  * @author Roman Kennke (roman@kennke.org)
- *
  */
 class MetalSplitPaneDivider extends BasicSplitPaneDivider
 {
@@ -72,7 +72,7 @@
   int orientation;
   
   /**
-   * Creates a new instance of MetalSplitPaneDivider.
+   * Creates a new instance of <code>MetalSplitPaneDivider</code>.
    *
    * @param ui the <code>MetalSplitPaneUI</code> that uses this divider
    */
@@ -95,6 +95,12 @@
   {
     Dimension s = getSize();
 
+    if (splitPane.hasFocus())
+      {
+        g.setColor(UIManager.getColor("SplitPane.dividerFocusColor"));
+        g.fillRect(0, 0, s.width, s.height);
+      }
+    
     // Paint border if one exists.
     Border border = getBorder();
     if (border != null)



From MAILER-DAEMON Tue Jun 06 18:39:54 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnkDK-0007PD-RA
	for mharc-commit-classpath@gnu.org; Tue, 06 Jun 2006 18:39:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnkDJ-0007P2-9T
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 18:39:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnkDH-0007Oo-Mx
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 18:39:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnkDH-0007Ol-HR
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 18:39:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnkKk-000200-9d
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 18:47:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnkDH-0001KD-00
	for <commit-classpath@gnu.org>; Tue, 06 Jun 2006 18:39:51 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FnkDG-0001KA-DP
	for commit-classpath@gnu.org; Tue, 06 Jun 2006 22:39:51 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnkDG-0001KA-DP@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Tue, 06 Jun 2006 22:39:50 +0000
Subject: [commit-cp] classpath ChangeLog include/jni.h
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jun 2006 22:39:53 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/06 22:39:50

Modified files:
	.              : ChangeLog 
	include        : jni.h 

Log message:
	       * include/jni.h (JDK1_1InitArgs): Mark pointer-to-function types
	       with JNICALL.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7689&r2=1.7690
http://cvs.savannah.gnu.org/viewcvs/classpath/include/jni.h?cvsroot=classpath&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7689
retrieving revision 1.7690
diff -u -b -r1.7689 -r1.7690
--- ChangeLog	6 Jun 2006 20:45:22 -0000	1.7689
+++ ChangeLog	6 Jun 2006 22:39:49 -0000	1.7690
@@ -1,3 +1,8 @@
+2006-06-06  Mark Wielaard  <mark@klomp.org>
+
+	* include/jni.h (JDK1_1InitArgs): Mark pointer-to-function types
+	with JNICALL.
+
 2006-06-06  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/plaf/metal/MetalSplitPaneDivider.java

Index: include/jni.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/jni.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- include/jni.h	6 Jun 2006 19:11:16 -0000	1.7
+++ include/jni.h	6 Jun 2006 22:39:50 -0000	1.8
@@ -1604,9 +1604,9 @@
   jint verifyMode;
   const char *classpath;
 
-  jint (*vfprintf) (FILE *file, const char *fmt, va_list args);
-  void (*exit) (jint value);
-  void (*abort) ();
+  jint (JNICALL *vfprintf) (FILE *file, const char *fmt, va_list args);
+  void (JNICALL *exit) (jint value);
+  void (JNICALL *abort) (void);
 
   jint enableClassGC;
   jint enableVerboseGC;



From MAILER-DAEMON Wed Jun 07 04:04:55 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fnt27-0004gd-Iy
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 04:04:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fnt26-0004ez-8H
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 04:04:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fnt25-0004e7-DK
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 04:04:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fnt25-0004e0-2h
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 04:04:53 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fnt9d-0008Fg-2t
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 04:12:41 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fnt23-0005Bw-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 04:04:51 -0400
Received: from dog by savannah.gnu.org with local (Exim 4.50)
	id 1Fnt22-0005Br-4W
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 08:04:51 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fnt22-0005Br-4W@savannah.gnu.org>
From: Chris Burdess <d09@hush.ai>
Date: Wed, 07 Jun 2006 08:04:50 +0000
Subject: [commit-cp] classpath ChangeLog gnu/xml/stream/SAXParser.ja...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 08:04:54 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Chris Burdess <dog>	06/06/07 08:04:49

Modified files:
	.              : ChangeLog 
	gnu/xml/stream : SAXParser.java XMLParser.java 
	gnu/xml/transform: TransformerImpl.java 

Log message:
	2006-06-07  Chris Burdess  <dog@gnu.org>
	
		* gnu/xml/stream/SAXParser.java,
		  gnu/xml/stream/XMLParser.java: Add command line options for setting
		  parsing parameters (for simpler debugging).
		* gnu/xml/transform/TransformerImpl.java: Try to ensure that I/O error
		  closing output stream is propagated to application.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7690&r2=1.7691
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/xml/stream/SAXParser.java?cvsroot=classpath&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/xml/stream/XMLParser.java?cvsroot=classpath&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/xml/transform/TransformerImpl.java?cvsroot=classpath&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7690
retrieving revision 1.7691
diff -u -b -r1.7690 -r1.7691
--- ChangeLog	6 Jun 2006 22:39:49 -0000	1.7690
+++ ChangeLog	7 Jun 2006 08:04:48 -0000	1.7691
@@ -1,3 +1,11 @@
+2006-06-07  Chris Burdess  <dog@gnu.org>
+
+	* gnu/xml/stream/SAXParser.java,
+	  gnu/xml/stream/XMLParser.java: Add command line options for setting
+	  parsing parameters (for simpler debugging).
+	* gnu/xml/transform/TransformerImpl.java: Try to ensure that I/O error
+	  closing output stream is propagated to application.
+
 2006-06-06  Mark Wielaard  <mark@klomp.org>
 
 	* include/jni.h (JDK1_1InitArgs): Mark pointer-to-function types

Index: gnu/xml/stream/SAXParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/stream/SAXParser.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gnu/xml/stream/SAXParser.java	4 Mar 2006 20:45:32 -0000	1.20
+++ gnu/xml/stream/SAXParser.java	7 Jun 2006 08:04:49 -0000	1.21
@@ -976,10 +976,56 @@
   public static void main(String[] args)
     throws Exception
   {
-    SAXParser parser = new SAXParser();
-    InputSource input = new InputSource(args[0]);
-    parser.parse(input, new org.xml.sax.helpers.DefaultHandler());
-    
+    boolean validating = false;
+    boolean namespaceAware = false;
+    boolean xIncludeAware = false;
+    boolean expectCallbackClass = false;
+    String callbackClass = null;
+    int pos = 0;
+    while (pos < args.length && (args[pos].startsWith("-") || expectCallbackClass))
+      {
+        if ("-x".equals(args[pos]))
+          xIncludeAware = true;
+        else if ("-v".equals(args[pos]))
+          validating = true;
+        else if ("-n".equals(args[pos]))
+          namespaceAware = true;
+        else if ("-c".equals(args[pos]))
+          expectCallbackClass = true;
+        else if (expectCallbackClass)
+          {
+            callbackClass = args[pos];
+            expectCallbackClass = false;
+          }
+        pos++;
+      }
+    if (pos >= args.length || expectCallbackClass)
+      {
+        System.out.println("Syntax: SAXParser [-n] [-v] [-x] [-c <class>] <file> [<file2> [...]]");
+        System.out.println("\t-n: use namespace aware mode");
+        System.out.println("\t-v: use validating parser");
+        System.out.println("\t-x: use XInclude aware mode");
+        System.out.println("\t-c <class>: use specified class as callback handler (must have a no-arg public constructor)");
+        System.exit(2);
+      }
+    while (pos < args.length)
+      {
+        ContentHandler handler = null;
+        if (callbackClass != null)
+          {
+            Class t = Class.forName(callbackClass);
+            handler = (ContentHandler) t.newInstance();
+          }
+        else
+          handler = new org.xml.sax.helpers.DefaultHandler();
+        SAXParser parser = new SAXParser(validating, namespaceAware,
+                                         xIncludeAware);
+        InputSource input = new InputSource(args[pos]);
+        XMLReader reader = parser.getXMLReader();
+        reader.setContentHandler(handler);
+        reader.parse(input);
+        pos++;
+      }
   }
   
 }

Index: gnu/xml/stream/XMLParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/stream/XMLParser.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- gnu/xml/stream/XMLParser.java	20 Mar 2006 19:54:35 -0000	1.28
+++ gnu/xml/stream/XMLParser.java	7 Jun 2006 08:04:49 -0000	1.29
@@ -4250,13 +4250,34 @@
   public static void main(String[] args)
     throws Exception
   {
+    boolean validating = false;
+    boolean namespaceAware = false;
     boolean xIncludeAware = false;
-    if (args.length > 1 && "-x".equals(args[1]))
+    int pos = 0;
+    while (pos < args.length && args[pos].startsWith("-"))
+      {
+        if ("-x".equals(args[pos]))
       xIncludeAware = true;
-    XMLParser p = new XMLParser(new java.io.FileInputStream(args[0]),
-                                absolutize(null, args[0]),
-                                true, // validating
-                                true, // namespaceAware
+        else if ("-v".equals(args[pos]))
+          validating = true;
+        else if ("-n".equals(args[pos]))
+          namespaceAware = true;
+        pos++;
+      }
+    if (pos >= args.length)
+      {
+        System.out.println("Syntax: XMLParser [-n] [-v] [-x] <file> [<file2> [...]]");
+        System.out.println("\t-n: use namespace aware mode");
+        System.out.println("\t-v: use validating parser");
+        System.out.println("\t-x: use XInclude aware mode");
+        System.exit(2);
+      }
+    while (pos < args.length)
+      {
+        XMLParser p = new XMLParser(new java.io.FileInputStream(args[pos]),
+                                    absolutize(null, args[pos]),
+                                    validating, // validating
+                                    namespaceAware, // namespaceAware
                                 true, // coalescing,
                                 true, // replaceERefs
                                 true, // externalEntities
@@ -4268,7 +4289,7 @@
                                 null);
     XMLStreamReader reader = p;
     if (xIncludeAware)
-      reader = new XIncludeFilter(p, args[0], true, true, true);
+          reader = new XIncludeFilter(p, args[pos], true, true, true);
     try
       {
         int event;
@@ -4277,60 +4298,71 @@
           {
             event = reader.next();
             Location loc = reader.getLocation();
-            System.out.print(loc.getLineNumber()+":"+loc.getColumnNumber()+" ");
+                System.out.print(loc.getLineNumber() + ":" + 
+                                 loc.getColumnNumber() + " ");
             switch (event)
               {
               case XMLStreamConstants.START_DOCUMENT:
-                System.out.println("START_DOCUMENT version="+reader.getVersion()+
-                                   " encoding="+reader.getEncoding());
+                    System.out.println("START_DOCUMENT version=" +
+                                       reader.getVersion() +
+                                       " encoding=" +
+                                       reader.getEncoding());
                 break;
               case XMLStreamConstants.END_DOCUMENT:
                 System.out.println("END_DOCUMENT");
                 break;
               case XMLStreamConstants.START_ELEMENT:
-                System.out.println("START_ELEMENT "+reader.getName());
+                    System.out.println("START_ELEMENT " +
+                                       reader.getName());
                 int l = reader.getNamespaceCount();
                 for (int i = 0; i < l; i++)
-                  System.out.println("\tnamespace "+reader.getNamespacePrefix(i)+
-                                     "='"+reader.getNamespaceURI(i)+"'");
+                      System.out.println("\tnamespace " +
+                                         reader.getNamespacePrefix(i) + "='" +
+                                         reader.getNamespaceURI(i)+"'");
                 l = reader.getAttributeCount();
                 for (int i = 0; i < l; i++)
-                  System.out.println("\tattribute "+reader.getAttributeName(i)+
-                                     "='"+reader.getAttributeValue(i)+"'");
+                      System.out.println("\tattribute " +
+                                         reader.getAttributeName(i) + "='" +
+                                         reader.getAttributeValue(i) + "'");
                 break;
               case XMLStreamConstants.END_ELEMENT:
-                System.out.println("END_ELEMENT "+reader.getName());
+                    System.out.println("END_ELEMENT " + reader.getName());
                 break;
               case XMLStreamConstants.CHARACTERS:
-                System.out.println("CHARACTERS '"+encodeText(reader.getText())+"'");
+                    System.out.println("CHARACTERS '" +
+                                       encodeText(reader.getText()) + "'");
                 break;
               case XMLStreamConstants.CDATA:
-                System.out.println("CDATA '"+encodeText(reader.getText())+"'");
+                    System.out.println("CDATA '" +
+                                       encodeText(reader.getText()) + "'");
                 break;
               case XMLStreamConstants.SPACE:
-                System.out.println("SPACE '"+encodeText(reader.getText())+"'");
+                    System.out.println("SPACE '" +
+                                       encodeText(reader.getText()) + "'");
                 break;
               case XMLStreamConstants.DTD:
-                System.out.println("DTD "+reader.getText());
+                    System.out.println("DTD " + reader.getText());
                 break;
               case XMLStreamConstants.ENTITY_REFERENCE:
-                System.out.println("ENTITY_REFERENCE "+reader.getText());
+                    System.out.println("ENTITY_REFERENCE " + reader.getText());
                 break;
               case XMLStreamConstants.COMMENT:
-                System.out.println("COMMENT '"+encodeText(reader.getText())+"'");
+                    System.out.println("COMMENT '" +
+                                       encodeText(reader.getText()) + "'");
                 break;
               case XMLStreamConstants.PROCESSING_INSTRUCTION:
-                System.out.println("PROCESSING_INSTRUCTION "+reader.getPITarget()+
-                                   " "+reader.getPIData());
+                    System.out.println("PROCESSING_INSTRUCTION " +
+                                       reader.getPITarget() + " " +
+                                       reader.getPIData());
                 break;
               case START_ENTITY:
-                System.out.println("START_ENTITY "+reader.getText());
+                    System.out.println("START_ENTITY " + reader.getText());
                 break;
               case END_ENTITY:
-                System.out.println("END_ENTITY "+reader.getText());
+                    System.out.println("END_ENTITY " + reader.getText());
                 break;
               default:
-                System.out.println("Unknown event: "+event);
+                    System.out.println("Unknown event: " + event);
               }
           }
       }
@@ -4342,6 +4374,8 @@
                            " of "+l.getSystemId());
         throw e;
       }
+        pos++;
+      }
   }
 
   /**

Index: gnu/xml/transform/TransformerImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/transform/TransformerImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gnu/xml/transform/TransformerImpl.java	6 Jun 2006 13:21:21 -0000	1.14
+++ gnu/xml/transform/TransformerImpl.java	7 Jun 2006 08:04:49 -0000	1.15
@@ -576,6 +576,19 @@
           }
         catch (IOException e)
           {
+            if (errorListener != null)
+              {
+                try
+                  {
+                    errorListener.error(new TransformerException(e));
+                  }
+                catch (TransformerException e2)
+                  {
+                    e2.printStackTrace(System.err);
+                  }
+              }
+            else
+              e.printStackTrace(System.err);
           }
       }
   }



From MAILER-DAEMON Wed Jun 07 05:41:00 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnuX6-0000lH-IE
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 05:41:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnuX4-0000hv-5p
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 05:40:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnuX1-0000es-Tr
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 05:40:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnuX1-0000el-OK
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 05:40:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fnuea-000801-Oy
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 05:48:44 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnuX1-0001su-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 05:40:55 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FnuX0-0001sr-LI
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:40:54 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnuX0-0001sr-LI@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Wed, 07 Jun 2006 09:40:54 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Cairo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 09:40:58 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/07 09:40:54

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoSurface.java ComponentGraphics.java 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_CairoGraphics2D.c 
	                     gnu_java_awt_peer_gtk_CairoSurface.c 
	                     gnu_java_awt_peer_gtk_ComponentGraphics.c 
	include        : gnu_java_awt_peer_gtk_CairoGraphics2D.h 
	                 gnu_java_awt_peer_gtk_CairoSurface.h 
	                 gnu_java_awt_peer_gtk_ComponentGraphics.h 

Log message:
	       PR 27917
	       * gnu/java/awt/peer/gtk/CairoSurface.java (finalize): Call dispose.
	       * gnu/java/awt/peer/gtk/ComponentGraphics.java: Override dispose to
	       call disposeSurface.
	       (disposeSurface): New native method.
	       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
	       (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative): Free
	       pattern_pixels.
	       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
	       (Java_gnu_java_awt_peer_gtk_CairoSurface_drawSurface): Call
	       cairo_pattern_destroy.
	       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
	       (Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface):
	       New function to destroy the surface.
	       * include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Regenerated.
	       * include/gnu_java_awt_peer_gtk_CairoSurface.h: Likewise.
	       * include/gnu_java_awt_peer_gtk_ComponentGraphics.h: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7691&r2=1.7692
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoSurface.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java?cvsroot=classpath&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c?cvsroot=classpath&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c?cvsroot=classpath&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h?cvsroot=classpath&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7691
retrieving revision 1.7692
diff -u -b -r1.7691 -r1.7692
--- ChangeLog	7 Jun 2006 08:04:48 -0000	1.7691
+++ ChangeLog	7 Jun 2006 09:40:53 -0000	1.7692
@@ -8,6 +8,26 @@
 
 2006-06-06  Mark Wielaard  <mark@klomp.org>
 
+	PR 27917
+	* gnu/java/awt/peer/gtk/CairoSurface.java (finalize): Call dispose.
+	* gnu/java/awt/peer/gtk/ComponentGraphics.java: Override dispose to
+	call disposeSurface.
+	(disposeSurface): New native method.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
+	(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative): Free
+	pattern_pixels.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
+	(Java_gnu_java_awt_peer_gtk_CairoSurface_drawSurface): Call
+	cairo_pattern_destroy.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
+	(Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface):
+	New function to destroy the surface.
+	* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Regenerated.
+	* include/gnu_java_awt_peer_gtk_CairoSurface.h: Likewise.
+	* include/gnu_java_awt_peer_gtk_ComponentGraphics.h: Likewise.
+
+2006-06-06  Mark Wielaard  <mark@klomp.org>
+
 	* include/jni.h (JDK1_1InitArgs): Mark pointer-to-function types
 	with JNICALL.
 

Index: gnu/java/awt/peer/gtk/CairoSurface.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoSurface.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnu/java/awt/peer/gtk/CairoSurface.java	4 Jun 2006 19:44:39 -0000	1.6
+++ gnu/java/awt/peer/gtk/CairoSurface.java	7 Jun 2006 09:40:54 -0000	1.7
@@ -199,6 +199,14 @@
   }
 
   /**
+   * Call dispose() to clean up any native resources allocated.
+   */
+  protected void finalize()
+  {
+    dispose();
+  }
+
+  /**
    * Return a GtkImage from this Cairo surface.
    */
   public GtkImage getGtkImage()

Index: gnu/java/awt/peer/gtk/ComponentGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gnu/java/awt/peer/gtk/ComponentGraphics.java	6 Jun 2006 02:22:28 -0000	1.10
+++ gnu/java/awt/peer/gtk/ComponentGraphics.java	7 Jun 2006 09:40:54 -0000	1.11
@@ -99,6 +99,21 @@
   private native long initState(GtkComponentPeer component);
 
   /**
+   * Destroys the component surface and calls dispose on the cairo
+   * graphics2d to destroy any super class resources.
+   */
+  public void dispose()
+  {
+    disposeSurface(nativePointer);
+    super.dispose();
+  }
+
+  /**
+   * Destroys the component surface.
+   */
+  private native void disposeSurface(long nativePointer);
+
+  /**
    * Creates a cairo_t for a volatile image
    */
   protected native long initFromVolatile( long pixmapPtr, int width, int height);

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	3 Jun 2006 22:47:03 -0000	1.6
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	7 Jun 2006 09:40:54 -0000	1.7
@@ -124,6 +124,10 @@
     cairo_surface_destroy (gr->pattern_surface);
   gr->pattern_surface = NULL;
 
+  if (gr->pattern_pixels)
+    g_free(gr->pattern_pixels);
+  gr->pattern_pixels = NULL;
+
   g_free( gr );
 }
 

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c	4 Jun 2006 19:44:39 -0000	1.15
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c	7 Jun 2006 09:40:54 -0000	1.16
@@ -203,6 +203,7 @@
 
    cairo_set_source(cr, p);
    cairo_paint(cr);
+   cairo_pattern_destroy(p);
  }
   
  (*env)->ReleaseDoubleArrayElements (env, java_matrix, native_matrix, 0);

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	6 Jun 2006 02:22:28 -0000	1.13
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	7 Jun 2006 09:40:54 -0000	1.14
@@ -54,6 +54,8 @@
 
 #include "gnu_java_awt_peer_gtk_ComponentGraphics.h"
 
+#include "cairographics2d.h"
+
 static short flush_scheduled = 0;
 
 static gboolean flush (gpointer data __attribute__((unused)))
@@ -163,6 +165,30 @@
   return PTR_TO_JLONG(cr);
 }
 
+/**
+ * Disposes of the surface
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface
+  (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+   jlong value)
+{
+  struct cairographics2d *gr;
+  cairo_surface_t *surface;
+
+  gr = JLONG_TO_PTR(struct cairographics2d, value);
+
+  if (gr == NULL)
+    return;
+
+  if (gr->cr == NULL)
+    return;
+
+  surface = cairo_get_target (gr->cr);
+  if (surface != NULL)
+    cairo_surface_destroy (surface);
+}
+
 JNIEXPORT jlong JNICALL 
 Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile
   (JNIEnv *env  __attribute__ ((unused)), jobject obj __attribute__ ((unused)),

Index: include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	3 Jun 2006 22:47:03 -0000	1.2
+++ include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	7 Jun 2006 09:40:54 -0000	1.3
@@ -34,8 +34,8 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter (JNIEnv *env, jobject, jint);
 
 #ifdef __cplusplus

Index: include/gnu_java_awt_peer_gtk_CairoSurface.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- include/gnu_java_awt_peer_gtk_CairoSurface.h	4 Jun 2006 19:44:39 -0000	1.2
+++ include/gnu_java_awt_peer_gtk_CairoSurface.h	7 Jun 2006 09:40:54 -0000	1.3
@@ -17,8 +17,8 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_drawSurface (JNIEnv *env, jobject, jobject, jdoubleArray);
 JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getPixels (JNIEnv *env, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_setPixels (JNIEnv *env, jobject, jintArray);
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_newCairoContext (JNIEnv *env, jobject);
 JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer (JNIEnv *env, jobject, jint);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_newCairoContext (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint, jint);
 
 #ifdef __cplusplus

Index: include/gnu_java_awt_peer_gtk_ComponentGraphics.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- include/gnu_java_awt_peer_gtk_ComponentGraphics.h	6 Jun 2006 02:22:28 -0000	1.4
+++ include/gnu_java_awt_peer_gtk_ComponentGraphics.h	7 Jun 2006 09:40:54 -0000	1.5
@@ -11,7 +11,8 @@
 #endif
 
 JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState (JNIEnv *env, jobject, jobject);
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile(JNIEnv *env, jobject, jlong, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface (JNIEnv *env, jobject, jlong);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile (JNIEnv *env, jobject, jlong, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing (JNIEnv *env, jobject);
 JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender (JNIEnv *env, jclass);



From MAILER-DAEMON Wed Jun 07 06:25:31 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnvEB-0002c7-3P
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 06:25:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnvE9-0002c2-J2
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 06:25:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnvE8-0002bn-6X
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 06:25:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnvE8-0002bk-2r
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 06:25:28 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnvLh-00047X-OK
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 06:33:17 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnvE7-0002br-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 06:25:27 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1FnvE6-0002bo-Um
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 10:25:27 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnvE6-0002bo-Um@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Wed, 07 Jun 2006 10:25:26 +0000
Subject: [commit-cp] classpath/examples/gnu/classpath/examples/swing...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 10:25:29 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/07 10:25:26

Modified files:
	examples/gnu/classpath/examples/swing: Demo.java 
	.              : ChangeLog 

Log message:
	2006-06-07  Robert Schuster  <robertschuster@fsfe.org>
	
	        * examples/gnu/classpath/examples/swing/Demo.java:
		(mkMenuBar): Put look and feel radio buttons into
		appropriate button group.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/swing/Demo.java?cvsroot=classpath&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7692&r2=1.7693

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7692
retrieving revision 1.7693
diff -u -b -r1.7692 -r1.7693
--- ChangeLog	7 Jun 2006 09:40:53 -0000	1.7692
+++ ChangeLog	7 Jun 2006 10:25:26 -0000	1.7693
@@ -1,3 +1,9 @@
+2006-06-07  Robert Schuster  <robertschuster@fsfe.org>
+
+	* examples/gnu/classpath/examples/swing/Demo.java:
+	(mkMenuBar): Put look and feel radio buttons into 
+	appropriate button group.
+
 2006-06-07  Chris Burdess  <dog@gnu.org>
 
 	* gnu/xml/stream/SAXParser.java,



From MAILER-DAEMON Wed Jun 07 09:06:23 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fnxjr-0005jo-NN
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 09:06:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fnxjp-0005iV-DM
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:06:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fnxjm-0005ht-Fo
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:06:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fnxjm-0005hq-9w
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:06:18 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnxrN-0002f6-AC
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:14:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fnxjh-00007r-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 09:06:13 -0400
Received: from dog by savannah.gnu.org with local (Exim 4.50)
	id 1Fnxjg-00007n-1O
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 13:06:13 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fnxjg-00007n-1O@savannah.gnu.org>
From: Chris Burdess <d09@hush.ai>
Date: Wed, 07 Jun 2006 13:06:12 +0000
Subject: [commit-cp] classpath ChangeLog gnu/xml/stream/XMLParser.ja...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 13:06:21 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Chris Burdess <dog>	06/06/07 13:06:11

Modified files:
	.              : ChangeLog 
	gnu/xml/stream : XMLParser.java 
Added files:
	gnu/classpath/debug: TeeInputStream.java TeeOutputStream.java 
	                     TeeReader.java TeeWriter.java 

Log message:
	2006-06-07  Chris Burdess  <dog@gnu.org>
	
		* gnu/classpath/debug/TeeInputStream.java,
		  gnu/classpath/debug/TeeOutputStream.java,
		  gnu/classpath/debug/TeeReader.java,
		  gnu/classpath/debug/TeeWriter.java: New classes for debugging streams.
		* gnu/xml/stream/XMLParser.java: Use tee streams for debugging. Don't
		  read more characters than absolutely necessary in tryRead method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7693&r2=1.7694
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/debug/TeeInputStream.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/debug/TeeOutputStream.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/debug/TeeReader.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/debug/TeeWriter.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/xml/stream/XMLParser.java?cvsroot=classpath&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7693
retrieving revision 1.7694
diff -u -b -r1.7693 -r1.7694
--- ChangeLog	7 Jun 2006 10:25:26 -0000	1.7693
+++ ChangeLog	7 Jun 2006 13:06:10 -0000	1.7694
@@ -1,3 +1,12 @@
+2006-06-07  Chris Burdess  <dog@gnu.org>
+
+	* gnu/classpath/debug/TeeInputStream.java,
+	  gnu/classpath/debug/TeeOutputStream.java,
+	  gnu/classpath/debug/TeeReader.java,
+	  gnu/classpath/debug/TeeWriter.java: New classes for debugging streams.
+	* gnu/xml/stream/XMLParser.java: Use tee streams for debugging. Don't
+	  read more characters than absolutely necessary in tryRead method.
+
 2006-06-07  Robert Schuster  <robertschuster@fsfe.org>
 
 	* examples/gnu/classpath/examples/swing/Demo.java:

Index: gnu/xml/stream/XMLParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/stream/XMLParser.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- gnu/xml/stream/XMLParser.java	7 Jun 2006 08:04:49 -0000	1.29
+++ gnu/xml/stream/XMLParser.java	7 Jun 2006 13:06:11 -0000	1.30
@@ -56,6 +56,8 @@
 import java.io.BufferedInputStream;
 import java.io.EOFException;
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.IOException;
@@ -86,6 +88,8 @@
 import javax.xml.stream.XMLStreamReader;
 
 import gnu.java.net.CRLFInputStream;
+import gnu.classpath.debug.TeeInputStream;
+import gnu.classpath.debug.TeeReader;
 
 /**
  * An XML parser.
@@ -420,6 +424,21 @@
         ids = new HashSet();
         idrefs = new HashSet();
       }
+    String debug = System.getProperty("gnu.xml.debug.input");
+    if (debug != null)
+      {
+        try
+          {
+            File file = File.createTempFile(debug, ".xml");
+            in = new TeeInputStream(in, new FileOutputStream(file));
+          }
+        catch (IOException e)
+          {
+            RuntimeException e2 = new RuntimeException();
+            e2.initCause(e);
+            throw e2;
+          }
+      }
     pushInput(new Input(in, null, null, systemId, null, null, false, true));
   }
 
@@ -479,6 +498,21 @@
         ids = new HashSet();
         idrefs = new HashSet();
       }
+    String debug = System.getProperty("gnu.xml.debug.input");
+    if (debug != null)
+      {
+        try
+          {
+            File file = File.createTempFile(debug, ".xml");
+            reader = new TeeReader(reader, new FileWriter(file));
+          }
+        catch (IOException e)
+          {
+            RuntimeException e2 = new RuntimeException();
+            e2.initCause(e);
+            throw e2;
+          }
+      }
     pushInput(new Input(null, reader, null, systemId, null, null, false, true));
   }
 
@@ -1332,6 +1366,15 @@
         return false;
       }
     count += l2;
+    // check the characters we received first before doing additional reads
+    for (int i = 0; i < count; i++)
+      {
+        if (chars[i] != tmpBuf[i])
+          {
+            reset();
+            return false;
+          }
+      }
     while (count < len)
       {
         // force read
@@ -1341,15 +1384,14 @@
             reset();
             return false;
           }
-        tmpBuf[count++] = (char) c;
-      }
-    for (int i = 0; i < len; i++)
-      {
-        if (chars[i] != tmpBuf[i])
+        tmpBuf[count] = (char) c;
+        // check each character as it is read
+        if (chars[count] != tmpBuf[count])
           {
             reset();
             return false;
           }
+        count++;
       }
     return true;
   }
@@ -5073,7 +5115,6 @@
     void mark(int len)
       throws IOException
     {
-      //System.out.println("  mark:"+len);
       markOffset = offset;
       markLine = line;
       markColumn = column;
@@ -5116,7 +5157,9 @@
     {
       int ret;
       if (unicodeReader != null)
+        {
         ret = unicodeReader.read(b, off, len);
+        }
       else
         {
           byte[] b2 = new byte[len];

Index: gnu/classpath/debug/TeeInputStream.java
===================================================================
RCS file: gnu/classpath/debug/TeeInputStream.java
diff -N gnu/classpath/debug/TeeInputStream.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/debug/TeeInputStream.java	7 Jun 2006 13:06:11 -0000	1.1
@@ -0,0 +1,98 @@
+/* TeeInputStream.java
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is a 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 of the License, 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; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under terms
+of your choice, provided that you also meet, for each linked independent
+module, the terms and conditions of the license of that module.  An
+independent module is a module which is not derived from or based on
+this library.  If you modify this library, you may extend this exception
+to your version of the library, but you are not obligated to do so.  If
+you do not wish to do so, delete this exception statement from your
+version.  */
+
+package gnu.classpath.debug;
+
+import java.io.*;
+
+/**
+ * An input stream that copies all its input to a byte sink.
+ *
+ * @author Chris Burdess
+ */
+public class TeeInputStream
+  extends InputStream
+{
+
+  private final InputStream in;
+  private final OutputStream out;
+
+  /**
+   * Constructs a tee input stream.
+   * @param in the underlying input stream
+   * @param out the output sink
+   */
+  public TeeInputStream(InputStream in, OutputStream out)
+  {
+    this.in = in;
+    this.out = out;
+  }
+
+  public int read()
+    throws IOException
+  {
+    int ret = in.read();
+    out.write(ret);
+    out.flush();
+    return ret;
+  }
+
+  public int read(byte[] b, int off, int len)
+    throws IOException
+  {
+    int ret = in.read(b, off, len);
+    if (ret != -1)
+      {
+        out.write(b, off, ret);
+        out.flush();
+      }
+    return ret;
+  }
+
+  public void close()
+    throws IOException
+  {
+    in.close();
+    out.close();
+  }
+
+  public final boolean markSupported()
+  {
+    return false;
+  }
+  
+}

Index: gnu/classpath/debug/TeeOutputStream.java
===================================================================
RCS file: gnu/classpath/debug/TeeOutputStream.java
diff -N gnu/classpath/debug/TeeOutputStream.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/debug/TeeOutputStream.java	7 Jun 2006 13:06:11 -0000	1.1
@@ -0,0 +1,93 @@
+/* TeeOutputStream.java
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is a 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 of the License, 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; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under terms
+of your choice, provided that you also meet, for each linked independent
+module, the terms and conditions of the license of that module.  An
+independent module is a module which is not derived from or based on
+this library.  If you modify this library, you may extend this exception
+to your version of the library, but you are not obligated to do so.  If
+you do not wish to do so, delete this exception statement from your
+version.  */
+
+package gnu.classpath.debug;
+
+import java.io.*;
+
+/**
+ * An output stream that copies all its output to an additional byte sink.
+ *
+ * @author Chris Burdess
+ */
+public class TeeOutputStream
+  extends OutputStream
+{
+
+  private final OutputStream out;
+  private final OutputStream sink;
+
+  /**
+   * Constructs a tee output stream.
+   * @param out the underlying output stream
+   * @param sink the output sink
+   */
+  public TeeOutputStream(OutputStream out, OutputStream sink)
+  {
+    this.out = out;
+    this.sink = sink;
+  }
+
+  public void write(int c)
+    throws IOException
+  {
+    out.write(c);
+    sink.write(c);
+  }
+
+  public void write(byte[] b, int off, int len)
+    throws IOException
+  {
+    out.write(b, off, len);
+    sink.write(b, off, len);
+  }
+
+  public void flush()
+    throws IOException
+  {
+    out.flush();
+    sink.flush();
+  }
+
+  public void close()
+    throws IOException
+  {
+    out.close();
+    sink.close();
+  }
+
+}

Index: gnu/classpath/debug/TeeReader.java
===================================================================
RCS file: gnu/classpath/debug/TeeReader.java
diff -N gnu/classpath/debug/TeeReader.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/debug/TeeReader.java	7 Jun 2006 13:06:11 -0000	1.1
@@ -0,0 +1,98 @@
+/* TeeReader.java
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is a 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 of the License, 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; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under terms
+of your choice, provided that you also meet, for each linked independent
+module, the terms and conditions of the license of that module.  An
+independent module is a module which is not derived from or based on
+this library.  If you modify this library, you may extend this exception
+to your version of the library, but you are not obligated to do so.  If
+you do not wish to do so, delete this exception statement from your
+version.  */
+
+package gnu.classpath.debug;
+
+import java.io.*;
+
+/**
+ * A reader that copies all characters read to an output sink.
+ *
+ * @author Chris Burdess
+ */
+public class TeeReader
+  extends Reader
+{
+
+  private final Reader in;
+  private final Writer out;
+
+  /**
+   * Constructs a tee reader.
+   * @param in the input
+   * @param out the output sink
+   */
+  public TeeReader(Reader in, Writer out)
+  {
+    this.in = in;
+    this.out = out;
+  }
+
+  public int read()
+    throws IOException
+  {
+    int ret = in.read();
+    out.write(ret);
+    out.flush();
+    return ret;
+  }
+
+  public int read(char[] b, int off, int len)
+    throws IOException
+  {
+    int ret = in.read(b, off, len);
+    if (ret != -1)
+      {
+        out.write(b, off, ret);
+        out.flush();
+      }
+    return ret;
+  }
+
+  public void close()
+    throws IOException
+  {
+    in.close();
+    out.close();
+  }
+
+  public final boolean markSupported()
+  {
+    return false;
+  }
+  
+}

Index: gnu/classpath/debug/TeeWriter.java
===================================================================
RCS file: gnu/classpath/debug/TeeWriter.java
diff -N gnu/classpath/debug/TeeWriter.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/debug/TeeWriter.java	7 Jun 2006 13:06:11 -0000	1.1
@@ -0,0 +1,93 @@
+/* TeeWriter.java
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is a 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 of the License, 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; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under terms
+of your choice, provided that you also meet, for each linked independent
+module, the terms and conditions of the license of that module.  An
+independent module is a module which is not derived from or based on
+this library.  If you modify this library, you may extend this exception
+to your version of the library, but you are not obligated to do so.  If
+you do not wish to do so, delete this exception statement from your
+version.  */
+
+package gnu.classpath.debug;
+
+import java.io.*;
+
+/**
+ * A writer that copies all its output to an additional character sink.
+ *
+ * @author Chris Burdess
+ */
+public class TeeWriter
+  extends Writer
+{
+
+  private final Writer out;
+  private final Writer sink;
+
+  /**
+   * Constructs a tee writer.
+   * @param out the underlying writer
+   * @param sink the output sink
+   */
+  public TeeWriter(Writer out, Writer sink)
+  {
+    this.out = out;
+    this.sink = sink;
+  }
+
+  public void write(int c)
+    throws IOException
+  {
+    out.write(c);
+    sink.write(c);
+  }
+
+  public void write(char[] b, int off, int len)
+    throws IOException
+  {
+    out.write(b, off, len);
+    sink.write(b, off, len);
+  }
+
+  public void flush()
+    throws IOException
+  {
+    out.flush();
+    sink.flush();
+  }
+
+  public void close()
+    throws IOException
+  {
+    out.close();
+    sink.close();
+  }
+
+}



From MAILER-DAEMON Wed Jun 07 09:54:41 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnyUb-0008B8-EB
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 09:54:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnyUZ-0008Au-On
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:54:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnyUV-0008Ah-8J
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:54:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnyUU-0008Ae-Qg
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:54:34 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fnyc6-0007LV-2S
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 10:02:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnyUT-00026Y-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 09:54:33 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FnyUT-00026V-5Y
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 13:54:33 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnyUT-00026V-5Y@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Wed, 07 Jun 2006 13:54:33 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/GdkFo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 13:54:40 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/07 13:54:32

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: GdkFontPeer.java 
	include        : Makefile.am gnu_java_awt_peer_gtk_GdkFontPeer.h 
	native/jni/gtk-peer: Makefile.am 
Added files:
	gnu/java/awt/peer/gtk: FreetypeGlyphVector.java 
	include        : gnu_java_awt_peer_gtk_FreetypeGlyphVector.h 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 

Log message:
	2006-06-05  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
		* include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
		New files.
	
		* gnu/java/awt/peer/gtk/GdkFontPeer.java
		(getGlyphVector): Removed native method.
		(createGlyphVector, getStringBounds): Use new GV class.
	
		* include/Makefile.am
		* native/jni/gtk-peer/Makefile.am
		Add new files.
	
		* include/gnu_java_awt_peer_gtk_GdkFontPeer.h
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
		(getGlyphVector): Removed native method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7694&r2=1.7695
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java?cvsroot=classpath&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/include/Makefile.am?cvsroot=classpath&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GdkFontPeer.h?cvsroot=classpath&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/Makefile.am?cvsroot=classpath&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7694
retrieving revision 1.7695
diff -u -b -r1.7694 -r1.7695
--- ChangeLog	7 Jun 2006 13:06:10 -0000	1.7694
+++ ChangeLog	7 Jun 2006 13:54:30 -0000	1.7695
@@ -1,3 +1,22 @@
+2006-06-05  Sven de Marothy  <sven@physto.se>
+
+	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
+	* include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
+	New files.
+
+	* gnu/java/awt/peer/gtk/GdkFontPeer.java
+	(getGlyphVector): Removed native method.
+	(createGlyphVector, getStringBounds): Use new GV class.
+
+	* include/Makefile.am
+	* native/jni/gtk-peer/Makefile.am
+	Add new files.
+
+	* include/gnu_java_awt_peer_gtk_GdkFontPeer.h
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
+	(getGlyphVector): Removed native method.
+	
 2006-06-07  Chris Burdess  <dog@gnu.org>
 
 	* gnu/classpath/debug/TeeInputStream.java,

Index: gnu/java/awt/peer/gtk/GdkFontPeer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gnu/java/awt/peer/gtk/GdkFontPeer.java	30 May 2006 22:36:32 -0000	1.14
+++ gnu/java/awt/peer/gtk/GdkFontPeer.java	7 Jun 2006 13:54:32 -0000	1.15
@@ -47,8 +47,10 @@
 import java.awt.Toolkit;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
+import java.awt.font.GlyphMetrics;
 import java.awt.font.LineMetrics;
 import java.awt.geom.Rectangle2D;
+import java.awt.geom.Point2D;
 import java.text.CharacterIterator;
 import java.text.StringCharacterIterator;
 import java.util.Locale;
@@ -234,23 +236,18 @@
     return -1;
   }
   
-  private native GdkGlyphVector getGlyphVector(String txt, 
-                                               Font f, 
-                                               FontRenderContext ctx);
-
   public GlyphVector createGlyphVector (Font font, 
                                         FontRenderContext ctx, 
                                         CharacterIterator i)
   {
-    return getGlyphVector(buildString (i), font, ctx);
+    return new FreetypeGlyphVector(font, buildString (i), ctx);
   }
 
   public GlyphVector createGlyphVector (Font font, 
                                         FontRenderContext ctx, 
                                         int[] glyphCodes)
   {
-    return null;
-    //    return new GdkGlyphVector (font, this, ctx, glyphCodes);
+    return new FreetypeGlyphVector(font, glyphCodes, ctx);
   }
 
   public byte getBaselineFor (Font font, char c)
@@ -338,7 +335,9 @@
   public Rectangle2D getStringBounds (Font font, CharacterIterator ci, 
                                       int begin, int limit, FontRenderContext frc)
   {
-    GdkGlyphVector gv = getGlyphVector(buildString (ci, begin, limit), font, frc);
+    GlyphVector gv = new FreetypeGlyphVector( font, 
+					      buildString(ci, begin, limit),
+					      frc);
     return gv.getVisualBounds();
   }
 
@@ -373,5 +372,4 @@
     // the metrics cache.
     return Toolkit.getDefaultToolkit().getFontMetrics (font);
   }
-
 }

Index: include/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/include/Makefile.am,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- include/Makefile.am	6 Jun 2006 10:04:15 -0000	1.63
+++ include/Makefile.am	7 Jun 2006 13:54:32 -0000	1.64
@@ -41,6 +41,7 @@
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_ComponentGraphics.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h \
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkFontPeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \

Index: include/gnu_java_awt_peer_gtk_GdkFontPeer.h
===================================================================
RCS file: /sources/classpath/classpath/include/gnu_java_awt_peer_gtk_GdkFontPeer.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- include/gnu_java_awt_peer_gtk_GdkFontPeer.h	29 May 2006 16:14:59 -0000	1.8
+++ include/gnu_java_awt_peer_gtk_GdkFontPeer.h	7 Jun 2006 13:54:32 -0000	1.9
@@ -18,7 +18,6 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkFontPeer_getTextMetrics (JNIEnv *env, jobject, jstring, jdoubleArray);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkFontPeer_releasePeerGraphicsResource (JNIEnv *env, jobject);
 JNIEXPORT jbyteArray JNICALL Java_gnu_java_awt_peer_gtk_GdkFontPeer_getTrueTypeTable (JNIEnv *env, jobject, jbyte, jbyte, jbyte, jbyte);
-JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_GdkFontPeer_getGlyphVector (JNIEnv *env, jobject, jstring, jobject, jobject);
 
 #ifdef __cplusplus
 }

Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- native/jni/gtk-peer/Makefile.am	6 Jun 2006 10:04:15 -0000	1.44
+++ native/jni/gtk-peer/Makefile.am	7 Jun 2006 13:54:32 -0000	1.45
@@ -5,6 +5,7 @@
 			gnu_java_awt_peer_gtk_CairoGraphics2D.c \
 			gnu_java_awt_peer_gtk_ComponentGraphics.c \
 			gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c \
+			gnu_java_awt_peer_gtk_FreetypeGlyphVector.c \
 			gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c \
 			gnu_java_awt_peer_gtk_GdkFontPeer.c \
 			gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c \

Index: gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
===================================================================
RCS file: gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
diff -N gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	7 Jun 2006 13:54:32 -0000	1.1
@@ -0,0 +1,388 @@
+/* FreetypeGlyphVector.java
+   Copyright (C) 2006  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.java.awt.peer.gtk;
+
+import java.awt.Font;
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.GeneralPath;
+import java.awt.font.GlyphJustificationInfo;
+import java.awt.font.GlyphMetrics;
+import java.awt.font.GlyphVector;
+import java.awt.font.FontRenderContext;
+
+public class FreetypeGlyphVector extends GlyphVector
+{
+  /**
+   * The associated font and its peer.
+   */
+  private Font font;
+  private GdkFontPeer peer; // ATTN: Accessed from native code.
+
+  /**
+   * The string represented by this GlyphVector.
+   */
+  private String s;
+
+  /**
+   * The font render context
+   */
+  private FontRenderContext frc;
+
+  /**
+   * The total # of glyphs.
+   */
+  private int nGlyphs;
+
+  /**
+   * The glyph codes
+   */
+  private int[] glyphCodes;
+
+  /**
+   * Glyph transforms. (de facto only the translation is used)
+   */
+  private AffineTransform[] glyphTransforms;
+
+  /**
+   * Create a glyphvector from a given (Freetype) font and a String.
+   */
+  public FreetypeGlyphVector(Font f, String s, FontRenderContext frc)
+  {
+    this.s = s;
+    this.font = f;
+    this.frc = frc;
+    if( !(font.getPeer() instanceof GdkFontPeer ) )
+      throw new IllegalArgumentException("Not a valid font.");
+    peer = (GdkFontPeer)font.getPeer();
+
+    getGlyphs();
+    performDefaultLayout();
+  }
+
+  /**
+   * Create a glyphvector from a given set of glyph codes.
+   */
+  public FreetypeGlyphVector(Font f, int[] codes, FontRenderContext frc)
+  {
+    this.s = s;
+    this.font = f;
+    this.frc = frc;
+    if( !(font.getPeer() instanceof GdkFontPeer ) )
+      throw new IllegalArgumentException("Not a valid font.");
+    peer = (GdkFontPeer)font.getPeer();
+
+    glyphCodes = new int[ codes.length ];
+    System.arraycopy(codes, 0, glyphCodes, 0, codes.length);
+    nGlyphs = glyphCodes.length;
+    performDefaultLayout();
+  }
+
+  /**
+   * Create the array of glyph codes.
+   */
+  private void getGlyphs()
+  {
+    nGlyphs = s.codePointCount( 0, s.length() );
+    glyphCodes = new int[ nGlyphs ];
+    int stringIndex = 0;
+    for(int i = 0; i < nGlyphs; i++)
+      {
+	glyphCodes[i] = getGlyph( s.codePointAt(stringIndex) );
+	// UTF32 surrogate handling
+	if( s.codePointAt( stringIndex ) != (int)s.charAt( stringIndex ) )
+	  stringIndex ++;
+	stringIndex ++;
+      }
+  }
+
+  /**
+   * Returns the glyph code within the font for a given character
+   */
+  public native int getGlyph(int codepoint);
+
+  /**
+   * Returns the kerning of a glyph pair
+   */
+  private native Point2D getKerning(int leftGlyph, int rightGlyph);
+
+  private native double[] getMetricsNative( int glyphCode );
+
+  private native GeneralPath getGlyphOutlineNative(int glyphIndex);
+
+  /**
+   * Duh, compares two instances.
+   */
+  public boolean equals(GlyphVector gv)
+  {
+    if( ! (gv instanceof FreetypeGlyphVector) )
+      return false;
+
+    return (((FreetypeGlyphVector)gv).font.equals(font) && 
+	    ((FreetypeGlyphVector)gv).frc.equals(frc)
+	    && ((FreetypeGlyphVector)gv).s.equals(s));
+  }
+
+  /**
+   * Returns the associated Font
+   */
+  public Font getFont()
+  {
+    return font;
+  }
+
+  /**
+   * Returns the associated FontRenderContext
+   */
+  public FontRenderContext getFontRenderContext()
+  {
+    return frc;
+  }
+
+  /**
+   * Layout the glyphs.
+   */
+  public void performDefaultLayout()
+  {
+    glyphTransforms = new AffineTransform[ nGlyphs ]; 
+    double x = 0;
+    for(int i = 0; i < nGlyphs; i++)
+      {
+	GlyphMetrics gm = getGlyphMetrics( i );
+	Rectangle2D r = gm.getBounds2D();
+	glyphTransforms[ i ] = AffineTransform.getTranslateInstance(x, 0);
+	x += gm.getAdvanceX();
+      }
+  }
+
+  /**
+   * Returns the code of the glyph at glyphIndex;
+   */
+  public int getGlyphCode(int glyphIndex)
+  {
+    return glyphCodes[ glyphIndex ];
+  }
+
+  /**
+   * Returns multiple glyphcodes.
+   */
+  public int[] getGlyphCodes(int beginGlyphIndex, int numEntries, 
+			     int[] codeReturn)
+  {
+    int[] rval;
+
+    if( codeReturn == null )
+      rval = new int[ numEntries ];
+    else
+      rval = codeReturn;
+    
+    System.arraycopy(glyphCodes, beginGlyphIndex, rval, 0, numEntries);
+
+    return rval;
+  }
+
+  /**
+   * FIXME: Implement me.
+   */
+  public Shape getGlyphLogicalBounds(int glyphIndex)
+  {
+    GlyphMetrics gm = getGlyphMetrics( glyphIndex );
+    if( gm == null )
+      return null; 
+    Rectangle2D r = gm.getBounds2D();
+    return new Rectangle2D.Double( r.getX() - gm.getLSB(), r.getY(),
+				   gm.getAdvanceX(), r.getHeight() );
+  }
+
+  /**
+   * Returns the metrics of a single glyph.
+   */
+  public GlyphMetrics getGlyphMetrics(int glyphIndex)
+  {
+    double[] val = getMetricsNative( glyphCodes[ glyphIndex ] );
+    if( val == null )
+      return null;
+    
+    return new GlyphMetrics( true, (float)val[1], (float)val[2], 
+			     new Rectangle2D.Double( val[3], val[4], 
+						     val[5], val[6] ),
+			     GlyphMetrics.STANDARD );
+  }
+
+  /**
+   * Returns the outline of a single glyph.
+   */
+  public Shape getGlyphOutline(int glyphIndex)
+  {
+    GeneralPath gp = getGlyphOutlineNative( glyphCodes[ glyphIndex ] );
+    gp.transform( glyphTransforms[ glyphIndex ] );
+    return gp;
+  }
+
+  /**
+   * Returns the position of a single glyph.
+   */
+  public Point2D getGlyphPosition(int glyphIndex)
+  {
+    return glyphTransforms[ glyphIndex ].transform( new Point2D.Double(0, 0),
+						   null );
+  }
+
+  /**
+   * Returns the positions of multiple glyphs.
+   */
+  public float[] getGlyphPositions(int beginGlyphIndex, int numEntries, 
+				   float[] positionReturn)
+  {
+    float[] rval;
+
+    if( positionReturn == null )
+      rval = new float[2 * numEntries];
+    else
+      rval = positionReturn;
+
+    for( int i = beginGlyphIndex; i < numEntries; i++ )
+      {
+	Point2D p = getGlyphPosition( i );
+	rval[i * 2] = (float)p.getX();
+	rval[i * 2 + 1] = (float)p.getY();
+      }
+
+    return rval;
+  }
+
+  /**
+   * Returns the transform of a glyph.
+   */
+  public AffineTransform getGlyphTransform(int glyphIndex)
+  {
+    return new AffineTransform( glyphTransforms[ glyphIndex ] );
+  }
+
+  /**
+   * Returns the visual bounds of a glyph
+   * May be off by a pixel or two due to hinting/rasterization.
+   */
+  public Shape getGlyphVisualBounds(int glyphIndex)
+  {
+    return getGlyphOutline( glyphIndex ).getBounds2D();
+  }
+
+  /**
+   * Return the logical bounds of the whole thing.
+   */
+  public Rectangle2D getLogicalBounds()
+  {
+    if( nGlyphs == 0 )
+      return new Rectangle2D.Double(0, 0, 0, 0);
+
+    Rectangle2D rect = (Rectangle2D)getGlyphLogicalBounds( 0 );
+    for( int i = 1; i < nGlyphs; i++ )
+      rect = rect.createUnion( (Rectangle2D)getGlyphLogicalBounds( i ) );
+
+    return rect;
+  }
+
+  /**
+   * Returns the number of glyphs.
+   */
+  public int getNumGlyphs()
+  {
+    return glyphCodes.length;
+  }
+
+  /**
+   * Returns the outline of the entire GlyphVector.
+   */
+  public Shape getOutline()
+  {
+    GeneralPath path = new GeneralPath();
+    for( int i = 0; i < getNumGlyphs(); i++ )
+      path.append( getGlyphOutline( i ), false );
+    return path;
+  }
+
+  /**
+   * TODO: 
+   * FreeType does not currently have an API for the JSTF table. We should 
+   * probably get the table ourselves from FT and pass it to some parser 
+   * which the native font peers will need.
+   */
+  public GlyphJustificationInfo getGlyphJustificationInfo(int glyphIndex)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the outline of the entire vector, drawn at (x,y).
+   */
+  public Shape getOutline(float x, float y)
+  {
+    AffineTransform tx = AffineTransform.getTranslateInstance( x, y );
+    return tx.createTransformedShape( getOutline() );
+  }
+
+  /**
+   * Returns the visual bounds of the entire GlyphVector.
+   * May be off by a pixel or two due to hinting/rasterization.
+   */
+  public Rectangle2D getVisualBounds()
+  {
+    return getOutline().getBounds2D();
+  }
+
+  /**
+   * Sets the position of a glyph.
+   */
+  public void setGlyphPosition(int glyphIndex, Point2D newPos)
+  {
+    // FIXME: Scaling, etc.?
+    glyphTransforms[ glyphIndex ].setToTranslation( newPos.getX(), 
+						    newPos.getY() );
+  }
+
+  /**
+   * Sets the transform of a single glyph.
+   */
+  public void setGlyphTransform(int glyphIndex, AffineTransform newTX)
+  {
+    glyphTransforms[ glyphIndex ].setTransform( newTX );
+  }
+}

Index: include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
===================================================================
RCS file: include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
diff -N include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h	7 Jun 2006 13:54:32 -0000	1.1
@@ -0,0 +1,22 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_FreetypeGlyphVector__
+#define __gnu_java_awt_peer_gtk_FreetypeGlyphVector__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyph (JNIEnv *env, jobject, jint);
+JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getKerning (JNIEnv *env, jobject, jint, jint);
+JNIEXPORT jdoubleArray JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getMetricsNative (JNIEnv *env, jobject, jint);
+JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphOutlineNative (JNIEnv *env, jobject, jint);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gnu_java_awt_peer_gtk_FreetypeGlyphVector__ */

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
===================================================================
RCS file: native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
diff -N native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	7 Jun 2006 13:54:32 -0000	1.1
@@ -0,0 +1,337 @@
+/* gnu_java_awt_FreetypeGlyphVector.c
+   Copyright (C) 2006  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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 <jni.h>
+#include <gtk/gtk.h>
+#include <string.h>
+#include <pango/pango.h>
+#include <pango/pangoft2.h>
+#include <pango/pangofc-font.h>
+#include <freetype/ftglyph.h>
+#include <freetype/ftoutln.h>
+#include "native_state.h"
+#include "gdkfont.h"
+#include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"
+#include "cairographics2d.h"
+
+typedef struct gp
+{
+  JNIEnv *env;
+  jobject obj;
+  double px;
+  double py;
+  double sx;
+  double sy;
+} generalpath ;
+
+static PangoFcFont *
+getFont(JNIEnv *env, jobject obj)
+{
+  jfieldID fid;
+  jobject data;
+  jclass cls;
+  struct peerfont *pfont;
+
+  cls = (*env)->GetObjectClass (env, obj);
+  fid = (*env)->GetFieldID (env, cls, "peer", 
+				 "Lgnu/java/awt/peer/gtk/GdkFontPeer;");
+  g_assert (fid != 0);
+
+  data = (*env)->GetObjectField (env, obj, fid);
+  g_assert (data != NULL);
+
+  pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, data);
+  g_assert (pfont != NULL);
+  g_assert (pfont->font != NULL);
+
+  return (PangoFcFont *)pfont->font;
+}
+
+JNIEXPORT jint JNICALL 
+Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyph
+  (JNIEnv *env, jobject obj, jint codepoint)
+{
+  FT_Face ft_face;
+  jint glyph_index;
+  PangoFcFont *font;
+
+  font = getFont(env, obj);
+
+  ft_face = pango_fc_font_lock_face( font );
+  g_assert (ft_face != NULL);
+
+  glyph_index = FT_Get_Char_Index( ft_face, codepoint );
+
+  pango_fc_font_unlock_face (font);
+
+  return glyph_index;
+}
+
+JNIEXPORT jobject JNICALL 
+Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getKerning
+(JNIEnv *env, jobject obj, jint rightGlyph, jint leftGlyph)
+{
+  FT_Face ft_face;
+  FT_Vector kern;
+  jclass cls;
+  jmethodID method;
+  jvalue values[2];
+  PangoFcFont *font;
+
+  font = getFont(env, obj);
+  ft_face = pango_fc_font_lock_face( font );
+  g_assert (ft_face != NULL);
+
+  FT_Get_Kerning( ft_face, rightGlyph, leftGlyph, FT_KERNING_DEFAULT, &kern );
+
+  pango_fc_font_unlock_face( font );
+
+  values[0].d = (jdouble)kern.x/64.0;
+  values[1].d = (jdouble)kern.y/64.0;
+
+  cls = (*env)->FindClass (env, "java/awt/geom/Point2D.Double");
+  method = (*env)->GetMethodID (env, cls, "<init>", "(DD)V");
+  return (*env)->NewObjectA(env, cls, method, values);
+}
+
+JNIEXPORT jdoubleArray JNICALL 
+Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getMetricsNative
+(JNIEnv *env, jobject obj, jint glyphIndex )
+{
+  FT_Face ft_face;
+  jdouble *values;
+  jdoubleArray retArray = NULL;
+  PangoFcFont *font;
+  FT_BBox acbox;
+
+  font = getFont(env, obj);
+  ft_face = pango_fc_font_lock_face( font );
+
+  g_assert (ft_face != NULL);
+
+  FT_Set_Transform( ft_face, NULL, NULL );
+
+  if( FT_Load_Glyph( ft_face, glyphIndex, FT_LOAD_DEFAULT ) != 0 )
+    {
+      pango_fc_font_unlock_face( font );
+      printf("Couldn't load glyph %i\n", glyphIndex);
+      return NULL;
+    }
+
+  retArray = (*env)->NewDoubleArray (env, 8);
+  values = (*env)->GetDoubleArrayElements (env, retArray, NULL);
+
+  values[0] = 0;
+  values[1] = (jdouble)ft_face->glyph->advance.x/64.0;
+  values[2] = (jdouble)ft_face->glyph->advance.y/64.0;
+  values[3] = (jdouble)ft_face->glyph->metrics.horiBearingX/64.0;
+  values[4] = -(jdouble)ft_face->glyph->metrics.horiBearingY/64.0;
+  values[5] = (jdouble)ft_face->glyph->metrics.width/64.0;
+  values[6] = (jdouble)ft_face->glyph->metrics.height/64.0;
+  values[7] = 0;
+
+  (*env)->ReleaseDoubleArrayElements (env, retArray, values, 0);
+  pango_fc_font_unlock_face( font );
+
+  return retArray;
+}
+
+/* GetOutline code follows ****************************/
+/********* Freetype callback functions *****************************/
+
+static int _moveTo( const FT_Vector* to,
+		    void *p)
+{
+  JNIEnv *env;
+  jobject obj;
+  jclass cls;
+  jmethodID method;
+  jvalue values[2];
+  generalpath *path = (generalpath *) p;
+
+  env = path->env;
+  obj = path->obj;
+
+  values[0].f = (jfloat)(to->x * path->sx + path->px);
+  values[1].f = (jfloat)(to->y * path->sy + path->py);
+
+  cls = (*env)->FindClass (env, "java/awt/geom/GeneralPath");
+  method = (*env)->GetMethodID (env, cls, "moveTo", "(FF)V");
+  (*env)->CallVoidMethodA(env, obj, method, values );
+
+  return 0;
+}
+
+static int _lineTo( const FT_Vector*  to,
+		    void *p)
+{
+  JNIEnv *env;
+  jobject obj;
+  jclass cls;
+  jmethodID method;
+  jvalue values[2];
+  generalpath *path = (generalpath *) p;
+
+  env = path->env;
+  obj = path->obj; 
+  values[0].f = (jfloat)(to->x * path->sx + path->px);
+  values[1].f = (jfloat)(to->y * path->sy + path->py);
+
+  cls = (*env)->FindClass (env, "java/awt/geom/GeneralPath");
+  method = (*env)->GetMethodID (env, cls, "lineTo", "(FF)V");
+  (*env)->CallVoidMethodA(env, obj, method, values );
+
+  return 0;
+}
+
+static int _quadTo( const FT_Vector*  cp,
+		    const FT_Vector*  to,
+		    void *p)
+{
+  JNIEnv *env;
+  jobject obj;
+  jclass cls;
+  jmethodID method;
+  jvalue values[4];
+  generalpath *path = (generalpath *) p;
+
+  env = path->env;
+  obj = path->obj;
+  values[0].f = (jfloat)(cp->x * path->sx + path->px);
+  values[1].f = (jfloat)(cp->y * path->sy + path->py);
+  values[2].f = (jfloat)(to->x * path->sx + path->px);
+  values[3].f = (jfloat)(to->y * path->sy + path->py);
+
+  cls = (*env)->FindClass (env, "java/awt/geom/GeneralPath");
+  method = (*env)->GetMethodID (env, cls, "quadTo", "(FFFF)V");
+  (*env)->CallVoidMethodA(env, obj, method, values );
+
+  return 0;
+}
+
+static int _curveTo( const FT_Vector*  cp1,
+		     const FT_Vector*  cp2,
+		     const FT_Vector*  to,
+		     void *p)
+{
+  JNIEnv *env;
+  jobject obj;
+  jclass cls;
+  jmethodID method;
+  jvalue values[6];
+  generalpath *path = (generalpath *) p;
+
+  env = path->env;
+  obj = path->obj;
+  values[0].f = (jfloat)(cp1->x * path->sx + path->px);
+  values[1].f = (jfloat)(cp1->y * path->sy + path->py);
+  values[2].f = (jfloat)(cp2->x * path->sx + path->px);
+  values[3].f = (jfloat)(cp2->y * path->sy + path->py);
+  values[4].f = (jfloat)(to->x * path->sx + path->px);
+  values[5].f = (jfloat)(to->y * path->sy + path->py);
+
+  cls = (*env)->FindClass (env, "java/awt/geom/GeneralPath");
+  method = (*env)->GetMethodID (env, cls, "curveTo", "(FFFFFF)V");
+  (*env)->CallVoidMethodA(env, obj, method, values );
+
+  return 0;
+}
+
+
+JNIEXPORT jobject JNICALL 
+Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphOutlineNative
+ (JNIEnv *env, jobject obj, jint glyphIndex)
+{
+  generalpath *path;
+  jobject gp;
+  FT_Outline_Funcs ftCallbacks =
+    {
+      (FT_Outline_MoveToFunc) _moveTo,
+      (FT_Outline_LineToFunc) _lineTo,
+      (FT_Outline_ConicToFunc) _quadTo,
+      (FT_Outline_CubicToFunc) _curveTo,
+      0,
+      0
+    };
+  PangoFcFont *font;
+  FT_Face ft_face;
+  FT_Glyph glyph;
+
+  font = getFont(env, obj);
+  ft_face = pango_fc_font_lock_face( font );
+
+  g_assert (ft_face != NULL);
+
+  path = g_malloc0 (sizeof (generalpath));
+  g_assert(path != NULL);
+  path->env = env;
+
+  path->px = path->py = 0.0;
+  path->sx = 1.0/64.0;
+  path->sy = -1.0/64.0;
+
+  {  /* create a GeneralPath instance */
+    jclass cls;
+    jmethodID method;
+    
+    cls = (*env)->FindClass (env, "java/awt/geom/GeneralPath");
+    method = (*env)->GetMethodID (env, cls, "<init>", "()V");
+    gp = path->obj = (*env)->NewObject (env, cls, method);
+  }
+	      
+  if(FT_Load_Glyph(ft_face,
+		   (FT_UInt)(glyphIndex),
+		   FT_LOAD_DEFAULT | FT_LOAD_NO_BITMAP) != 0)
+    {
+      pango_fc_font_unlock_face( font );
+      g_free(path); 
+      return NULL;
+    }
+
+  FT_Get_Glyph( ft_face->glyph, &glyph );
+  FT_Outline_Decompose (&(((FT_OutlineGlyph)glyph)->outline),
+			&ftCallbacks, path);
+  FT_Done_Glyph( glyph );
+  
+  pango_fc_font_unlock_face( font );
+
+  g_free(path); 
+
+  return gp; 
+}
+
+



From MAILER-DAEMON Wed Jun 07 09:56:57 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnyWn-0008Sd-0C
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 09:56:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnyWl-0008S0-Fo
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:56:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnyWk-0008RT-DV
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:56:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnyWk-0008RP-Ae
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:56:54 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnyeL-0007WD-Ns
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 10:04:45 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnyWj-00028m-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 09:56:53 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FnyWh-00028j-TS
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 13:56:53 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnyWh-00028j-TS@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Wed, 07 Jun 2006 13:56:51 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/GdkGl...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 13:56:56 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/07 13:56:51

Modified files:
	.              : ChangeLog 
Removed files:
	gnu/java/awt/peer/gtk: GdkGlyphVector.java 

Log message:
	2006-06-05  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/GdkGlyphVector: Removed file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7695&r2=1.7696
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkGlyphVector.java?cvsroot=classpath&r1=1.9&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7695
retrieving revision 1.7696
diff -u -b -r1.7695 -r1.7696
--- ChangeLog	7 Jun 2006 13:54:30 -0000	1.7695
+++ ChangeLog	7 Jun 2006 13:56:51 -0000	1.7696
@@ -1,5 +1,9 @@
 2006-06-05  Sven de Marothy  <sven@physto.se>
 
+	* gnu/java/awt/peer/gtk/GdkGlyphVector: Removed file.
+
+2006-06-05  Sven de Marothy  <sven@physto.se>
+
 	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
 	* include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
 	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c

Index: gnu/java/awt/peer/gtk/GdkGlyphVector.java
===================================================================
RCS file: gnu/java/awt/peer/gtk/GdkGlyphVector.java
diff -N gnu/java/awt/peer/gtk/GdkGlyphVector.java
--- gnu/java/awt/peer/gtk/GdkGlyphVector.java	2 Jul 2005 20:32:11 -0000	1.9
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,359 +0,0 @@
-/* GdkGlyphVector.java -- Glyph vector object
-   Copyright (C) 2003, 2004, 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.awt.peer.gtk;
-
-import java.awt.Font;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphJustificationInfo;
-import java.awt.font.GlyphMetrics;
-import java.awt.font.GlyphVector;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-public class GdkGlyphVector extends GlyphVector
-{
-
-  /* We use a simple representation for glyph vectors here. Glyph i
-   * consumes 8 doubles:
-   *
-   *      logical x: extents[ 10*i     ]
-   *      logical y: extents[ 10*i + 1 ]
-   *  logical width: extents[ 10*i + 2 ]
-   * logical height: extents[ 10*i + 3 ]
-   *
-   *       visual x: extents[ 10*i + 4 ]
-   *       visual y: extents[ 10*i + 5 ]
-   *   visual width: extents[ 10*i + 6 ]
-   *  visual height: extents[ 10*i + 7 ]
-   *
-   *   origin pos x: extents[ 10*i + 8 ]
-   *   origin pos y: extents[ 10*i + 9 ]
-   * 
-   * as well as one int, code[i], representing the glyph code in the font.
-   */
-
-  double [] extents;
-  int [] codes;
-
-  Font font;
-  FontRenderContext fontRenderContext;
-
-  Rectangle2D allLogical;
-  Rectangle2D allVisual;
-
-  public GdkGlyphVector(double[] extents, int[] codes, Font font, FontRenderContext frc)
-  {
-    this.extents = extents;
-    this.codes = codes;
-    this.font = font;
-    this.fontRenderContext = frc;
-
-    allLogical = new Rectangle2D.Double();
-    allVisual = new Rectangle2D.Double();
-    
-    for (int i = 0; i < codes.length; ++i)
-      {
-        allLogical.add (new Rectangle2D.Double(extents[10*i    ] + extents[10*i + 8],
-                                               extents[10*i + 1] + extents[10*i + 9],
-                                               extents[10*i + 2],
-                                               extents[10*i + 3]));
-
-        allVisual.add (new Rectangle2D.Double(extents[10*i + 4] + extents[10*i + 8],
-                                              extents[10*i + 5] + extents[10*i + 9],
-                                              extents[10*i + 6],
-                                              extents[10*i + 7]));
-      }
-  }
-
-  /* 
-     geometric notes:
-
-     the FRC contains a mapping from points -> pixels.
-
-     typographics points are typically 1/72 of an inch.
-
-     pixel displays are often around 72 dpi.
-
-     so the FRC can get away with using an identity transform on a screen,
-     often. behavior is documented by sun to fall back to an identity
-     transform if the internal transformation is null.
-
-     coordinates coming up from pango are expressed as floats -- in device
-     space, so basically pixels-with-fractional-bits -- derived from their
-     storage format in pango (1024ths of pixels). 
-
-     it is not clear from the javadocs whether the results of methods like
-     getGlyphPositions ought to return coordinates in device space, or
-     "point" space, or what. for now I'm returning them in device space.
-     
-   */
-
-  public double[] getExtents() 
-  {
-    return extents;
-  }
-
-  public int[] getCodes()
-  {
-    return codes;
-  }
-
-  public Font getFont () 
-  { 
-    return font; 
-  }
-
-  public FontRenderContext getFontRenderContext () 
-  { 
-    return fontRenderContext; 
-  }
-
-  public int getGlyphCharIndex (int glyphIndex) 
-  { 
-    // FIXME: currently pango does not provide glyph-by-glyph
-    // reverse mapping information, so we assume a broken 1:1
-    // glyph model here. This is plainly wrong.
-    return glyphIndex;
-  }
-
-  public int[] getGlyphCharIndices (int beginGlyphIndex, 
-                                    int numEntries,
-                                    int[] codeReturn)
-  {
-    int ix[] = codeReturn;
-    if (ix == null)
-      ix = new int[numEntries];
-
-    for (int i = 0; i < numEntries; i++)
-      ix[i] = getGlyphCharIndex (beginGlyphIndex + i);
-    return ix;
-  }
-
-  public int getGlyphCode (int glyphIndex) 
-  { 
-    return codes[glyphIndex];
-  }
-
-  public int[] getGlyphCodes (int beginGlyphIndex, int numEntries,
-                              int[] codeReturn)
-  {
-    if (codeReturn == null)
-      codeReturn = new int[numEntries];
-
-    System.arraycopy(codes, beginGlyphIndex, codeReturn, 0, numEntries);
-    return codeReturn;
-  }
-
-  public Shape getGlyphLogicalBounds (int i)
-  {
-    return new Rectangle2D.Double (extents[8*i], extents[8*i + 1],
-                                   extents[8*i + 2], extents[8*i + 3]);
-  }
-    
-  public GlyphMetrics getGlyphMetrics (int i)
-  {
-    // FIXME: pango does not yield vertical layout information at the
-    // moment.
-
-    boolean is_horizontal = true;
-    double advanceX = extents[8*i + 2]; // "logical width" == advanceX 
-    double advanceY = 0; 
-   
-    return new GlyphMetrics (is_horizontal, 
-                             (float) advanceX, (float) advanceY, 
-                             (Rectangle2D) getGlyphVisualBounds(i), 
-                             GlyphMetrics.STANDARD);
-  }
-
-  public Shape getGlyphOutline (int glyphIndex)
-  {
-    throw new UnsupportedOperationException ();      
-  }
-
-  public Shape getGlyphOutline (int glyphIndex, float x, float y)
-  {
-    throw new UnsupportedOperationException ();
-  }
-
-  public Rectangle getGlyphPixelBounds (int i, 
-                                        FontRenderContext renderFRC,
-                                        float x, float y)
-  {
-    return new Rectangle((int) x, (int) y,
-                         (int) extents[8*i + 6], (int) extents[8*i + 7]);
-  }
-    
-  public Point2D getGlyphPosition (int i)
-  {
-    return new Point2D.Double (extents[10*i + 8], 
-                               extents[10*i + 9]);
-  }
-
-  public float[] getGlyphPositions (int beginGlyphIndex,
-                                    int numEntries,
-                                    float[] positionReturn)
-  {
-    float fx[] = positionReturn;
-    if (fx == null)
-      fx = new float[numEntries * 2];
-
-    for (int i = 0; i < numEntries; ++i)
-      {
-        fx[2*i    ] = (float) extents[10*i + 8];
-        fx[2*i + 1] = (float) extents[10*i + 9];
-      }
-    return fx;
-  }
-
-  public AffineTransform getGlyphTransform (int glyphIndex)
-  {
-    // Glyphs don't have independent transforms in these simple glyph
-    // vectors; docs specify null is an ok return here.
-    return null;  
-  }
-    
-  public Shape getGlyphVisualBounds (int i)
-  {
-    return new Rectangle2D.Double(extents[8*i + 4], extents[8*i + 5],
-                                  extents[8*i + 6], extents[8*i + 7]);
-  }
-    
-  public int getLayoutFlags ()
-  {
-    return 0;
-  }
-
-  public Rectangle2D getLogicalBounds ()
-  {
-    return allLogical;
-  }
-
-  public int getNumGlyphs ()
-  {
-    return codes.length;
-  }
-
-  public Shape getOutline ()
-  {
-    throw new UnsupportedOperationException ();      
-  }
-
-  public Rectangle getPixelBounds (FontRenderContext renderFRC,
-                                   float x, float y)
-  {
-    return new Rectangle((int)x, 
-                         (int)y, 
-                         (int) allVisual.getWidth(),
-                         (int) allVisual.getHeight());
-  }
-    
-  public Rectangle2D getVisualBounds ()
-  {
-    return allVisual;
-  }
-
-  public void performDefaultLayout ()
-  {
-  }
-    
-  public void setGlyphPosition (int i, Point2D newPos)
-  {
-    extents[8*i    ] = newPos.getX();
-    extents[8*i + 1] = newPos.getY();
-
-    extents[8*i + 4] = newPos.getX();
-    extents[8*i + 5] = newPos.getY();
-  }
-
-  public void setGlyphTransform (int glyphIndex,
-                                 AffineTransform newTX)
-  {
-    // not yet.. maybe not ever?
-    throw new UnsupportedOperationException ();      
-  }
-
-  public boolean equals(GlyphVector gv)
-  {
-    if (gv == null)
-      return false;
-
-    if (! (gv instanceof GdkGlyphVector))
-      return false;
-
-    GdkGlyphVector ggv = (GdkGlyphVector) gv;
-
-    if ((ggv.codes.length != this.codes.length)
-        || (ggv.extents.length != this.extents.length))
-      return false;
-    
-    if ((ggv.font == null && this.font != null)
-        || (ggv.font != null && this.font == null)
-        || (!ggv.font.equals(this.font)))
-      return false;
-
-    if ((ggv.fontRenderContext == null && this.fontRenderContext != null)
-        || (ggv.fontRenderContext != null && this.fontRenderContext == null)
-        || (!ggv.fontRenderContext.equals(this.fontRenderContext)))
-      return false;
-
-    for (int i = 0; i < ggv.codes.length; ++i)
-      if (ggv.codes[i] != this.codes[i])
-        return false;
-
-    for (int i = 0; i < ggv.extents.length; ++i)
-      if (ggv.extents[i] != this.extents[i])
-        return false;
-
-    return true;
-  }
-
-  public GlyphJustificationInfo getGlyphJustificationInfo(int idx)
-  {
-    throw new UnsupportedOperationException ();      
-  }
-
-  public Shape getOutline(float x, float y)    
-  {
-    throw new UnsupportedOperationException ();      
-  }
-
-}



From MAILER-DAEMON Wed Jun 07 09:58:37 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnyYP-0000Bu-3F
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 09:58:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnyYN-0000BL-83
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:58:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnyYM-0000B6-MH
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:58:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnyYM-0000B3-IF
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 09:58:34 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fnyfy-0007de-3l
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 10:06:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnyYL-0002AF-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 09:58:33 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FnyYL-0002AC-AB
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 13:58:33 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnyYL-0002AC-AB@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Wed, 07 Jun 2006 13:58:33 +0000
Subject: [commit-cp] classpath/native/jni/gtk-peer gnu_java_awt_peer...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 13:58:36 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/07 13:58:33

Modified files:
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_GdkFontPeer.c 

Log message:
	2006-06-05  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
		* include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
		New files.
	
		* gnu/java/awt/peer/gtk/GdkFontPeer.java
		(getGlyphVector): Removed native method.
		(createGlyphVector, getStringBounds): Use new GV class.
	
		* include/Makefile.am
		* native/jni/gtk-peer/Makefile.am
		Add new files.
	
		* include/gnu_java_awt_peer_gtk_GdkFontPeer.h
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
		(getGlyphVector): Removed native method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c?cvsroot=classpath&r1=1.18&r2=1.19

Patches:
Index: gnu_java_awt_peer_gtk_GdkFontPeer.c
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gnu_java_awt_peer_gtk_GdkFontPeer.c	29 May 2006 16:14:59 -0000	1.18
+++ gnu_java_awt_peer_gtk_GdkFontPeer.c	7 Jun 2006 13:58:33 -0000	1.19
@@ -59,8 +59,6 @@
   java_awt_font_HANGING_BASELINE = 2
 };
 
-static jmethodID glyphVector_ctor;
-static jclass glyphVector_class;
 static PangoAttrList *attrs = NULL;
 
 JNIEXPORT void JNICALL
@@ -68,16 +66,6 @@
   (JNIEnv *env, jclass clazz)
 {
   NSA_FONT_INIT (env, clazz);
-
-  glyphVector_class = (*env)->FindClass 
-    (env, "gnu/java/awt/peer/gtk/GdkGlyphVector");
-
-  glyphVector_class = (*env)->NewGlobalRef
-    (env, glyphVector_class);
-
-  glyphVector_ctor = (*env)->GetMethodID 
-    (env, glyphVector_class, "<init>", 
-     "([D[ILjava/awt/Font;Ljava/awt/font/FontRenderContext;)V");
 }
 
 JNIEXPORT void JNICALL
@@ -140,123 +128,6 @@
   gdk_threads_leave();
 }
 
-JNIEXPORT jobject JNICALL
-Java_gnu_java_awt_peer_gtk_GdkFontPeer_getGlyphVector
-  (JNIEnv *env, jobject self, 
-   jstring chars,
-   jobject font, 
-   jobject fontRenderContext)
-{
-  struct peerfont *pfont = NULL;
-  GList *items = NULL;
-  GList *i = NULL;
-  gchar *str = NULL;
-  int len = 0;
-  int j = 0;
-  double *native_extents = NULL;
-  int *native_codes = NULL;
-  jintArray java_codes = NULL;
-  jdoubleArray java_extents = NULL;
-
-  gdk_threads_enter ();
-
-  pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, self);
-  g_assert (pfont != NULL);
-
-  len = (*cp_gtk_gdk_env())->GetStringUTFLength (env, chars);  
-  str = (gchar *)(*env)->GetStringUTFChars (env, chars, NULL);
-  g_assert (str != NULL);
-
-  if (attrs == NULL)
-    attrs = pango_attr_list_new ();
-
-  if (len > 0 && str[len-1] == '\0')
-    len--;
-  
-  items = pango_itemize (pfont->ctx, str, 0, len, attrs, NULL);
-
-  i = g_list_first (items);
-
-  if (i == NULL)       
-    {
-      java_extents = (*env)->NewDoubleArray (env, 0);
-      java_codes = (*env)->NewIntArray (env, 0);
-    }
-  else
-    { 
-      PangoGlyphString *glyphs;
-      PangoItem *item = (PangoItem *)i->data;
-
-      pango_context_set_font_description (pfont->ctx, pfont->desc);
-      pango_context_set_language (pfont->ctx, gtk_get_default_language());
-      pango_context_load_font (pfont->ctx, pfont->desc);
-
-      glyphs = pango_glyph_string_new ();
-      g_assert (glyphs != NULL);
-
-      pango_shape (str + item->offset, item->length, 
-		   &(item->analysis), glyphs);
-
-      if (glyphs->num_glyphs > 0)
-	{
-	  int x = 0;
-	  double scale = ((double) PANGO_SCALE);
-
-	  java_extents = (*env)->NewDoubleArray (env, glyphs->num_glyphs * NUM_GLYPH_METRICS);
-	  java_codes = (*env)->NewIntArray (env, glyphs->num_glyphs);
-
-	  native_extents = (*env)->GetDoubleArrayElements (env, java_extents, NULL);
-	  native_codes = (*env)->GetIntArrayElements (env, java_codes, NULL);
-
-	  for (j = 0; j < glyphs->num_glyphs; ++j)
-	    {
-	      PangoRectangle ink;
-	      PangoRectangle logical;
-	      PangoGlyphGeometry *geom = &glyphs->glyphs[j].geometry;
-
-	      pango_font_get_glyph_extents (pfont->font, 
-					    glyphs->glyphs[j].glyph,
-					    &ink, &logical);
-
-	      native_codes[j] = glyphs->glyphs[j].glyph;
-
-	      native_extents[ GLYPH_LOG_X(j)      ] = (logical.x)      / scale;
-	      native_extents[ GLYPH_LOG_Y(j)      ] = (- logical.y)    / scale;
-	      native_extents[ GLYPH_LOG_WIDTH(j)  ] = (logical.width)  / scale;
-	      native_extents[ GLYPH_LOG_HEIGHT(j) ] = (logical.height) / scale;
-
-	      native_extents[ GLYPH_INK_X(j)      ] = (ink.x)       / scale;
-	      native_extents[ GLYPH_INK_Y(j)      ] = (- ink.y)     / scale;
-	      native_extents[ GLYPH_INK_WIDTH(j)  ] = (ink.width)   / scale;
-	      native_extents[ GLYPH_INK_HEIGHT(j) ] = (ink.height)  / scale;
-
-	      native_extents[ GLYPH_POS_X(j)      ] = (x + geom->x_offset)  / scale;
-	      native_extents[ GLYPH_POS_Y(j)      ] = (  - geom->y_offset)  / scale;
-
-	      x += geom->width;
-	    }
-	  (*env)->ReleaseDoubleArrayElements (env, java_extents, native_extents, 0);
-	  (*env)->ReleaseIntArrayElements (env, java_codes, native_codes, 0);
-	}
-
-      pango_glyph_string_free (glyphs);
-    }
-
-  (*env)->ReleaseStringUTFChars (env, chars, str);
-
-  for (i = g_list_first (items); i != NULL; i = g_list_next (i))
-    pango_item_free(i->data);
-
-  g_list_free (items);
-
-  gdk_threads_leave ();
-
-  return (*env)->NewObject (env, 
-			    glyphVector_class, 
-			    glyphVector_ctor, 
-			    java_extents, java_codes,
-			    font, fontRenderContext);
-}
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkFontPeer_getFontMetrics



From MAILER-DAEMON Wed Jun 07 10:36:12 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fnz8m-0003Yx-PB
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 10:36:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fnz8l-0003Yh-KH
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 10:36:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fnz8i-0003XU-HS
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 10:36:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fnz8i-0003XQ-9P
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 10:36:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnzGK-0002X0-3l
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 10:44:00 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fnz8d-0002xs-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 10:36:03 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fnz8d-0002xj-Dd
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 14:36:03 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fnz8d-0002xj-Dd@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 07 Jun 2006 14:36:03 +0000
Subject: [commit-cp] classpath/javax/swing JTree.java plaf/basic/Bas...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 14:36:11 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/07 14:36:03

Modified files:
	javax/swing    : JTree.java 
	javax/swing/plaf/basic: BasicTreeUI.java 
	javax/swing/tree: DefaultTreeCellEditor.java TreePath.java 
	                  VariableHeightLayoutCache.java 

Log message:
	2006-06-06  Roman Kennke  <kennke@aicas.com>
	
		PR 27920
		* javax/swing/JTree.java
		(JTree()): Initialize with default model.
		(JTree(TreeModel)): Clear expanded state hashtable. Added comment
		on the updateUI() / setModel() order.
		(setModel): Correctly (un-)setup the listeners. Clear the expanded
		paths.
		* javax/swing/plaf/basic/BasicTreeUI.java
		(BasicTreeUI()): Initialize listeners in installListeners().
		(setModel): Complete editing on model change. Correctly resetup
		the listeners. Update the layout cache accordingly.
		(setShowRootHandles): Complete editing and update layout. Do not
		call back into the JTree, this could cause cycles.
		(prepareForUIInstall): Implemented. Moved some init code from
		installUI() to this method.
		(completeUIInstall): Implemented. Moved some init code from
		installUI() to this method.
		(createDefaultCellEditor): Check for type of renderer, and install
		with null renderer when not DefaultTreeCellRenderer.
		(updateLayoutCacheExpandedNodes): Added null check for tree root
		to avoid NPE.
		(updateRenderer): Call updateEditor().
		(installListeners): Initialize the listeners here. Added some null
		checks to avoid NPEs.
		(installUI): Moved some init code to prepareForUIInstall() and
		completeUIInstall().
		(completeEditing): Return immediately if editing component is null
		or if the setting is to not stop editing on complete editing.
		(checkForClickInExpandControl): Call handleExpandControlClick()
		instead of toggleExpandState() directly.
		(isLocationInExpandControl): Rewritten to correctly determine the
		expand click location.
		(MouseHandler.mousePressed): Rewritten to make better use of the
		instance methods of BasicTreeUI to handle the click.
		(PropertyHandler.propertyChange): Handle model and cell renderer
		updates.
		* javax/swing/tree/DefaultTreeCellEditor.java
		(DefaultTreeCellEditor): Removed initialization of the icon. This
		is done so that the constructor can deal with null renderer as the
		RI does. Maybe this needs more fixing.
		* javax/swing/tree/TreePath.java
		(isDescendant): Fixed this method. The previous version did too
		much and compared the wrong things, which lead to a ClassCastException
		in equals().
		* javax/swing/tree/VariableHeightLayoutCache.java
		(update): Do nothing when model is null.
		(setModel): Clear the tables and update the layout. Added null
		check to prevent NPE.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JTree.java?cvsroot=classpath&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTreeUI.java?cvsroot=classpath&r1=1.139&r2=1.140
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/tree/DefaultTreeCellEditor.java?cvsroot=classpath&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/tree/TreePath.java?cvsroot=classpath&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/tree/VariableHeightLayoutCache.java?cvsroot=classpath&r1=1.15&r2=1.16

Patches:
Index: JTree.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTree.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- JTree.java	6 Jun 2006 15:34:56 -0000	1.68
+++ JTree.java	7 Jun 2006 14:36:02 -0000	1.69
@@ -1478,7 +1478,7 @@
    */
   public JTree()
   {
-    this(createTreeModel(null));
+    this(getDefaultTreeModel());
   }
 
   /**
@@ -1513,7 +1513,12 @@
     selectionModel.setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
     
     // The root node appears expanded by default.
-    nodeStates.put(new TreePath(model.getRoot()), EXPANDED);
+    nodeStates = new Hashtable();
+
+    // Install the UI before installing the model. This way we avoid double
+    // initialization of lots of UI and model stuff inside the UI and related
+    // classes. The necessary UI updates are performed via property change
+    // events to the UI.
     updateUI();
     setModel(model);
   }
@@ -1897,6 +1902,10 @@
     if (treeModel == model)
       return;
 
+    // Remove listeners from old model.
+    if (treeModel != null && treeModelListener != null)
+      treeModel.removeTreeModelListener(treeModelListener);
+
     // add treeModelListener to the new model
     if (treeModelListener == null)
       treeModelListener = createTreeModelListener();
@@ -1905,6 +1914,20 @@
 
     TreeModel oldValue = treeModel;
     treeModel = model;
+    clearToggledPaths();
+
+    if (treeModel != null)
+      {
+        if (treeModelListener == null)
+          treeModelListener = createTreeModelListener();
+        if (treeModelListener != null)
+          treeModel.addTreeModelListener(treeModelListener);
+        Object root = treeModel.getRoot();
+        if (root != null && !treeModel.isLeaf(root))
+          {
+            nodeStates.put(new TreePath(root), Boolean.TRUE);
+          }
+      }
 
     firePropertyChange(TREE_MODEL_PROPERTY, oldValue, model);
   }

Index: plaf/basic/BasicTreeUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTreeUI.java,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- plaf/basic/BasicTreeUI.java	25 May 2006 08:51:13 -0000	1.139
+++ plaf/basic/BasicTreeUI.java	7 Jun 2006 14:36:03 -0000	1.140
@@ -49,7 +49,6 @@
 import java.awt.Graphics;
 import java.awt.Insets;
 import java.awt.Label;
-import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -307,17 +306,6 @@
     nodeDimensions = createNodeDimensions();
     configureLayoutCache();
 
-    propertyChangeListener = createPropertyChangeListener();
-    focusListener = createFocusListener();
-    treeSelectionListener = createTreeSelectionListener();
-    mouseListener = createMouseListener();
-    keyListener = createKeyListener();
-    selectionModelPropertyChangeListener = createSelectionModelPropertyChangeListener();
-    componentListener = createComponentListener();
-    cellEditorListener = createCellEditorListener();
-    treeExpansionListener = createTreeExpansionListener();
-    treeModelListener = createTreeModelListener();
-
     editingRow = - 1;
     lastSelectedRow = - 1;
   }
@@ -513,9 +501,22 @@
    */
   protected void setModel(TreeModel model)
   {
-    tree.setModel(model);
+    completeEditing();
+
+    if (treeModel != null && treeModelListener != null)
+      treeModel.removeTreeModelListener(treeModelListener);
+
     treeModel = tree.getModel();
+
+    if (treeModel != null && treeModelListener != null)
+      treeModel.addTreeModelListener(treeModelListener);
+
+    if (treeState != null)
+      {
     treeState.setModel(treeModel);
+        updateLayoutCacheExpandedNodes();
+        updateSize();
+      }
   }
 
   /**
@@ -555,7 +556,13 @@
    */
   protected void setShowsRootHandles(boolean newValue)
   {
-    tree.setShowsRootHandles(newValue);
+    completeEditing();
+    updateDepthOffset();
+    if (treeState != null)
+      {
+        treeState.invalidateSizes();
+        updateSize();
+      }
   }
 
   /**
@@ -822,9 +829,12 @@
    * default/listeners have been installed.
    */
   protected void prepareForUIInstall()
-  throws NotImplementedException
   {
-    // TODO: Implement this properly.
+    lastSelectedRow = -1;
+    preferredSize = new Dimension();
+    largeModel = tree.isLargeModel();
+    preferredSize = new Dimension();
+    setModel(tree.getModel());
   }
 
   /**
@@ -832,9 +842,15 @@
    * installed.
    */
   protected void completeUIInstall()
-  throws NotImplementedException
   {
-    // TODO: Implement this properly.
+    setShowsRootHandles(tree.getShowsRootHandles());
+    updateRenderer();
+    updateDepthOffset();
+    setSelectionModel(tree.getSelectionModel());
+    treeState = createLayoutCache();
+    treeSelectionModel.setRowMapper(treeState);
+    configureLayoutCache();
+    updateSize();
   }
 
   /**
@@ -997,15 +1013,14 @@
    */
   protected TreeCellEditor createDefaultCellEditor()
   {
-    if (currentCellRenderer != null)
-      return new DefaultTreeCellEditor(
-                                       tree,
-                                       (DefaultTreeCellRenderer) currentCellRenderer,
-                                       cellEditor);
-    return new DefaultTreeCellEditor(
-                                     tree,
-                                     (DefaultTreeCellRenderer) createDefaultCellRenderer(),
-                                     cellEditor);
+    DefaultTreeCellEditor ed;
+    if (currentCellRenderer != null
+        && currentCellRenderer instanceof DefaultTreeCellRenderer)
+      ed = new DefaultTreeCellEditor(tree,
+                                (DefaultTreeCellRenderer) currentCellRenderer);
+    else
+      ed = new DefaultTreeCellEditor(tree, null);
+    return ed;
   }
 
   /**
@@ -1102,7 +1117,7 @@
    */
   protected void updateLayoutCacheExpandedNodes()
   {
-    if (treeModel != null)
+    if (treeModel != null && treeModel.getRoot() != null)
       updateExpandedDescendants(new TreePath(treeModel.getRoot()));
   }
 
@@ -1161,6 +1176,8 @@
 
     if (currentCellRenderer == null)
       currentCellRenderer = createDefaultCellRenderer();
+
+    updateCellEditor();
   }
 
   /**
@@ -1317,16 +1334,41 @@
    */
   protected void installListeners()
   {
+    propertyChangeListener = createPropertyChangeListener();
     tree.addPropertyChangeListener(propertyChangeListener);
+
+    focusListener = createFocusListener();
     tree.addFocusListener(focusListener);
+
+    treeSelectionListener = createTreeSelectionListener();
     tree.addTreeSelectionListener(treeSelectionListener);
+
+    mouseListener = createMouseListener();
     tree.addMouseListener(mouseListener);
+
+    keyListener = createKeyListener();
     tree.addKeyListener(keyListener);
-    tree.addPropertyChangeListener(selectionModelPropertyChangeListener);
+
+    selectionModelPropertyChangeListener =
+      createSelectionModelPropertyChangeListener();
+    if (treeSelectionModel != null
+        && selectionModelPropertyChangeListener != null)
+      {
+        treeSelectionModel.addPropertyChangeListener
+                                        (selectionModelPropertyChangeListener);
+      }
+
+    componentListener = createComponentListener();
     tree.addComponentListener(componentListener);
+
+    treeExpansionListener = createTreeExpansionListener();
     tree.addTreeExpansionListener(treeExpansionListener);
+
+    treeModelListener = createTreeModelListener();
     if (treeModel != null)
       treeModel.addTreeModelListener(treeModelListener);
+
+    cellEditorListener = createCellEditorListener();
   }
 
   /**
@@ -1337,25 +1379,12 @@
   public void installUI(JComponent c)
   {
     tree = (JTree) c;
-    treeModel = tree.getModel();
 
     prepareForUIInstall();
-    super.installUI(c);
     installDefaults();
     installComponents();
     installKeyboardActions();
     installListeners();
-
-    setCellEditor(createDefaultCellEditor());
-    createdCellEditor = true;
-    isEditing = false;
-
-    setModel(tree.getModel());
-    treeSelectionModel = tree.getSelectionModel();
-    setRootVisible(tree.isRootVisible());
-    treeState.setRootVisible(tree.isRootVisible());
-    updateExpandedDescendants(new TreePath(new Object[] { treeModel.getRoot() }));
-
     completeUIInstall();
   }
   
@@ -1613,6 +1642,9 @@
   protected void completeEditing(boolean messageStop, boolean messageCancel,
                                  boolean messageTree)
   {
+    if (! stopEditingInCompleteEditing || editingComponent == null)
+      return;
+
     if (messageStop)
       {
         getCellEditor().stopCellEditing();
@@ -1698,7 +1730,7 @@
                                               int mouseY)
   {
     if (isLocationInExpandControl(path, mouseX, mouseY))
-      toggleExpandState(path);
+      handleExpandControlClick(path, mouseX, mouseY);
   }
 
   /**
@@ -1717,16 +1749,17 @@
                                               int mouseY)
   {
     boolean cntlClick = false;
-    int row = getRowForPath(tree, path);
-
-    if (! isLeaf(row))
+    if (! treeModel.isLeaf(path.getLastPathComponent()))
       {
-        Rectangle bounds = getPathBounds(tree, path);
-
-        if (hasControlIcons()
-            && (mouseX < bounds.x)
-            && (mouseX > (bounds.x - getCurrentControlIcon(path).getIconWidth() - gap)))
-          cntlClick = true;
+        int width = 8; // Only guessing.
+        Icon expandedIcon = getExpandedIcon();
+        if (expandedIcon != null)
+          width = expandedIcon.getIconWidth();
+
+        Insets i = tree.getInsets();
+        int left = getRowX(tree.getRowForPath(path), path.getPathCount() - 1)
+                   -getRightChildIndent() - width / 2 + i.left;
+        cntlClick = mouseX >= left && mouseX <= left + width;
       }
     return cntlClick;
   }
@@ -2203,95 +2236,30 @@
      */
     public void mousePressed(MouseEvent e)
     {
-      // Any mouse click cancels the previous waiting edit action, initiated
-      // by the single click on the selected node.
-      if (startEditTimer != null)
+
+      if (tree != null && tree.isEnabled())
         {
-          startEditTimer.stop();
-          startEditTimer = null;
-        }
+          // Maybe stop editing and return.
+          if (isEditing(tree) && tree.getInvokesStopCellEditing()
+              && !stopEditing(tree))
+            return;
 
-      Point click = e.getPoint();
-      TreePath path = getClosestPathForLocation(tree, click.x, click.y);
+          int x = e.getX();
+          int y = e.getY();
+          TreePath path = getClosestPathForLocation(tree, x, y);
 
       if (path != null)
         {
           Rectangle bounds = getPathBounds(tree, path);
-          int row = getRowForPath(tree, path);
+              if (SwingUtilities.isLeftMouseButton(e))
+                checkForClickInExpandControl(path, x, y);
           
-          // Cancel the editing session if clicked on the different row.
-          if (tree.isEditing() && row != editingRow)
-            cancelEditing(tree);
-          
-          boolean cntlClick = isLocationInExpandControl(path, click.x, click.y);
-
-          boolean isLeaf = isLeaf(row);
-
-          TreeCellRenderer tcr = getCellRenderer();
-          Icon icon;
-          if (isLeaf)
-            icon = UIManager.getIcon("Tree.leafIcon");
-          else if (tree.isExpanded(path))
-            icon = UIManager.getIcon("Tree.openIcon");
-          else
-            icon = UIManager.getIcon("Tree.closedIcon");
-
-          if (tcr instanceof DefaultTreeCellRenderer)
+              if (x > bounds.x && x <= (bounds.x + bounds.width))
             {
-              Icon tmp = ((DefaultTreeCellRenderer) tcr).getIcon();
-              if (tmp != null)
-                icon = tmp;
-            }
-
-          // add gap*2 for the space before and after the text
-          if (icon != null)
-            bounds.width += icon.getIconWidth() + gap * 2;
-
-          boolean inBounds = bounds.contains(click.x, click.y);
-          if ((inBounds || cntlClick) && tree.isVisible(path))
-            {
-              if (inBounds)
-                {
-                  TreePath currentLead = tree.getLeadSelectionPath();
-                  if (currentLead != null && currentLead.equals(path)
-                      && e.getClickCount() == 1 && tree.isEditable())
-                    {
-                      // Schedule the editing session.
-                      final TreePath editPath = path;
-
-                      if (startEditTimer != null)
-                        startEditTimer.stop();
-
-                      startEditTimer = new Timer(WAIT_TILL_EDITING,
-                        new ActionListener()
-                          {
-                            public void actionPerformed(ActionEvent e)
-                              {
-                                startEditing(editPath, EDIT);
-                              }
-                          });
-                      startEditTimer.setRepeats(false);
-                      startEditTimer.start();
-                    }
-                  else
-                    {
-                      if (e.getClickCount() == 2 && ! isLeaf(row))
-                        toggleExpandState(path);
-                      else
+                  if (! startEditing(path, e))
                         selectPathForEvent(path, e);
                     }
                 }
-
-              if (cntlClick)
-                {
-                  handleExpandControlClick(path, click.x, click.y);
-                  if (cellEditor != null)
-                    cellEditor.cancelCellEditing();
-                  tree.scrollPathToVisible(path);
-                }
-              else if (tree.isEditable())
-                startEditing(path, e);
-            }
         }
     }
 
@@ -2555,8 +2523,14 @@
         }
       else if (property.equals(JTree.TREE_MODEL_PROPERTY))
         {
-          treeModel = tree.getModel();
-          treeModel.addTreeModelListener(treeModelListener);
+          setModel(tree.getModel());
+        }
+      else if (property.equals(JTree.CELL_RENDERER_PROPERTY))
+        {
+          setCellRenderer(tree.getCellRenderer());
+          // Update layout.
+          if (treeState != null)
+            treeState.invalidateSizes();
         }
     }
   }

Index: tree/DefaultTreeCellEditor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/tree/DefaultTreeCellEditor.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- tree/DefaultTreeCellEditor.java	20 Apr 2006 11:57:47 -0000	1.21
+++ tree/DefaultTreeCellEditor.java	7 Jun 2006 14:36:03 -0000	1.22
@@ -382,7 +382,6 @@
     editingContainer = createContainer();
     setFont(UIManager.getFont("Tree.font"));
     setBorderSelectionColor(UIManager.getColor("Tree.selectionBorderColor"));
-    editingIcon = renderer.getIcon();
   }
 
   /**

Index: tree/TreePath.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/tree/TreePath.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- tree/TreePath.java	27 Apr 2006 08:23:45 -0000	1.11
+++ tree/TreePath.java	7 Jun 2006 14:36:03 -0000	1.12
@@ -262,14 +262,16 @@
     if (path == null)
       return false;
     int count = getPathCount();
-    if (path.getPathCount() < count)
+    int otherPathLength = path.getPathCount();
+    if (otherPathLength < count)
       return false;
-    for (int i = 0; i < count; i++)
+    while (otherPathLength > count)
     {
-      if (!this.path[i].equals(path.getPathComponent(i)))
-        return false;
+        otherPathLength--;
+        path = path.getParentPath();
     }
-    return true;
+    
+    return equals(path);
   }
 
   /**

Index: tree/VariableHeightLayoutCache.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/tree/VariableHeightLayoutCache.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- tree/VariableHeightLayoutCache.java	23 May 2006 16:01:38 -0000	1.15
+++ tree/VariableHeightLayoutCache.java	7 Jun 2006 14:36:03 -0000	1.16
@@ -232,6 +232,9 @@
     
     totalHeight = maximalWidth = 0;
 
+    if (treeModel == null)
+      return;
+
     Object root = treeModel.getRoot();
 
     if (rootVisible)
@@ -555,10 +558,17 @@
   public void setModel(TreeModel newModel)
   {
     treeModel = newModel;
+    // We need to clear the table and update the layout,
+    // so that we don't end up with wrong data in the tables.
+    expanded.clear();
+    update();
+    if (treeModel != null)
+      {
     // The root node is expanded by default.
     expanded.add(treeModel.getRoot());
     dirty = true;
   }
+  }
   
   /**
    * Inform the instance if the tree root node is visible. If this method



From MAILER-DAEMON Wed Jun 07 10:46:56 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnzJA-0006Ns-0g
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 10:46:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnzJ8-0006NN-Kj
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 10:46:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnzJ8-0006Mx-4N
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 10:46:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnzJ7-0006Mp-Mk
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 10:46:53 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnzQj-0003Oq-My
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 10:54:45 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnzJ6-0004BF-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 10:46:52 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FnzJ5-0004BA-3x
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 14:46:52 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnzJ5-0004BA-3x@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 07 Jun 2006 14:46:51 +0000
Subject: [commit-cp] classpath ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 14:46:54 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/07 14:46:50

Modified files:
	.              : ChangeLog 

Log message:
	Checking in the missing ChangeLog.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7696&r2=1.7697

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7696
retrieving revision 1.7697
diff -u -b -r1.7696 -r1.7697
--- ChangeLog	7 Jun 2006 13:56:51 -0000	1.7696
+++ ChangeLog	7 Jun 2006 14:46:49 -0000	1.7697
@@ -1,3 +1,54 @@
+2006-06-06  Roman Kennke  <kennke@aicas.com>
+
+	PR 27920
+	* javax/swing/JTree.java
+	(JTree()): Initialize with default model.
+	(JTree(TreeModel)): Clear expanded state hashtable. Added comment
+	on the updateUI() / setModel() order.
+	(setModel): Correctly (un-)setup the listeners. Clear the expanded
+	paths.
+	* javax/swing/plaf/basic/BasicTreeUI.java
+	(BasicTreeUI()): Initialize listeners in installListeners().
+	(setModel): Complete editing on model change. Correctly resetup
+	the listeners. Update the layout cache accordingly.
+	(setShowRootHandles): Complete editing and update layout. Do not
+	call back into the JTree, this could cause cycles.
+	(prepareForUIInstall): Implemented. Moved some init code from
+	installUI() to this method.
+	(completeUIInstall): Implemented. Moved some init code from
+	installUI() to this method.
+	(createDefaultCellEditor): Check for type of renderer, and install
+	with null renderer when not DefaultTreeCellRenderer.
+	(updateLayoutCacheExpandedNodes): Added null check for tree root
+	to avoid NPE.
+	(updateRenderer): Call updateEditor().
+	(installListeners): Initialize the listeners here. Added some null
+	checks to avoid NPEs.
+	(installUI): Moved some init code to prepareForUIInstall() and
+	completeUIInstall().
+	(completeEditing): Return immediately if editing component is null
+	or if the setting is to not stop editing on complete editing.
+	(checkForClickInExpandControl): Call handleExpandControlClick()
+	instead of toggleExpandState() directly.
+	(isLocationInExpandControl): Rewritten to correctly determine the
+	expand click location.
+	(MouseHandler.mousePressed): Rewritten to make better use of the
+	instance methods of BasicTreeUI to handle the click.
+	(PropertyHandler.propertyChange): Handle model and cell renderer
+	updates.
+	* javax/swing/tree/DefaultTreeCellEditor.java
+	(DefaultTreeCellEditor): Removed initialization of the icon. This
+	is done so that the constructor can deal with null renderer as the
+	RI does. Maybe this needs more fixing.
+	* javax/swing/tree/TreePath.java
+	(isDescendant): Fixed this method. The previous version did too
+	much and compared the wrong things, which lead to a ClassCastException
+	in equals().
+	* javax/swing/tree/VariableHeightLayoutCache.java
+	(update): Do nothing when model is null.
+	(setModel): Clear the tables and update the layout. Added null
+	check to prevent NPE.
+
 2006-06-05  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/peer/gtk/GdkGlyphVector: Removed file.



From MAILER-DAEMON Wed Jun 07 11:09:56 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FnzfQ-0006Zh-PE
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 11:09:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FnzfO-0006ZU-GT
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 11:09:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FnzfN-0006ZI-L5
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 11:09:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FnzfN-0006ZD-DY
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 11:09:53 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fnzmz-0005SW-Hk
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 11:17:45 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FnzfB-0004lh-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 11:09:41 -0400
Received: from gbenson by savannah.gnu.org with local (Exim 4.50)
	id 1FnzfB-0004la-GU
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:09:41 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FnzfB-0004la-GU@savannah.gnu.org>
From: Gary Benson <gbenson@redhat.com>
Date: Wed, 07 Jun 2006 15:09:41 +0000
Subject: [commit-cp] classpath ChangeLog configure.ac NEWS native/jn...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 15:09:55 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Gary Benson <gbenson>	06/06/07 15:09:41

Modified files:
	.              : ChangeLog configure.ac NEWS 
	native/jni/java-io: java_io_VMFile.c 
	include        : java_io_VMFile.h 
	vm/reference/java/io: VMFile.java 
	gnu/java/io    : PlatformHelper.java 
	java/io        : File.java 

Log message:
	2006-06-07  Gary Benson  <gbenson@redhat.com>
	
		PR 24895
		* native/jni/java-io/java_io_VMFile.c
		(Java_java_io_VMFile_toCanonicalForm): New method.
		* configure.ac: Added checks for lstat and readlink.
		* include/java_io_VMFile.h: Added new method.
		* vm/reference/java/io/VMFile.java: Use new method.
		* gnu/java/io/PlatformHelper.java (toCanonicalForm): Removed.
		* NEWS: Documented the above.
		* java/io/File.java: Javadoc fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7697&r2=1.7698
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&r1=1.159&r2=1.160
http://cvs.savannah.gnu.org/viewcvs/classpath/NEWS?cvsroot=classpath&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/java-io/java_io_VMFile.c?cvsroot=classpath&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/classpath/include/java_io_VMFile.h?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/java/io/VMFile.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/io/PlatformHelper.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/java/io/File.java?cvsroot=classpath&r1=1.61&r2=1.62

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7697
retrieving revision 1.7698
diff -u -b -r1.7697 -r1.7698
--- ChangeLog	7 Jun 2006 14:46:49 -0000	1.7697
+++ ChangeLog	7 Jun 2006 15:09:38 -0000	1.7698
@@ -1,3 +1,15 @@
+2006-06-07  Gary Benson  <gbenson@redhat.com>
+
+	PR 24895
+	* native/jni/java-io/java_io_VMFile.c
+	(Java_java_io_VMFile_toCanonicalForm): New method.
+	* configure.ac: Added checks for lstat and readlink.
+	* include/java_io_VMFile.h: Added new method.
+	* vm/reference/java/io/VMFile.java: Use new method.
+	* gnu/java/io/PlatformHelper.java (toCanonicalForm): Removed.
+	* NEWS: Documented the above.
+	* java/io/File.java: Javadoc fix.
+
 2006-06-06  Roman Kennke  <kennke@aicas.com>
 
 	PR 27920

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -b -r1.159 -r1.160
--- configure.ac	6 Jun 2006 10:19:48 -0000	1.159
+++ configure.ac	7 Jun 2006 15:09:39 -0000	1.160
@@ -321,6 +321,7 @@
 		  strerror_r \
                   fcntl \
 		  mmap munmap mincore msync madvise getpagesize sysconf \
+		  lstat readlink \
 		  ])
 
   LIBMAGIC=

Index: NEWS
===================================================================
RCS file: /cvsroot/classpath/classpath/NEWS,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- NEWS	5 Jun 2006 18:37:59 -0000	1.147
+++ NEWS	7 Jun 2006 15:09:40 -0000	1.148
@@ -27,6 +27,9 @@
   URLConnection.guessContentTypeFromStream.  The reference
   implementation uses libmagic (and falls back to doing nothing if
   libmagic is not available).
+* The method gnu.java.io.PlatformHelper.toCanonicalForm() has been
+  replaced with a JNI implementation of VMFile.toCanonicalForm() for
+  GNU/Posix systems.
 
 New in release 0.91 (May 15, 2006)
 

Index: native/jni/java-io/java_io_VMFile.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-io/java_io_VMFile.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- native/jni/java-io/java_io_VMFile.c	25 Jan 2006 10:40:12 -0000	1.10
+++ native/jni/java-io/java_io_VMFile.c	7 Jun 2006 15:09:40 -0000	1.11
@@ -1,5 +1,5 @@
 /* java_io_VMFile.c - Native methods for java.io.File class
-   Copyright (C) 1998, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -730,3 +730,237 @@
   return (0);
 #endif /* not WITHOUT_FILESYSTEM */
 }
+
+/*************************************************************************/
+
+/*
+ * These two methods are used to maintain dynamically allocated
+ * buffers for getCanonicalPath without the overhead of calling
+ * realloc every time a buffer is modified.  Buffers are sized
+ * at the smallest multiple of CHUNKSIZ that is greater than or
+ * equal to the desired length.  The default CHUNKSIZ is 256,
+ * longer than most paths, so in most cases a getCanonicalPath
+ * will require only one malloc per buffer.
+ */
+
+#define CHUNKLOG 8
+#define CHUNKSIZ (1 << CHUNKLOG)
+
+static int
+nextChunkSize (int size)
+{
+  return ((size >> CHUNKLOG) + ((size & (CHUNKSIZ - 1)) ? 1 : 0)) << CHUNKLOG;
+}
+
+static char *
+maybeGrowBuf (JNIEnv *env, char *buf, int *size, int required)
+{
+  if (required > *size)
+    {
+      *size = nextChunkSize (required);
+      buf = JCL_realloc (env, buf, *size);
+    }
+  return buf;
+}
+
+/*************************************************************************/
+
+/*
+ * This method converts a path to canonical form on GNU/Posix systems.
+ * This involves the removal of redundant separators, references to
+ * "." and "..", and symbolic links.
+ *
+ * The conversion proceeds on a component-by-component basis: symbolic
+ * links and references to ".."  are resolved as and when they occur.
+ * This means that if "/foo/bar" is a symbolic link to "/baz" then the
+ * canonical form of "/foo/bar/.." is "/" and not "/foo".
+ *
+ * In order to mimic the behaviour of proprietary JVMs, non-existant
+ * path components are allowed (a departure from the normal GNU system
+ * convention).  This means that if "/foo/bar" is a symbolic link to
+ * "/baz", the canonical form of "/non-existant-directory/../foo/bar"
+ * is "/baz".
+ *
+ * Class:     java_io_VMFile
+ * Method:    toCanonicalForm
+ * Signature: (Ljava/lang/String)Ljava/lang/String
+ */
+
+JNIEXPORT jstring JNICALL
+Java_java_io_VMFile_toCanonicalForm (JNIEnv *env,
+				     jclass class __attribute__ ((__unused__)),
+				     jstring jpath)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *path;
+  char *src, *dst;
+  int srci, dsti;
+  int srcl, dstl;
+  int len;
+  int fschecks;
+#if defined (HAVE_LSTAT) && defined (HAVE_READLINK)
+  struct stat sb;
+#endif /* HAVE_LSTAT && HAVE_READLINK */
+
+  path = JCL_jstring_to_cstring (env, jpath);
+  if (path == NULL)
+    return NULL;
+
+  /* It is the caller's responsibility to ensure the path is absolute. */
+  if (path[0] == 0 || path[0] != '/')
+    {
+      JCL_free_cstring (env, jpath, path);
+      JCL_ThrowException (env, "java/lang/RuntimeException", "Not absolute");
+      return NULL;
+    }
+
+  len = strlen (path);
+  srcl = nextChunkSize (len + 1);
+  src = JCL_malloc (env, srcl);
+  if (src == NULL)
+    {
+      JCL_free_cstring (env, jpath, path);
+      return NULL;
+    }
+  strcpy (src, path);
+  JCL_free_cstring (env, jpath, path);
+  srci = 1;
+
+  dstl = nextChunkSize (2);  
+  dst = JCL_malloc (env, dstl);
+  if (dst == NULL)
+    {
+      JCL_free (env, src);
+      return NULL;
+    }
+  dst[0] = '/';
+  dsti = 1;
+
+  fschecks = JNI_TRUE;
+
+  while (src[srci] != '\0')
+    {
+      int tmpi, dsti_save;
+
+      /* Skip slashes. */
+      while (src[srci] == '/')
+	srci++;
+      tmpi = srci;
+      /* Find next slash. */
+      while (src[srci] != '/' && src[srci] != '\0')
+	srci++;
+      if (srci == tmpi)
+	/* We hit the end. */
+	break;
+      len = srci - tmpi;
+
+      /* Handle "." and "..". */
+      if (len == 1 && src[tmpi] == '.')
+	continue;
+      if (len == 2 && src[tmpi] == '.' && src[tmpi + 1] == '.')
+	{
+	  while (dsti > 1 && dst[dsti - 1] != '/')
+	    dsti--;
+	  if (dsti != 1)
+	    dsti--;
+	  /* Reenable filesystem checking if disabled, as we might
+	   * have reversed over whatever caused the problem before.
+	   * At least one proprietary JVM has inconsistencies because
+	   * it does not do this.
+	   */
+	  fschecks = JNI_TRUE;
+	  continue;
+	}
+
+      /* Handle real path components. */
+      dst = maybeGrowBuf (env,
+			  dst, &dstl, dsti + (dsti > 1 ? 1 : 0) + len + 1);
+      if (dst == NULL)
+	{
+	  JCL_free (env, src);
+	  return NULL;
+	}
+      dsti_save = dsti;
+      if (dsti > 1)
+	dst[dsti++] = '/';
+      strncpy (&dst[dsti], &src[tmpi], len);
+      dsti += len;
+      if (fschecks == JNI_FALSE)
+	continue;
+
+#if defined (HAVE_LSTAT) && defined (HAVE_READLINK)
+      dst[dsti] = '\0';
+      if (lstat (dst, &sb) == 0)
+	{
+	  if (S_ISLNK (sb.st_mode))
+	    {
+	      int tmpl = CHUNKSIZ;
+	      char *tmp = JCL_malloc (env, tmpl);
+	      if (tmp == NULL)
+		{
+		  JCL_free (env, src);
+		  JCL_free (env, dst);
+		  return NULL;
+		}
+
+	      while (1)
+		{
+		  tmpi = readlink (dst, tmp, tmpl);
+		  if (tmpi < 1)
+		    {
+		      JCL_free (env, src);
+		      JCL_free (env, dst);
+		      JCL_free (env, tmp);
+		      JCL_ThrowException (env, "java/io/IOException",
+					  "readlink failed");
+		      return NULL;
+		    }
+		  if (tmpi < tmpl)
+		    break;
+		  tmpl += CHUNKSIZ;
+		  tmp = JCL_realloc (env, tmp, tmpl);
+		}
+
+	      /* Prepend the link's path to src. */
+	      tmp = maybeGrowBuf (env,
+				  tmp, &tmpl, tmpi + strlen (&src[srci]) + 1);
+	      if (tmp == NULL)
+		{
+		  JCL_free (env, src);
+		  JCL_free (env, dst);
+		  return NULL;
+		}
+
+	      strcpy (&tmp[tmpi], &src[srci]);
+	      JCL_free (env, src);
+	      src = tmp;
+	      srcl = tmpl;
+	      srci = 0;
+
+	      /* Either replace or append dst depending on whether the
+	       * link is relative or absolute.
+	       */
+	      dsti = src[0] == '/' ? 1 : dsti_save;
+	    }
+	}
+      else
+	{
+	  /* Something doesn't exist, or we don't have permission to
+	   * read it, or a previous path component is a directory, or
+	   * a symlink is looped.  Whatever, we can't check the
+	   * filesystem any more.
+	   */
+	  fschecks = JNI_FALSE;
+	}
+#endif /* HAVE_LSTAT && HAVE_READLINK */
+    }
+  dst[dsti] = '\0';
+
+  jpath = (*env)->NewStringUTF (env, dst);
+  JCL_free (env, src);
+  JCL_free (env, dst);
+  return jpath;
+#else /* not WITHOUT_FILESYSTEM */
+  return NULL;
+#endif /* not WITHOUT_FILESYSTEM */
+}

Index: include/java_io_VMFile.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_io_VMFile.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- include/java_io_VMFile.h	11 Nov 2004 17:31:31 -0000	1.3
+++ include/java_io_VMFile.h	7 Jun 2006 15:09:40 -0000	1.4
@@ -24,6 +24,7 @@
 JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canWrite (JNIEnv *env, jclass, jstring);
 JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canRead (JNIEnv *env, jclass, jstring);
 JNIEXPORT jboolean JNICALL Java_java_io_VMFile_isDirectory (JNIEnv *env, jclass, jstring);
+JNIEXPORT jstring JNICALL Java_java_io_VMFile_toCanonicalForm (JNIEnv *env,jclass, jstring);
 #undef java_io_VMFile_IS_CASE_SENSITIVE
 #define java_io_VMFile_IS_CASE_SENSITIVE 1L
 #undef java_io_VMFile_IS_DOS_8_3

Index: vm/reference/java/io/VMFile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/vm/reference/java/io/VMFile.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- vm/reference/java/io/VMFile.java	2 Jul 2005 20:33:08 -0000	1.7
+++ vm/reference/java/io/VMFile.java	7 Jun 2006 15:09:40 -0000	1.8
@@ -1,5 +1,5 @@
 /* VMFile.java -- Class for methods natively accessing files
-   Copyright (C) 2004  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -210,10 +210,10 @@
 
   /**
    * This method returns a canonical representation of the pathname of
-   * the given path.  The actual form of the canonical representation is
-   * different.  On the GNU system, the canonical form differs from the
-   * absolute form in that all relative file references to "." and ".."
-   * are resolved and removed.
+   * this file.  The actual form of the canonical representation is
+   * system-dependent.  On the GNU system, conversion to canonical
+   * form involves the removal of redundant separators, references to
+   * "." and "..", and symbolic links.
    * <p>
    * Note that this method, unlike the other methods which return path
    * names, can throw an IOException.  This is because native method 
@@ -221,9 +221,5 @@
    *
    * @exception IOException If an error occurs
    */
-  public static String toCanonicalForm(String path) throws IOException
-  {
-	// FIXME: this only works on UNIX
-	return PlatformHelper.toCanonicalForm(path);
-  }
+  public static native String toCanonicalForm(String path) throws IOException;
 }

Index: gnu/java/io/PlatformHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/io/PlatformHelper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnu/java/io/PlatformHelper.java	14 Nov 2005 13:08:11 -0000	1.6
+++ gnu/java/io/PlatformHelper.java	7 Jun 2006 15:09:40 -0000	1.7
@@ -1,5 +1,5 @@
 /* PlatformHelper.java -- Isolate OS-specific IO helper methods and variables
-   Copyright (C) 1998, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2002, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -97,98 +97,6 @@
   }
 
   /**
-   * This routine canonicalizes input param "path" to formal path representation
-   *  for current platform, including interpreting ".." and "." .
-   */
-  public static final String toCanonicalForm(String path)
-  {
-    /*??
-    if(path.indexOf('.') < 0 && path.indexOf("..") < 0)
-        return path; 
-    */
-    String tmppath = path.replace('/', separatorChar);
-    StringBuffer canonpath;
-
-    int i;
-
-    if ((i = beginWithRootPathPrefix(tmppath)) == 0 )
-      return path;
-    
-    /* The original 
-           "canonpath = new StringBuffer(tmppath.substring(0, i))"
-       isn't very efficient because StringBuffer's 
-       ensureCapacity_unsynchronized will fail definitely each time 
-       and will enlarge buffer and copy contents.       .
-    */
-    canonpath = new StringBuffer(INITIAL_MAX_PATH);
-    canonpath.append(tmppath.substring(0, i));
-    tmppath = tmppath.substring(i);
-    // pathdepth==0 indicates there're only root path in the buffer
-    int pathdepth = 0;
-    
-    StringTokenizer st = new StringTokenizer(tmppath, separator);
-    
-    // Traverse each element of the path, handling "." and ".."
-    // Should handle "~" too?
-    if (st.hasMoreTokens())
-      do
-        {
-          String s = st.nextToken();
-        
-          // Handle "." or an empty element.  
-          if (s.equals(".") || s.equals(""))
-            continue;
-        
-          // Handle ".." by deleting the last element from the path
-          if (s.equals(".."))
-            {
-              if (pathdepth == 0)
-                continue;
-
-              // Strip of trailing separator
-              canonpath.setLength(canonpath.length() - 1/*separator.length()*/);
-              String tmpstr = canonpath.toString();
-              int idx = tmpstr.lastIndexOf(separator); 
-
-              if ((idx == -1) || ((idx + 1/*separator.length()*/) > tmpstr.length()))
-                //throw new IOException("Can't happen error"); 
-                return path; // Shouldn't happen 
-        
-              canonpath.setLength(idx + 1/*separator.length()*/);
-              pathdepth--;
-              continue;
-            }
-        
-          canonpath.append(s);
-          pathdepth++; //now it's more than root path
-
-          if (st.hasMoreTokens())
-            canonpath.append(separator);
-        }
-      while (st.hasMoreTokens());
-    
-    if (endWithSeparator(path))
-      canonpath.append(separator);
-        
-    String tmpstr = canonpath.toString();
-    //if (pathdepth > 0 && endWithSeparator(tmpstr) )
-    //    tmpstr = tmpstr.substring(0, tmpstr.length() - 1/*separator.length()*/);
-    
-    return tmpstr;
-  }
-
-  /**
-   * This routine canonicalizes input param "path" to formal path representation
-   *  for current platform, and normalize all separators to "sepchar".
-   */
-  public static final String toCanonicalForm(String path, char sepchar)
-  {
-    String tmpstr = toCanonicalForm(path);
-    tmpstr = tmpstr.replace(separatorChar, sepchar);
-    return tmpstr;
-  }
-
-  /**
    * This routine checks whether input param "path" ends with separator
    */
   public static final boolean endWithSeparator(String path)

Index: java/io/File.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/File.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- java/io/File.java	17 Dec 2005 21:16:23 -0000	1.61
+++ java/io/File.java	7 Jun 2006 15:09:41 -0000	1.62
@@ -1,5 +1,5 @@
 /* File.java -- Class representing a file on disk
-   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005
+   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -484,9 +484,9 @@
   /**
    * This method returns a canonical representation of the pathname of
    * this file.  The actual form of the canonical representation is
-   * different.  On the GNU system, the canonical form differs from the
-   * absolute form in that all relative file references to "." and ".."
-   * are resolved and removed.
+   * system-dependent.  On the GNU system, conversion to canonical
+   * form involves the removal of redundant separators, references to
+   * "." and "..", and symbolic links.
    * <p>
    * Note that this method, unlike the other methods which return path
    * names, can throw an IOException.  This is because native method 



From MAILER-DAEMON Wed Jun 07 11:22:56 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fnzs0-0003lz-N9
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 11:22:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fnzrz-0003ln-2i
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 11:22:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fnzrx-0003l3-Ax
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 11:22:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fnzrx-0003kv-7M
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 11:22:53 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FnzzZ-0006x1-P6
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 11:30:45 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fnzrw-0005Mh-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 11:22:52 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1Fnzrv-0005MV-31
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:22:52 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fnzrv-0005MV-31@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Wed, 07 Jun 2006 15:22:51 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Freet...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 15:22:55 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/07 15:22:50

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: FreetypeGlyphVector.java 
	java/lang      : String.java 

Log message:
	2006-06-07  Lillian Angel  <langel@redhat.com>
	
	        * gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
	        (FreetypeGlyphVector): Removed assignment. Caused compilation error.
	        * java/lang/String.java
	        (codePointCount): Fixed check to match API. Shouldn't throw exception
	        if end == count. end is 1 more than the endIndex, so end == count is
	        possible.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7698&r2=1.7699
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/String.java?cvsroot=classpath&r1=1.81&r2=1.82

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7698
retrieving revision 1.7699
diff -u -b -r1.7698 -r1.7699
--- ChangeLog	7 Jun 2006 15:09:38 -0000	1.7698
+++ ChangeLog	7 Jun 2006 15:22:50 -0000	1.7699
@@ -1,3 +1,12 @@
+2006-06-07  Lillian Angel  <langel@redhat.com>
+
+	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
+	(FreetypeGlyphVector): Removed assignment. Caused compilation error.
+	* java/lang/String.java
+	(codePointCount): Fixed check to match API. Shouldn't throw exception
+	if end == count. end is 1 more than the endIndex, so end == count is 
+	possible.
+
 2006-06-07  Gary Benson  <gbenson@redhat.com>
 
 	PR 24895

Index: gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	7 Jun 2006 13:54:32 -0000	1.1
+++ gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	7 Jun 2006 15:22:50 -0000	1.2
@@ -102,7 +102,6 @@
    */
   public FreetypeGlyphVector(Font f, int[] codes, FontRenderContext frc)
   {
-    this.s = s;
     this.font = f;
     this.frc = frc;
     if( !(font.getPeer() instanceof GdkFontPeer ) )

Index: java/lang/String.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/String.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- java/lang/String.java	15 Feb 2006 23:00:38 -0000	1.81
+++ java/lang/String.java	7 Jun 2006 15:22:50 -0000	1.82
@@ -1820,7 +1820,7 @@
    */
   public synchronized int codePointCount(int start, int end)
   {
-    if (start < 0 || end >= count || start > end)
+    if (start < 0 || end > count || start > end)
       throw new StringIndexOutOfBoundsException();
 
     start += offset;



From MAILER-DAEMON Wed Jun 07 14:51:07 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fo37T-0007m2-Ol
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 14:51:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fo37R-0007kr-US
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 14:51:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fo37R-0007kW-8I
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 14:51:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fo37R-0007kP-17
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 14:51:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fo3F5-0000XY-7U
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 14:58:59 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fo37K-0004w1-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 14:50:58 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1Fo37K-0004vx-7e
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 18:50:58 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fo37K-0004vx-7e@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Wed, 07 Jun 2006 18:50:58 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 18:51:06 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/07 18:50:58

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicTabbedPaneUI.java 

Log message:
	2006-06-07  Lillian Angel  <langel@redhat.com>
	
	        * javax/swing/plaf/basic/BasicTabbedPaneUI.java
	        (getTabBounds): If this method is called with a tab index
	        that is not in the rects array, we need to re-layout the container
	        so it is created.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7699&r2=1.7700
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java?cvsroot=classpath&r1=1.44&r2=1.45

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7699
retrieving revision 1.7700
diff -u -b -r1.7699 -r1.7700
--- ChangeLog	7 Jun 2006 15:22:50 -0000	1.7699
+++ ChangeLog	7 Jun 2006 18:50:57 -0000	1.7700
@@ -1,5 +1,12 @@
 2006-06-07  Lillian Angel  <langel@redhat.com>
 
+	* javax/swing/plaf/basic/BasicTabbedPaneUI.java
+	(getTabBounds): If this method is called with a tab index
+	that is not in the rects array, we need to re-layout the container
+	so it is created.
+
+2006-06-07  Lillian Angel  <langel@redhat.com>
+
 	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
 	(FreetypeGlyphVector): Removed assignment. Caused compilation error.
 	* java/lang/String.java

Index: javax/swing/plaf/basic/BasicTabbedPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- javax/swing/plaf/basic/BasicTabbedPaneUI.java	1 Jun 2006 05:17:02 -0000	1.44
+++ javax/swing/plaf/basic/BasicTabbedPaneUI.java	7 Jun 2006 18:50:57 -0000	1.45
@@ -2410,6 +2410,9 @@
    */
   public Rectangle getTabBounds(JTabbedPane pane, int i)
   {
+    // Need to re-layout container if tab does not exist.
+    if (i >= rects.length)
+      layoutManager.layoutContainer(pane);
     return rects[i];
   }
 



From MAILER-DAEMON Wed Jun 07 15:01:15 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fo3HH-0002fZ-18
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 15:01:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fo3HD-0002eK-Ih
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:01:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fo3HC-0002di-GG
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:01:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fo3HC-0002dc-A9
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:01:10 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fo3Oq-0001Tp-LA
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:09:04 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fo3HB-00054S-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 15:01:09 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fo3H9-00054L-N9
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 19:01:09 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fo3H9-00054L-N9@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Wed, 07 Jun 2006 19:01:07 +0000
Subject: [commit-cp] classpath ChangeLog java/math/BigDecimal.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 19:01:12 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/07 19:01:07

Modified files:
	.              : ChangeLog 
	java/math      : BigDecimal.java 

Log message:
	2006-06-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/math/BigDecimal.java:
		(compareTo(Object)): Make this call the other
		one.
		(compareTo(BigDecimal)): Recreated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7700&r2=1.7701
http://cvs.savannah.gnu.org/viewcvs/classpath/java/math/BigDecimal.java?cvsroot=classpath&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7700
retrieving revision 1.7701
diff -u -b -r1.7700 -r1.7701
--- ChangeLog	7 Jun 2006 18:50:57 -0000	1.7700
+++ ChangeLog	7 Jun 2006 19:01:07 -0000	1.7701
@@ -1,3 +1,10 @@
+2006-06-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/math/BigDecimal.java:
+	(compareTo(Object)): Make this call the other
+	one.
+	(compareTo(BigDecimal)): Recreated.
+	
 2006-06-07  Lillian Angel  <langel@redhat.com>
 
 	* javax/swing/plaf/basic/BasicTabbedPaneUI.java

Index: java/math/BigDecimal.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/math/BigDecimal.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- java/math/BigDecimal.java	4 Jun 2006 17:59:12 -0000	1.22
+++ java/math/BigDecimal.java	7 Jun 2006 19:01:07 -0000	1.23
@@ -810,7 +810,11 @@
     
   public int compareTo (Object obj) 
   {
-    BigDecimal val = (BigDecimal) obj;
+    return compareTo((BigDecimal) obj);
+  }
+
+  public int compareTo (BigDecimal val)
+  {
     if (scale == val.scale)
       return intVal.compareTo (val.intVal);
 



From MAILER-DAEMON Wed Jun 07 15:12:10 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fo3Rq-0006Tb-My
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 15:12:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fo3Rp-0006Sf-Lb
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:12:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fo3Rn-0006S7-AC
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:12:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fo3Rn-0006S4-2v
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:12:07 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fo3ZR-0002Ge-6p
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:20:01 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fo3Rk-0005Dj-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 15:12:04 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fo3Rk-0005Dg-Cx
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 19:12:04 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fo3Rk-0005Dg-Cx@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 07 Jun 2006 19:12:04 +0000
Subject: [commit-cp] classpath/gnu/java/awt/peer/gtk CairoGraphics2D...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 19:12:09 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/07 19:12:04

Modified files:
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 
	.              : ChangeLog 

Log message:
	2006-06-07  Roman Kennke  <kennke@aicas.com>
	
		PR 27833
		* gnu/java/awt/peer/gtk/CairoGraphics2D.java
		(clip(Shape)): Implemented correctly, so that the current shape
		gets intersected by the parameter shape.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7701&r2=1.7702

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7701
retrieving revision 1.7702
diff -u -b -r1.7701 -r1.7702
--- ChangeLog	7 Jun 2006 19:01:07 -0000	1.7701
+++ ChangeLog	7 Jun 2006 19:12:03 -0000	1.7702
@@ -1,3 +1,10 @@
+2006-06-07  Roman Kennke  <kennke@aicas.com>
+
+	PR 27833
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
+	(clip(Shape)): Implemented correctly, so that the current shape
+	gets intersected by the parameter shape.
+
 2006-06-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/math/BigDecimal.java:
@@ -33,7 +40,7 @@
 	* NEWS: Documented the above.
 	* java/io/File.java: Javadoc fix.
 
-2006-06-06  Roman Kennke  <kennke@aicas.com>
+2006-06-07  Roman Kennke  <kennke@aicas.com>
 
 	PR 27920
 	* javax/swing/JTree.java
@@ -84,11 +91,11 @@
 	(setModel): Clear the tables and update the layout. Added null
 	check to prevent NPE.
 
-2006-06-05  Sven de Marothy  <sven@physto.se>
+2006-06-07  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/peer/gtk/GdkGlyphVector: Removed file.
 
-2006-06-05  Sven de Marothy  <sven@physto.se>
+2006-06-07  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
 	* include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h



From MAILER-DAEMON Wed Jun 07 15:19:14 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fo3Yf-0001RR-Qj
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 15:19:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fo3Yc-0001Pz-VC
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:19:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fo3Yc-0001PC-I0
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:19:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fo3Yc-0001P5-Bb
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:19:10 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fo3gH-0002mH-6j
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:27:05 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fo3Yb-0005MB-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 15:19:09 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fo3Yb-0005M8-Nv
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 19:19:09 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fo3Yb-0005M8-Nv@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 07 Jun 2006 19:19:09 +0000
Subject: [commit-cp] classpath/gnu/java/util/regex
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 19:19:11 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/07 19:19:09

New directory:
	gnu/java/util/regex

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/util/regex/?cvsroot=classpath



From MAILER-DAEMON Wed Jun 07 15:27:04 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fo3gG-0003Q2-Gq
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 15:27:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fo3gF-0003PG-3V
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:27:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fo3gE-0003Ov-9D
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:27:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fo3gE-0003Os-4S
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:27:02 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fo3ns-0003kx-Vp
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 15:34:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fo3gD-0005TD-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 15:27:01 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fo3gC-0005T5-59
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 19:27:01 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fo3gC-0005T5-59@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Wed, 07 Jun 2006 19:27:00 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/nio/charset/Provid...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 19:27:03 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/07 19:26:59

Modified files:
	.              : ChangeLog 
	gnu/java/nio/charset: Provider.java 

Log message:
		PR classpath/27905:
		* gnu/java/nio/charset/Provider.java (loadExtended): Now synchronized.
		Added missing charsets.
		(charsetForName): Don't check 'extendedLoaded'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7702&r2=1.7703
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/nio/charset/Provider.java?cvsroot=classpath&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7702
retrieving revision 1.7703
diff -u -b -r1.7702 -r1.7703
--- ChangeLog	7 Jun 2006 19:12:03 -0000	1.7702
+++ ChangeLog	7 Jun 2006 19:26:59 -0000	1.7703
@@ -1,3 +1,10 @@
+2006-06-07  Tom Tromey  <tromey@redhat.com>
+
+	PR classpath/27905:
+	* gnu/java/nio/charset/Provider.java (loadExtended): Now synchronized.
+	Added missing charsets.
+	(charsetForName): Don't check 'extendedLoaded'.
+
 2006-06-07  Roman Kennke  <kennke@aicas.com>
 
 	PR 27833

Index: gnu/java/nio/charset/Provider.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/charset/Provider.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnu/java/nio/charset/Provider.java	20 Feb 2006 19:20:49 -0000	1.9
+++ gnu/java/nio/charset/Provider.java	7 Jun 2006 19:26:59 -0000	1.10
@@ -155,9 +155,9 @@
  /**
   * Load non-mandatory charsets.
   */
-  private void loadExtended ()
+  private synchronized void loadExtended ()
   {
-    if(extendedLoaded)
+    if (extendedLoaded)
       return;
 
     addCharset (new ISO_8859_3 ());    // ISO-8859-3 aka ISO-LATIN-3
@@ -165,6 +165,12 @@
     addCharset (new ISO_8859_8 ());    // ISO-8859-8 (Hebrew)
 
     // Some more codepages
+    addCharset (new Cp424());
+    addCharset (new Cp437());
+    addCharset (new Cp737());
+    addCharset (new Cp775());
+    addCharset (new Cp850());
+    addCharset (new Cp852());
     addCharset (new Cp855()); // IBM Cyrillic
     addCharset (new Cp857()); // IBM Turkish
     addCharset (new Cp860()); // MSDOS Portugese
@@ -176,6 +182,24 @@
     addCharset (new Cp866()); // MSDOS Russian
     addCharset (new Cp869()); // IBM modern Greek
     addCharset (new Cp874()); // IBM Thai
+
+    addCharset (new MacCentralEurope());
+    addCharset (new MacCroatian());
+    addCharset (new MacCyrillic());
+    addCharset (new MacDingbat());
+    addCharset (new MacGreek());
+    addCharset (new MacIceland());
+    addCharset (new MacRoman());
+    addCharset (new MacRomania());
+    addCharset (new MacSymbol());
+    addCharset (new MacThai());
+    addCharset (new MacTurkish());
+    addCharset (new MS874());
+
+    addCharset (new Windows1255());
+    addCharset (new Windows1256());
+    addCharset (new Windows1258());
+
     extendedLoaded = true;
   }
 
@@ -199,7 +223,7 @@
   public Charset charsetForName (String charsetName)
   {
     Charset cs = (Charset) charsets.get(canonicalNames.get(charsetName.toLowerCase()));
-    if(cs == null && !extendedLoaded)
+    if (cs == null)
      {
        loadExtended();
        cs = (Charset) charsets.get(canonicalNames.get(charsetName.toLowerCase()));



From MAILER-DAEMON Wed Jun 07 16:15:24 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fo4R2-0003Us-En
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 16:15:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fo4R0-0003U5-Kk
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 16:15:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fo4Qz-0003TZ-Op
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 16:15:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fo4Qz-0003TN-Fl
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 16:15:21 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fo4Ye-0007XL-Ov
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 16:23:16 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fo4Qy-0007ob-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 16:15:20 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fo4Qy-0007oX-Lc
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 20:15:20 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fo4Qy-0007oX-Lc@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Wed, 07 Jun 2006 20:15:20 +0000
Subject: [commit-cp] classpath ChangeLog java/util/InputMismatchExce...
	[generics-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 20:15:23 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics-branch
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/07 20:15:18

Modified files:
	.              : ChangeLog 
	java/util      : InputMismatchException.java 

Log message:
	2006-06-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/util/InputMismatchException.java:
		Documented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.265&r2=1.2386.2.266
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/InputMismatchException.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.2&r2=1.1.2.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.265
retrieving revision 1.2386.2.266
diff -u -b -r1.2386.2.265 -r1.2386.2.266
--- ChangeLog	4 Jun 2006 22:38:56 -0000	1.2386.2.265
+++ ChangeLog	7 Jun 2006 20:15:16 -0000	1.2386.2.266
@@ -1,3 +1,8 @@
+2006-06-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/util/InputMismatchException.java:
+	Documented.
+	
 2006-06-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/util/Formattable.java,

Index: java/util/InputMismatchException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Attic/InputMismatchException.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- java/util/InputMismatchException.java	21 Sep 2005 21:32:40 -0000	1.1.2.2
+++ java/util/InputMismatchException.java	7 Jun 2006 20:15:18 -0000	1.1.2.3
@@ -38,13 +38,34 @@
 
 package java.util;
 
-/** @since 1.5 */
-public class InputMismatchException extends NoSuchElementException
+/** 
+ * Thrown when a {@link Scanner} instance encounters a mismatch
+ * between the input data and the pattern it is trying to match it
+ * against.  This could be because the input data represents an
+ * out-of-range value for the type the pattern represents, or simply
+ * because the data does not fit that particular type.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class InputMismatchException 
+  extends NoSuchElementException
 {
+  /**
+   * Constructs a new <code>InputMismatchException</code>
+   * with a <code>null</code> message.
+   */
   public InputMismatchException()
   {
   }
 
+  /**
+   * Constructs a new <code>InputMismatchException</code>
+   * with the supplied error message.
+   *
+   * @param s the error message to report back to the user.
+   */
   public InputMismatchException(String s)
   {
     super(s);



From MAILER-DAEMON Wed Jun 07 16:29:47 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fo4ex-0007vR-CG
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 16:29:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fo4ev-0007vM-Fd
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 16:29:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fo4eu-0007ts-7c
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 16:29:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fo4eu-0007tk-40
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 16:29:44 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fo4mZ-0000jw-HY
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 16:37:39 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fo4et-0007zg-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 16:29:43 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1Fo4er-0007zd-Qf
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 20:29:43 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fo4er-0007zd-Qf@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Wed, 07 Jun 2006 20:29:41 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JMenuBar.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 20:29:45 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/07 20:29:41

Modified files:
	.              : ChangeLog 
	javax/swing    : JMenuBar.java 

Log message:
	2006-06-07  Francis Kung  <fkung@redhat.com>
	
	        * javax/swing/JMenuBar.java:
	        (getSubElements): Do not return null values.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7704&r2=1.7705
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JMenuBar.java?cvsroot=classpath&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7704
retrieving revision 1.7705
diff -u -b -r1.7704 -r1.7705
--- ChangeLog	7 Jun 2006 19:30:05 -0000	1.7704
+++ ChangeLog	7 Jun 2006 20:29:41 -0000	1.7705
@@ -1,3 +1,8 @@
+2006-06-07  Francis Kung  <fkung@redhat.com>
+
+	* javax/swing/JMenuBar.java:
+	(getSubElements): Do not return null values.
+
 2006-06-07  Roman Kennke  <kennke@aicas.com>
 
 	PR 27902

Index: javax/swing/JMenuBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JMenuBar.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- javax/swing/JMenuBar.java	6 Jun 2006 12:54:37 -0000	1.24
+++ javax/swing/JMenuBar.java	7 Jun 2006 20:29:41 -0000	1.25
@@ -370,10 +370,30 @@
   {
     MenuElement[] subElements = new MenuElement[getComponentCount()];
 
+    int j = 0;
+    boolean doResize = false;
+    MenuElement menu;
     for (int i = 0; i < getComponentCount(); i++)
-      subElements[i] = (MenuElement) getMenu(i);
+      {
+        menu = getMenu(i);
+        if (menu != null)
+          {
+            subElements[j++] = (MenuElement) menu;
+          }
+        else
+          doResize = true;
+      }
 
+    if (! doResize)
     return subElements;
+    else
+      {
+        MenuElement[] subElements2 = new MenuElement[j];
+        for (int i = 0; i < j; i++)
+          subElements2[i] = subElements[i];
+
+        return subElements2;
+      }
   }
 
   /**



From MAILER-DAEMON Wed Jun 07 16:46:11 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fo4up-0006Pv-KO
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 16:46:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fo4un-0006Og-Bo
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 16:46:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fo4um-0006O9-Ib
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 16:46:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fo4um-0006O3-DB
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 16:46:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fo52R-0002J1-VT
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 16:54:04 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fo4ul-0001A0-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 16:46:07 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fo4ul-00019w-0h
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 20:46:07 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fo4ul-00019w-0h@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 07 Jun 2006 20:46:07 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/basic BasicTreeUI.ja...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 20:46:09 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/07 20:46:06

Modified files:
	javax/swing/plaf/basic: BasicTreeUI.java 
	.              : ChangeLog 

Log message:
	2006-06-07  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/plaf/basic/BasicTreeUI.java
		(completeUIUninstall): Implemented.
		(uninstallUI): Moved some bits to completeUIUninstall(). Complete
		editing before uninstalling anything.
		(isToggleEvent): Implemented.
		(selectPathForEvent): Make use of isToggleEvent().
		(ComponentHandler.componentMoved): Implemented.
		(ComponentHandler.startTimer): Implemented.
		(ComponentHandler.getScrollPane): Implemented.
		(ComponentHandler.actionPerformed): Implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTreeUI.java?cvsroot=classpath&r1=1.140&r2=1.141
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7705&r2=1.7706

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7705
retrieving revision 1.7706
diff -u -b -r1.7705 -r1.7706
--- ChangeLog	7 Jun 2006 20:29:41 -0000	1.7705
+++ ChangeLog	7 Jun 2006 20:46:04 -0000	1.7706
@@ -1,3 +1,16 @@
+2006-06-07  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/plaf/basic/BasicTreeUI.java
+	(completeUIUninstall): Implemented.
+	(uninstallUI): Moved some bits to completeUIUninstall(). Complete
+	editing before uninstalling anything.
+	(isToggleEvent): Implemented.
+	(selectPathForEvent): Make use of isToggleEvent().
+	(ComponentHandler.componentMoved): Implemented.
+	(ComponentHandler.startTimer): Implemented.
+	(ComponentHandler.getScrollPane): Implemented.
+	(ComponentHandler.actionPerformed): Implemented.
+
 2006-06-07  Francis Kung  <fkung@redhat.com>
 
 	* javax/swing/JMenuBar.java:



From MAILER-DAEMON Wed Jun 07 17:15:51 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fo5NW-0000I0-T6
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 17:15:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fo5NU-0000Fp-PF
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 17:15:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fo5NT-0000FV-UV
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 17:15:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fo5NT-0000FS-Rk
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 17:15:47 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fo5V9-00058H-Sw
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 17:23:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fo5NS-0001cc-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 17:15:46 -0400
Received: from andreast by savannah.gnu.org with local (Exim 4.50)
	id 1Fo5NQ-0001cW-MP
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 21:15:46 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fo5NQ-0001cW-MP@savannah.gnu.org>
From: Andreas Tobler <toa@pop.agri.ch>
Date: Wed, 07 Jun 2006 21:15:44 +0000
Subject: [commit-cp] classpath ChangeLog native/jawt/Makefile.am
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 21:15:49 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andreas Tobler <andreast>	06/06/07 21:15:43

Modified files:
	.              : ChangeLog 
	native/jawt    : Makefile.am 

Log message:
	2006-06-07  Andreas Tobler  <a.tobler@schweiz.ch>
	
		* native/jawt/Makefile.am (AM_LDFLAGS): Add XTEST_LIBS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7706&r2=1.7707
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jawt/Makefile.am?cvsroot=classpath&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7706
retrieving revision 1.7707
diff -u -b -r1.7706 -r1.7707
--- ChangeLog	7 Jun 2006 20:46:04 -0000	1.7706
+++ ChangeLog	7 Jun 2006 21:15:41 -0000	1.7707
@@ -1,3 +1,7 @@
+2006-06-07  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* native/jawt/Makefile.am (AM_LDFLAGS): Add XTEST_LIBS.
+
 2006-06-07  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/plaf/basic/BasicTreeUI.java

Index: native/jawt/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jawt/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- native/jawt/Makefile.am	26 May 2006 17:41:18 -0000	1.6
+++ native/jawt/Makefile.am	7 Jun 2006 21:15:43 -0000	1.7
@@ -3,7 +3,7 @@
 libjawt_la_SOURCES = jawt.c
 libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
 
-AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ -lXtst
+AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 
 # Just the WARNING_CFLAGS. We cannot use the strict flags since the gtk



From MAILER-DAEMON Wed Jun 07 17:37:22 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fo5iL-0006Vj-Vb
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 17:37:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fo5iK-0006VZ-6y
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 17:37:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fo5iI-0006VN-Py
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 17:37:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fo5iI-0006VK-Kx
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 17:37:18 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fo5py-00072S-OR
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 17:45:14 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fo5iI-0002mD-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 17:37:18 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fo5iH-0002m9-9H
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 21:37:17 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fo5iH-0002m9-9H@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Wed, 07 Jun 2006 21:37:17 +0000
Subject: [commit-cp] classpath ChangeLog java/util/InputMismatchExce...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 21:37:20 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/07 21:37:17

Modified files:
	.              : ChangeLog 
Added files:
	java/util      : InputMismatchException.java 

Log message:
	2006-06-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/util/InputMismatchException.java:
		Documented.
	
	2005-04-20  Tom Tromey  <tromey@redhat.com>
	
		* java/util/InputMismatchException.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7707&r2=1.7708
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/InputMismatchException.java?cvsroot=classpath&rev=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7707
retrieving revision 1.7708
diff -u -b -r1.7707 -r1.7708
--- ChangeLog	7 Jun 2006 21:15:41 -0000	1.7707
+++ ChangeLog	7 Jun 2006 21:37:16 -0000	1.7708
@@ -1,3 +1,12 @@
+2006-06-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/util/InputMismatchException.java:
+	Documented.
+
+2005-04-20  Tom Tromey  <tromey@redhat.com>
+
+	* java/util/InputMismatchException.java: New file.
+	
 2006-06-07  Andreas Tobler  <a.tobler@schweiz.ch>
 
 	* native/jawt/Makefile.am (AM_LDFLAGS): Add XTEST_LIBS.

Index: java/util/InputMismatchException.java
===================================================================
RCS file: java/util/InputMismatchException.java
diff -N java/util/InputMismatchException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/InputMismatchException.java	7 Jun 2006 21:37:17 -0000	1.2
@@ -0,0 +1,73 @@
+/* InputMismatchException.java
+   Copyright (C) 2005  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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util;
+
+/** 
+ * Thrown when a {@link Scanner} instance encounters a mismatch
+ * between the input data and the pattern it is trying to match it
+ * against.  This could be because the input data represents an
+ * out-of-range value for the type the pattern represents, or simply
+ * because the data does not fit that particular type.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5 
+ */
+public class InputMismatchException 
+  extends NoSuchElementException
+{
+  /**
+   * Constructs a new <code>InputMismatchException</code>
+   * with a <code>null</code> message.
+   */
+  public InputMismatchException()
+  {
+  }
+
+  /**
+   * Constructs a new <code>InputMismatchException</code>
+   * with the supplied error message.
+   *
+   * @param s the error message to report back to the user.
+   */
+  public InputMismatchException(String s)
+  {
+    super(s);
+  }
+}



From MAILER-DAEMON Wed Jun 07 18:00:16 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fo64W-0007Hb-4H
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 18:00:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fo64V-0007HK-Al
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 18:00:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fo64T-0007H8-Qj
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 18:00:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fo64T-0007H5-NA
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 18:00:13 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fo6C9-0000Vf-WD
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 18:08:10 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fo64P-0003gt-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 18:00:09 -0400
Received: from fitzsim by savannah.gnu.org with local (Exim 4.50)
	id 1Fo64K-0003gQ-IM
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 22:00:05 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fo64K-0003gQ-IM@savannah.gnu.org>
From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Wed, 07 Jun 2006 22:00:04 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/qt/QtTool...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 22:00:15 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Thomas Fitzsimmons <fitzsim>	06/06/07 22:00:01

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/qt: QtToolkit.java 

Log message:
	2006-06-07  Thomas Fitzsimmons  <fitzsim@redhat.com>
	
		* gnu/java/awt/peer/qt/QtToolkit.java (initToolkit): Load
		libqtpeer.so unconditionally.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7708&r2=1.7709
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/qt/QtToolkit.java?cvsroot=classpath&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7708
retrieving revision 1.7709
diff -u -b -r1.7708 -r1.7709
--- ChangeLog	7 Jun 2006 21:37:16 -0000	1.7708
+++ ChangeLog	7 Jun 2006 21:59:59 -0000	1.7709
@@ -1,3 +1,8 @@
+2006-06-07  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* gnu/java/awt/peer/qt/QtToolkit.java (initToolkit): Load
+	libqtpeer.so unconditionally.
+
 2006-06-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/util/InputMismatchException.java:

Index: gnu/java/awt/peer/qt/QtToolkit.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/qt/QtToolkit.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/java/awt/peer/qt/QtToolkit.java	3 Oct 2005 22:08:01 -0000	1.5
+++ gnu/java/awt/peer/qt/QtToolkit.java	7 Jun 2006 22:00:01 -0000	1.6
@@ -136,7 +136,6 @@
   {
     eventQueue = new EventQueue();
     repaintThread = new QtRepaintThread();
-    if (Configuration.INIT_LOAD_LIBRARY)
       System.loadLibrary("qtpeer");
 
     String theme = null;



From MAILER-DAEMON Wed Jun 07 19:48:08 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fo7ku-0002Ho-Jn
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 19:48:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fo7kt-0002Hj-Pj
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 19:48:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fo7kt-0002HF-2J
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 19:48:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fo7ks-0002H8-P6
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 19:48:06 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fo7sa-0008Ur-0t
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 19:56:04 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fo7ks-0007Ql-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 19:48:06 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1Fo7kr-0007Qi-SG
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 23:48:06 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fo7kr-0007Qi-SG@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Wed, 07 Jun 2006 23:48:05 +0000
Subject: [commit-cp] classpath gnu/java/awt/peer/gtkFreetypeGlyphVec...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jun 2006 23:48:07 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/07 23:48:05

Modified files:
	gnu/java/awt/peer/gtk: FreetypeGlyphVector.java 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 

Log message:
	2006-06-08  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
		(defaultLayout): Do kerning.
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
		(getKerning): Correct class name, removed unused variable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c?cvsroot=classpath&r1=1.1&r2=1.2

Patches:
Index: gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	7 Jun 2006 15:22:50 -0000	1.2
+++ gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	7 Jun 2006 23:48:05 -0000	1.3
@@ -188,6 +188,11 @@
 	Rectangle2D r = gm.getBounds2D();
 	glyphTransforms[ i ] = AffineTransform.getTranslateInstance(x, 0);
 	x += gm.getAdvanceX();
+	if( i > 0 )
+	  {
+	    Point2D p = getKerning( glyphCodes[ i - 1 ], glyphCodes[ i ] );
+	    x += p.getX();
+	  }
       }
   }
 

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	7 Jun 2006 13:54:32 -0000	1.1
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	7 Jun 2006 23:48:05 -0000	1.2
@@ -115,7 +115,6 @@
   font = getFont(env, obj);
   ft_face = pango_fc_font_lock_face( font );
   g_assert (ft_face != NULL);
-
   FT_Get_Kerning( ft_face, rightGlyph, leftGlyph, FT_KERNING_DEFAULT, &kern );
 
   pango_fc_font_unlock_face( font );
@@ -123,7 +122,7 @@
   values[0].d = (jdouble)kern.x/64.0;
   values[1].d = (jdouble)kern.y/64.0;
 
-  cls = (*env)->FindClass (env, "java/awt/geom/Point2D.Double");
+  cls = (*env)->FindClass (env, "java/awt/geom/Point2D$Double");
   method = (*env)->GetMethodID (env, cls, "<init>", "(DD)V");
   return (*env)->NewObjectA(env, cls, method, values);
 }
@@ -136,7 +135,6 @@
   jdouble *values;
   jdoubleArray retArray = NULL;
   PangoFcFont *font;
-  FT_BBox acbox;
 
   font = getFont(env, obj);
   ft_face = pango_fc_font_lock_face( font );



From MAILER-DAEMON Wed Jun 07 20:51:37 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fo8kL-0007M4-FG
	for mharc-commit-classpath@gnu.org; Wed, 07 Jun 2006 20:51:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fo8kJ-0007K9-4O
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 20:51:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fo8kI-0007J8-9e
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 20:51:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fo8kH-0007J0-NU
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 20:51:33 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fo8rz-0004q2-MK
	for commit-classpath@gnu.org; Wed, 07 Jun 2006 20:59:31 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fo8kG-0000yN-00
	for <commit-classpath@gnu.org>; Wed, 07 Jun 2006 20:51:32 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1Fo8kE-0000yK-WD
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 00:51:32 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fo8kE-0000yK-WD@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Thu, 08 Jun 2006 00:51:30 +0000
Subject: [commit-cp] classpath ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 00:51:35 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/08 00:51:30

Modified files:
	.              : ChangeLog 

Log message:
	2006-06-08  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
		(defaultLayout): Do kerning.
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
		(getKerning): Correct class name, removed unused variable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7709&r2=1.7710

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7709
retrieving revision 1.7710
diff -u -b -r1.7709 -r1.7710
--- ChangeLog	7 Jun 2006 21:59:59 -0000	1.7709
+++ ChangeLog	8 Jun 2006 00:51:29 -0000	1.7710
@@ -1,3 +1,10 @@
+2006-06-08  Sven de Marothy  <sven@physto.se>
+
+	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
+	(defaultLayout): Do kerning.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
+	(getKerning): Correct class name, removed unused variable.
+
 2006-06-07  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* gnu/java/awt/peer/qt/QtToolkit.java (initToolkit): Load



From MAILER-DAEMON Thu Jun 08 05:36:09 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoGvx-0002OF-Ht
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 05:36:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoGvv-0002O9-CQ
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 05:36:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoGvt-0002Mo-F3
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 05:36:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoGvt-0002Mj-Bz
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 05:36:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoH3g-0004TC-H0
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 05:44:08 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoGvs-000112-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 05:36:04 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1FoGvr-00010s-VA
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 09:36:04 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoGvr-00010s-VA@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Thu, 08 Jun 2006 09:36:03 +0000
Subject: [commit-cp] classpath/gnu/xml/dom DomIterator.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 09:36:07 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/08 09:36:03

Modified files:
	gnu/xml/dom    : DomIterator.java 
	.              : ChangeLog 

Log message:
	2006-06-08  Robert Schuster  <robertschuster@fsfe.org>
	
	        Fixes PR27864.
		* gnu/xml/dom/DomIterator.java:
		(successor): Changed expression.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/xml/dom/DomIterator.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7710&r2=1.7711

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7710
retrieving revision 1.7711
diff -u -b -r1.7710 -r1.7711
--- ChangeLog	8 Jun 2006 00:51:29 -0000	1.7710
+++ ChangeLog	8 Jun 2006 09:36:02 -0000	1.7711
@@ -1,3 +1,9 @@
+2006-06-08  Robert Schuster  <robertschuster@fsfe.org>
+
+        Fixes PR27864.
+        * gnu/xml/dom/DomIterator.java:
+        (successor): Changed expression.
+
 2006-06-08  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java



From MAILER-DAEMON Thu Jun 08 06:48:09 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoI3d-0005Z1-AI
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 06:48:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoI3b-0005XT-RO
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 06:48:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoI3a-0005WN-Hn
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 06:48:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoI3a-0005WC-Bk
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 06:48:06 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoIBN-0001gM-Vn
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 06:56:10 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoI3Y-0003uB-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 06:48:04 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1FoI3X-0003u8-Fv
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 10:48:04 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoI3X-0003u8-Fv@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Thu, 08 Jun 2006 10:48:03 +0000
Subject: [commit-cp] classpath/javax/swing/border MatteBorder.java C...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 10:48:08 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/08 10:48:03

Modified files:
	javax/swing/border: MatteBorder.java 
	.              : ChangeLog 

Log message:
	2006-06-08  Robert Schuster  <robertschuster@fsfe.org>
	
	        * javax/swing/border/MatteBorder.java:
	        (MatteBorder(int,int,int,int,Icon)): Removed if-statement and exception
	        throwing.
	        (paintBorder): Added if-statement to abort painting early.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/border/MatteBorder.java?cvsroot=classpath&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7711&r2=1.7712

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7711
retrieving revision 1.7712
diff -u -b -r1.7711 -r1.7712
--- ChangeLog	8 Jun 2006 09:36:02 -0000	1.7711
+++ ChangeLog	8 Jun 2006 10:48:00 -0000	1.7712
@@ -1,5 +1,12 @@
 2006-06-08  Robert Schuster  <robertschuster@fsfe.org>
 
+	* javax/swing/border/MatteBorder.java:
+	(MatteBorder(int,int,int,int,Icon)): Removed if-statement and exception
+	throwing.
+	(paintBorder): Added if-statement to abort painting early.
+
+2006-06-08  Robert Schuster  <robertschuster@fsfe.org>
+
         Fixes PR27864.
         * gnu/xml/dom/DomIterator.java:
         (successor): Changed expression.



From MAILER-DAEMON Thu Jun 08 06:52:58 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoI8I-0006sn-09
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 06:52:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoI8F-0006sP-O5
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 06:52:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoI8E-0006ry-Fc
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 06:52:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoI8E-0006rp-5J
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 06:52:54 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoIG1-0002K3-PE
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 07:00:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoI8C-0003xs-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 06:52:52 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FoI8B-0003xp-LC
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 10:52:52 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoI8B-0003xp-LC@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Thu, 08 Jun 2006 10:52:51 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 10:52:56 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/08 10:52:51

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicScrollPaneUI.java 

Log message:
	2006-06-08  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/plaf/basic/BasicScrollPaneUI.java
		(getInputMap): New method,
		(getActionMap): New method,
		(createActionMap): New method,
		(installKeyboardActions): Implemented,
		(uninstallKeyboardActions): Implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7712&r2=1.7713
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java?cvsroot=classpath&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7712
retrieving revision 1.7713
diff -u -b -r1.7712 -r1.7713
--- ChangeLog	8 Jun 2006 10:48:00 -0000	1.7712
+++ ChangeLog	8 Jun 2006 10:52:51 -0000	1.7713
@@ -1,3 +1,12 @@
+2006-06-08  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/plaf/basic/BasicScrollPaneUI.java
+	(getInputMap): New method,
+	(getActionMap): New method,
+	(createActionMap): New method,
+	(installKeyboardActions): Implemented,
+	(uninstallKeyboardActions): Implemented.
+
 2006-06-08  Robert Schuster  <robertschuster@fsfe.org>
 
 	* javax/swing/border/MatteBorder.java:

Index: javax/swing/plaf/basic/BasicScrollPaneUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- javax/swing/plaf/basic/BasicScrollPaneUI.java	1 Jun 2006 05:17:02 -0000	1.25
+++ javax/swing/plaf/basic/BasicScrollPaneUI.java	8 Jun 2006 10:52:51 -0000	1.26
@@ -1,5 +1,5 @@
 /* BasicScrollPaneUI.java
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,6 +45,7 @@
 import java.awt.Graphics;
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
 import java.awt.event.ContainerEvent;
 import java.awt.event.ContainerListener;
 import java.awt.event.MouseWheelEvent;
@@ -52,20 +53,31 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ActionMap;
+import javax.swing.InputMap;
 import javax.swing.JComponent;
 import javax.swing.JScrollBar;
 import javax.swing.JScrollPane;
+import javax.swing.JSlider;
 import javax.swing.JViewport;
 import javax.swing.LookAndFeel;
 import javax.swing.ScrollPaneConstants;
 import javax.swing.ScrollPaneLayout;
 import javax.swing.Scrollable;
 import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import javax.swing.plaf.ActionMapUIResource;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.ScrollPaneUI;
 
+/**
+ * A UI delegate for the {@link JScrollPane} component.
+ */
 public class BasicScrollPaneUI extends ScrollPaneUI
   implements ScrollPaneConstants
 {
@@ -236,7 +248,7 @@
     final Rectangle rect = new Rectangle();
 
     /**
-     * Scroll with the mouse whell.
+     * Scroll with the mouse wheel.
      * 
      * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
      */
@@ -311,7 +323,11 @@
     }
     
     /**
-     * Get the scroll bar value or null if there is no such scroll bar.
+     * Get the scroll bar value or 0 if there is no such scroll bar.
+     * 
+     * @param bar  the scroll bar (<code>null</code> permitted).
+     * 
+     * @return The scroll bar value, or 0.
      */
     final int getValue(JScrollBar bar)
     {
@@ -478,6 +494,197 @@
       v.getComponent(i).addMouseWheelListener(mouseWheelListener);
   }
 
+  InputMap getInputMap(int condition) 
+  {
+    if (condition == JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+      return (InputMap) UIManager.get("ScrollPane.ancestorInputMap");
+    return null;
+  }
+
+  /**
+   * Returns the action map for the {@link JScrollPane}.  All scroll panes 
+   * share a single action map which is created the first time this method is 
+   * called, then stored in the UIDefaults table for subsequent access.
+   * 
+   * @return The shared action map.
+   */
+  ActionMap getActionMap() 
+  {
+    ActionMap map = (ActionMap) UIManager.get("ScrollPane.actionMap");
+
+    if (map == null) // first time here
+      {
+        map = createActionMap();
+        if (map != null)
+          UIManager.put("Slider.actionMap", map);
+      }
+    return map;
+  }
+
+  /**
+   * Creates the action map shared by all {@link JSlider} instances.
+   * This method is called once by {@link #getActionMap()} when it 
+   * finds no action map in the UIDefaults table...after the map is 
+   * created, it gets added to the defaults table so that subsequent 
+   * calls to {@link #getActionMap()} will return the same shared 
+   * instance.
+   * 
+   * @return The action map.
+   */
+  ActionMap createActionMap()
+  {
+    ActionMap map = new ActionMapUIResource();
+    map.put("scrollLeft", 
+            new AbstractAction("scrollLeft") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollPane sp = (JScrollPane) event.getSource();
+                JScrollBar sb = sp.getHorizontalScrollBar();
+                if (sb.isVisible()) 
+                  {
+                    int delta = sb.getBlockIncrement(-1);
+                    sb.setValue(sb.getValue() + delta);
+                  }
+              }
+            }
+    );
+    map.put("scrollEnd", 
+            new AbstractAction("scrollEnd") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollPane sp = (JScrollPane) event.getSource();
+                JScrollBar sb1 = sp.getHorizontalScrollBar();
+                if (sb1.isVisible()) 
+                  {
+                    sb1.setValue(sb1.getMaximum());
+                  }
+                JScrollBar sb2 = sp.getVerticalScrollBar();
+                if (sb2.isVisible()) 
+                  {
+                    sb2.setValue(sb2.getMaximum());
+                  }
+              }
+            }
+    );
+    map.put("unitScrollUp", 
+            new AbstractAction("unitScrollUp") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollPane sp = (JScrollPane) event.getSource();
+                JScrollBar sb = sp.getVerticalScrollBar();
+                if (sb.isVisible()) 
+                  {
+                    int delta = sb.getUnitIncrement(-1);
+                    sb.setValue(sb.getValue() + delta);
+                  }
+              }
+            }
+    );
+    map.put("unitScrollLeft", 
+            new AbstractAction("unitScrollLeft") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollPane sp = (JScrollPane) event.getSource();
+                JScrollBar sb = sp.getHorizontalScrollBar();
+                if (sb.isVisible()) 
+                  {
+                    int delta = sb.getUnitIncrement(-1);
+                    sb.setValue(sb.getValue() + delta);
+                  }
+              }
+            }
+    );
+    map.put("scrollUp", 
+            new AbstractAction("scrollUp") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollPane sp = (JScrollPane) event.getSource();
+                JScrollBar sb = sp.getVerticalScrollBar();
+                if (sb.isVisible()) 
+                  {
+                    int delta = sb.getBlockIncrement(-1);
+                    sb.setValue(sb.getValue() + delta);
+                  }
+              }
+            }
+    );
+    map.put("scrollRight", 
+            new AbstractAction("scrollRight") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollPane sp = (JScrollPane) event.getSource();
+                JScrollBar sb = sp.getHorizontalScrollBar();
+                if (sb.isVisible()) 
+                  {
+                    int delta = sb.getBlockIncrement(1);
+                    sb.setValue(sb.getValue() + delta);
+                  }
+              }
+            }
+    );
+    map.put("scrollHome", 
+            new AbstractAction("scrollHome") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollPane sp = (JScrollPane) event.getSource();
+                JScrollBar sb1 = sp.getHorizontalScrollBar();
+                if (sb1.isVisible()) 
+                  {
+                    sb1.setValue(sb1.getMinimum());
+                  }
+                JScrollBar sb2 = sp.getVerticalScrollBar();
+                if (sb2.isVisible()) 
+                  {
+                    sb2.setValue(sb2.getMinimum());
+                  }
+              }
+            }
+    );
+    map.put("scrollDown", 
+            new AbstractAction("scrollDown") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollPane sp = (JScrollPane) event.getSource();
+                JScrollBar sb = sp.getVerticalScrollBar();
+                if (sb.isVisible()) 
+                  {
+                    int delta = sb.getBlockIncrement(1);
+                    sb.setValue(sb.getValue() + delta);
+                  }
+              }
+            }
+    );
+    map.put("unitScrollDown", 
+            new AbstractAction("unitScrollDown") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollPane sp = (JScrollPane) event.getSource();
+                JScrollBar sb = sp.getVerticalScrollBar();
+                if (sb.isVisible()) 
+                  {
+                    int delta = sb.getUnitIncrement(1);
+                    sb.setValue(sb.getValue() + delta);
+                  }
+              }
+            }
+    );
+    map.put("unitScrollRight", 
+            new AbstractAction("unitScrollRight") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollPane sp = (JScrollPane) event.getSource();
+                JScrollBar sb = sp.getHorizontalScrollBar();
+                if (sb.isVisible()) 
+                  {
+                    int delta = sb.getUnitIncrement(1);
+                    sb.setValue(sb.getValue() + delta);
+                  }
+              }
+            }
+    );
+    return map;
+  }
+  
   /**
    * Installs additional keyboard actions on the scrollpane. This is a hook
    * method provided to subclasses in order to install their own keyboard
@@ -486,10 +693,27 @@
    * @param sp the scrollpane to install keyboard actions on
    */
   protected void installKeyboardActions(JScrollPane sp)
-    throws NotImplementedException
   {
-    // TODO: Is this only a hook method or should we actually do something
-    // here? If the latter, than figure out what and implement this.
+    InputMap keyMap = getInputMap(
+        JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+    SwingUtilities.replaceUIInputMap(sp, 
+        JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, keyMap);
+    ActionMap map = getActionMap();
+    SwingUtilities.replaceUIActionMap(sp, map);
+  }
+
+  /**
+   * Uninstalls all keyboard actions from the JScrollPane that have been
+   * installed by {@link #installKeyboardActions}. This is a hook method
+   * provided to subclasses to add their own keyboard actions.
+   *
+   * @param sp the scrollpane to uninstall keyboard actions from
+   */
+  protected void uninstallKeyboardActions(JScrollPane sp)
+  {
+    SwingUtilities.replaceUIActionMap(sp, null);
+    SwingUtilities.replaceUIInputMap(sp, 
+        JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, null);
   }
 
   /**
@@ -536,6 +760,8 @@
    * Creates and returns the mouse wheel listener for the scrollpane.
    *
    * @return the mouse wheel listener for the scrollpane
+   * 
+   * @since 1.4
    */
   protected MouseWheelListener createMouseWheelListener()
   {
@@ -574,20 +800,6 @@
 
   }
 
-  /**
-   * Uninstalls all keyboard actions from the JScrollPane that have been
-   * installed by {@link #installKeyboardActions}. This is a hook method
-   * provided to subclasses to add their own keyboard actions.
-   *
-   * @param sp the scrollpane to uninstall keyboard actions from
-   */
-  protected void uninstallKeyboardActions(JScrollPane sp)
-    throws NotImplementedException
-  {
-    // TODO: Is this only a hook method or should we actually do something
-    // here? If the latter, than figure out what and implement this.
-  }
-
   public Dimension getMinimumSize(JComponent c) 
   {
     JScrollPane p = (JScrollPane) c;



From MAILER-DAEMON Thu Jun 08 07:02:16 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoIHI-0000rs-ME
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 07:02:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoIHH-0000rC-0C
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 07:02:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoIHG-0000qi-01
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 07:02:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoIHF-0000qd-Qd
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 07:02:13 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoIP3-0002vp-Hg
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 07:10:17 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoIHE-00043v-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 07:02:12 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FoIHC-00043q-BQ
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 11:02:12 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoIHC-00043q-BQ@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Thu, 08 Jun 2006 11:02:10 +0000
Subject: [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 11:02:15 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/08 11:02:10

Modified files:
	.              : ChangeLog 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_GdkFontPeer.c 

Log message:
	       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
	       (attrs): Removed unused static.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7713&r2=1.7714
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c?cvsroot=classpath&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7713
retrieving revision 1.7714
diff -u -b -r1.7713 -r1.7714
--- ChangeLog	8 Jun 2006 10:52:51 -0000	1.7713
+++ ChangeLog	8 Jun 2006 11:02:09 -0000	1.7714
@@ -1,3 +1,8 @@
+2006-06-08  Mark Wielaard  <mark@klomp.org>
+
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
+	(attrs): Removed unused static.
+
 2006-06-08  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/plaf/basic/BasicScrollPaneUI.java

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	7 Jun 2006 13:58:33 -0000	1.19
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	8 Jun 2006 11:02:10 -0000	1.20
@@ -59,8 +59,6 @@
   java_awt_font_HANGING_BASELINE = 2
 };
 
-static PangoAttrList *attrs = NULL;
-
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkFontPeer_initStaticState 
   (JNIEnv *env, jclass clazz)



From MAILER-DAEMON Thu Jun 08 07:09:08 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoINw-0003Qn-OU
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 07:09:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoINv-0003QW-HV
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 07:09:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoINu-0003PE-2g
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 07:09:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoINt-0003PB-TL
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 07:09:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoIVh-0003NE-Rz
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 07:17:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoINt-00048r-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 07:09:05 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FoINs-00048o-PG
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 11:09:05 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoINs-00048o-PG@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Thu, 08 Jun 2006 11:09:04 +0000
Subject: [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 11:09:07 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/08 11:09:04

Modified files:
	.              : ChangeLog 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_GtkImage.c 

Log message:
	       PR 27917
	       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
	       (Java_gnu_java_awt_peer_gtk_GtkImage_loadImageFromData): Ref pixbuf
	       and unref loader.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7714&r2=1.7715
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c?cvsroot=classpath&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7714
retrieving revision 1.7715
diff -u -b -r1.7714 -r1.7715
--- ChangeLog	8 Jun 2006 11:02:09 -0000	1.7714
+++ ChangeLog	8 Jun 2006 11:09:04 -0000	1.7715
@@ -1,5 +1,12 @@
 2006-06-08  Mark Wielaard  <mark@klomp.org>
 
+	PR 27917
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
+	(Java_gnu_java_awt_peer_gtk_GtkImage_loadImageFromData): Ref pixbuf
+	and unref loader.
+
+2006-06-08  Mark Wielaard  <mark@klomp.org>
+
 	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
 	(attrs): Removed unused static.
 

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c	30 May 2006 11:30:02 -0000	1.23
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c	8 Jun 2006 11:09:04 -0000	1.24
@@ -117,10 +117,14 @@
 
   if (pixbuf == NULL)
     {
+      g_object_unref (loader);
       createRawData (env, obj, NULL);
       return JNI_FALSE;
     }
 
+  g_object_ref (pixbuf);
+  g_object_unref (loader);
+
   width =  gdk_pixbuf_get_width (pixbuf);
   height = gdk_pixbuf_get_height (pixbuf);
 



From MAILER-DAEMON Thu Jun 08 08:46:13 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoJtt-0006hP-11
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 08:46:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoJtq-0006fz-Uc
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 08:46:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoJtp-0006eX-2E
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 08:46:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoJto-0006eM-S0
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 08:46:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoK1c-0003p8-Hh
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 08:54:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoJtk-0007oj-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 08:46:04 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FoJtj-0007og-Oa
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 12:46:04 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoJtj-0007og-Oa@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Thu, 08 Jun 2006 12:46:03 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/basic BasicTreeUI.ja...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 12:46:11 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/08 12:46:03

Modified files:
	javax/swing/plaf/basic: BasicTreeUI.java 
	.              : ChangeLog 

Log message:
	2006-06-08  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/plaf/basic/BasicTreeUI.java
		(installKeyboardActions): Rewritten to correctly install the UI
		input and action maps.
		(getActionMap): New helper method.
		(createDefaultActionMap): New helper method.
		(TreeHomeAction.TreeHomeAction()): Implemented.
		(TreeHomeAction.actionPerformed): Implemented.
		(TreeHomeAction.isEnabled): Implemented.
		(TreeIncrementAction.TreeIncrementAction()): Implemented.
		(TreeIncrementAction.actionPerformed): Use action name as command.
		(TreeIncrementAction.isEnabled): Implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTreeUI.java?cvsroot=classpath&r1=1.141&r2=1.142
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7715&r2=1.7716

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7715
retrieving revision 1.7716
diff -u -b -r1.7715 -r1.7716
--- ChangeLog	8 Jun 2006 11:09:04 -0000	1.7715
+++ ChangeLog	8 Jun 2006 12:46:00 -0000	1.7716
@@ -1,3 +1,17 @@
+2006-06-08  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/plaf/basic/BasicTreeUI.java
+	(installKeyboardActions): Rewritten to correctly install the UI
+	input and action maps.
+	(getActionMap): New helper method.
+	(createDefaultActionMap): New helper method.
+	(TreeHomeAction.TreeHomeAction()): Implemented.
+	(TreeHomeAction.actionPerformed): Implemented.
+	(TreeHomeAction.isEnabled): Implemented.
+	(TreeIncrementAction.TreeIncrementAction()): Implemented.
+	(TreeIncrementAction.actionPerformed): Use action name as command.
+	(TreeIncrementAction.isEnabled): Implemented.
+
 2006-06-08  Mark Wielaard  <mark@klomp.org>
 
 	PR 27917



From MAILER-DAEMON Thu Jun 08 10:01:01 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoL4H-0001aM-1U
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 10:01:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoL4F-0001a3-Ns
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 10:00:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoL4E-0001Zn-Cj
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 10:00:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoL4E-0001Zh-4n
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 10:00:58 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoLC3-0002O4-NF
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 10:09:03 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoL4D-0001kx-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 10:00:57 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FoL4C-0001ku-Up
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 14:00:57 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoL4C-0001ku-Up@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Thu, 08 Jun 2006 14:00:56 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/basic BasicTreeUI.ja...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 14:01:00 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/08 14:00:56

Modified files:
	javax/swing/plaf/basic: BasicTreeUI.java 
	.              : ChangeLog 

Log message:
	2006-06-08  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/plaf/basic/BasicTreeUI.java
		(createDefaultActions): Added new actions.
		(TreePageAction.TreePageAction): Set action name.
		(TreePageAction.actionPerformed): Implemented.
		(TreePageAction.isEnabled): Implemented.
		(TreeToggleAction.TreePageAction): Set action name.
		(TreeToggleAction.actionPerformed): Implemented.
		(TreeToggleAction.isEnabled): Implemented.
		(TreeTraverseAction.TreeTraverseAction): Set action name.
		(TreeTraverseAction.actionPerformed): Use action name as command.
		(TreeTraverseAction.isEnabled): Implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTreeUI.java?cvsroot=classpath&r1=1.142&r2=1.143
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7716&r2=1.7717

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7716
retrieving revision 1.7717
diff -u -b -r1.7716 -r1.7717
--- ChangeLog	8 Jun 2006 12:46:00 -0000	1.7716
+++ ChangeLog	8 Jun 2006 14:00:54 -0000	1.7717
@@ -1,6 +1,20 @@
 2006-06-08  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/plaf/basic/BasicTreeUI.java
+	(createDefaultActions): Added new actions.
+	(TreePageAction.TreePageAction): Set action name.
+	(TreePageAction.actionPerformed): Implemented.
+	(TreePageAction.isEnabled): Implemented.
+	(TreeToggleAction.TreePageAction): Set action name.
+	(TreeToggleAction.actionPerformed): Implemented.
+	(TreeToggleAction.isEnabled): Implemented.
+	(TreeTraverseAction.TreeTraverseAction): Set action name.
+	(TreeTraverseAction.actionPerformed): Use action name as command.
+	(TreeTraverseAction.isEnabled): Implemented.
+
+2006-06-08  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/plaf/basic/BasicTreeUI.java
 	(installKeyboardActions): Rewritten to correctly install the UI
 	input and action maps.
 	(getActionMap): New helper method.



From MAILER-DAEMON Thu Jun 08 10:27:50 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoLUE-0003Dm-M7
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 10:27:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoLUD-0003Dc-Cq
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 10:27:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoLUC-0003DQ-CZ
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 10:27:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoLUC-0003DN-6j
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 10:27:48 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoLc2-0005aa-46
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 10:35:54 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoLUB-00029u-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 10:27:47 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FoLU8-00029q-Vo
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 14:27:46 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoLU8-00029q-Vo@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Thu, 08 Jun 2006 14:27:44 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 14:27:49 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/08 14:27:44

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicProgressBarUI.java 

Log message:
	2006-06-08  Lillian Angel  <langel@redhat.com>
	
	        * javax/swing/plaf/basic/BasicProgressBarUI.java
	        (paintString): Fixed to paint string at the correct location.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7717&r2=1.7718
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java?cvsroot=classpath&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7717
retrieving revision 1.7718
diff -u -b -r1.7717 -r1.7718
--- ChangeLog	8 Jun 2006 14:00:54 -0000	1.7717
+++ ChangeLog	8 Jun 2006 14:27:43 -0000	1.7718
@@ -1,3 +1,8 @@
+2006-06-08  Lillian Angel  <langel@redhat.com>
+
+	* javax/swing/plaf/basic/BasicProgressBarUI.java
+	(paintString): Fixed to paint string at the correct location.
+
 2006-06-08  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/plaf/basic/BasicTreeUI.java

Index: javax/swing/plaf/basic/BasicProgressBarUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- javax/swing/plaf/basic/BasicProgressBarUI.java	31 May 2006 18:57:20 -0000	1.16
+++ javax/swing/plaf/basic/BasicProgressBarUI.java	8 Jun 2006 14:27:44 -0000	1.17
@@ -734,6 +734,7 @@
                                          height - b.top - b.bottom);
     Color savedColor = g.getColor();
     Shape savedClip = g.getClip();
+    FontMetrics fm = g.getFontMetrics(progressBar.getFont());
     
     if (progressBar.getOrientation() == JProgressBar.VERTICAL)
       {
@@ -743,10 +744,10 @@
     
     g.setColor(getSelectionForeground());
     g.setClip(0, 0, full + b.left, height);
-    g.drawString(str, placement.x, placement.y);
+    g.drawString(str, placement.x, placement.y + fm.getAscent());
     g.setColor(getSelectionBackground());
     g.setClip(full + b.left, 0, width - full, height);
-    g.drawString(str, placement.x, placement.y);
+    g.drawString(str, placement.x, placement.y + fm.getAscent());
     g.setClip(savedClip);
     g.setColor(savedColor);
   }



From MAILER-DAEMON Thu Jun 08 11:56:18 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoMrq-00007f-3x
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 11:56:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoMrn-00007M-QO
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 11:56:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoMrl-00006c-GE
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 11:56:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoMrl-00006Y-Bv
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 11:56:13 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoMzc-0006ib-0h
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 12:04:20 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoMrk-0006de-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 11:56:12 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FoMrk-0006db-GG
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 15:56:12 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoMrk-0006db-GG@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Thu, 08 Jun 2006 15:56:12 +0000
Subject: [commit-cp] classpath ChangeLog native/plugin/gcjwebplugin.cc
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 15:56:16 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/08 15:56:12

Modified files:
	.              : ChangeLog 
	native/plugin  : gcjwebplugin.cc 

Log message:
	2006-06-08  Tom Fitzsimmons  <fitzsim@redhat.com>
	            Lillian Angel  <langel@redhat.com>
	
	        * native/plugin/gcjwebplugin.cc
	        (NP_Shutdown): Added code to free plugin mutex and whitelist file.
	        Also, reset initialized field.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7718&r2=1.7719
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/gcjwebplugin.cc?cvsroot=classpath&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7718
retrieving revision 1.7719
diff -u -b -r1.7718 -r1.7719
--- ChangeLog	8 Jun 2006 14:27:43 -0000	1.7718
+++ ChangeLog	8 Jun 2006 15:56:11 -0000	1.7719
@@ -1,3 +1,10 @@
+2006-06-08  Tom Fitzsimmons  <fitzsim@redhat.com>
+	    Lillian Angel  <langel@redhat.com>
+
+	* native/plugin/gcjwebplugin.cc
+	(NP_Shutdown): Added code to free plugin mutex and whitelist file.
+	Also, reset initialized field.
+
 2006-06-08  Lillian Angel  <langel@redhat.com>
 
 	* javax/swing/plaf/basic/BasicProgressBarUI.java

Index: native/plugin/gcjwebplugin.cc
===================================================================
RCS file: /cvsroot/classpath/classpath/native/plugin/gcjwebplugin.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- native/plugin/gcjwebplugin.cc	6 Jun 2006 15:43:14 -0000	1.5
+++ native/plugin/gcjwebplugin.cc	8 Jun 2006 15:56:12 -0000	1.6
@@ -1740,10 +1740,19 @@
   PLUGIN_DEBUG ("NP_Shutdown");
 
   // Free mutex.
+  if (plugin_instance_mutex)
+    {
   g_mutex_free (plugin_instance_mutex);
   plugin_instance_mutex = NULL;
+    }
 
+  if (whitelist_file)
+    {
   g_io_channel_close (whitelist_file);
+      whitelist_file = NULL;
+    }
+  
+  initialized = false;
 
   PLUGIN_DEBUG ("NP_Shutdown return");
 



From MAILER-DAEMON Thu Jun 08 11:59:26 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoMus-0002VP-DY
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 11:59:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoMur-0002Uw-G3
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 11:59:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoMuq-0002Ui-Oj
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 11:59:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoMuq-0002Uf-KT
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 11:59:24 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoN2h-00075I-6K
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 12:07:31 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoMup-0006hC-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 11:59:23 -0400
Received: from fitzsim by savannah.gnu.org with local (Exim 4.50)
	id 1FoMun-0006h7-DI
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 15:59:22 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoMun-0006h7-DI@savannah.gnu.org>
From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Thu, 08 Jun 2006 15:59:21 +0000
Subject: [commit-cp] classpath ChangeLog native/plugin/gcjwebplugin.cc
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 15:59:25 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Thomas Fitzsimmons <fitzsim>	06/06/08 15:59:20

Modified files:
	.              : ChangeLog 
	native/plugin  : gcjwebplugin.cc 

Log message:
	2006-06-08  Thomas Fitzsimmons  <fitzsim@redhat.com>
	
		* native/plugin/gcjwebplugin.cc (SECURITY_DESCRIPTION): Update
		message.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7719&r2=1.7720
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/gcjwebplugin.cc?cvsroot=classpath&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7719
retrieving revision 1.7720
diff -u -b -r1.7719 -r1.7720
--- ChangeLog	8 Jun 2006 15:56:11 -0000	1.7719
+++ ChangeLog	8 Jun 2006 15:59:19 -0000	1.7720
@@ -1,3 +1,8 @@
+2006-06-08  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* native/plugin/gcjwebplugin.cc (SECURITY_DESCRIPTION): Update
+	message.
+
 2006-06-08  Tom Fitzsimmons  <fitzsim@redhat.com>
 	    Lillian Angel  <langel@redhat.com>
 

Index: native/plugin/gcjwebplugin.cc
===================================================================
RCS file: /sources/classpath/classpath/native/plugin/gcjwebplugin.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- native/plugin/gcjwebplugin.cc	8 Jun 2006 15:56:12 -0000	1.6
+++ native/plugin/gcjwebplugin.cc	8 Jun 2006 15:59:20 -0000	1.7
@@ -126,8 +126,7 @@
   "GNU Classpath's security implementation is not complete.\n"  \
   "HOSTILE APPLETS WILL STEAL AND/OR DESTROY YOUR DATA!\n"
 #define SECURITY_DESCRIPTION                                            \
-  "If you do not know or trust the source of this applet, click"        \
-  " \"Cancel\".\n"                                                      \
+  "Click \"Cancel\" if you do not trust the source of this applet.\n"   \
   "Click \"Trust Applet\" to load and run this applet now.\n"           \
   "Click \"Trust Applet and Add To Whitelist\" to always load"          \
   " and run this applet from now on, without asking.\n"                 \



From MAILER-DAEMON Thu Jun 08 12:10:36 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoN5g-0007U5-DP
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 12:10:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoN5f-0007Tz-1v
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 12:10:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoN5d-0007Tm-06
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 12:10:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoN5c-0007Tj-Nh
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 12:10:32 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoNDT-00089C-Lq
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 12:18:39 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoN5b-0006rZ-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 12:10:31 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FoN5a-0006rW-Sk
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 16:10:30 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoN5a-0006rW-Sk@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Thu, 08 Jun 2006 16:10:30 +0000
Subject: [commit-cp] classpath/java/awt LightweightDispatcher.java C...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 16:10:35 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/08 16:10:30

Modified files:
	java/awt       : LightweightDispatcher.java 
	.              : ChangeLog 

Log message:
	2006-06-08  Roman Kennke  <kennke@aicas.com>
	
		* java/awt/LightweightDispatcher.java
		(handleMouseEvent): Replaced calls to AWTUtilities.convertPoint()
		with convertPointToChild(). This is more efficient and avoids
		problems with getLocationOnScreen().
		(findTarget): Check for component beeing showing() early.
		Simplified AWTUtilities.convertPoint() to a simple substraction
		operation.
		(convertPointToChild): New helper method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/LightweightDispatcher.java?cvsroot=classpath&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7720&r2=1.7721

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7720
retrieving revision 1.7721
diff -u -b -r1.7720 -r1.7721
--- ChangeLog	8 Jun 2006 15:59:19 -0000	1.7720
+++ ChangeLog	8 Jun 2006 16:10:30 -0000	1.7721
@@ -1,3 +1,14 @@
+2006-06-08  Roman Kennke  <kennke@aicas.com>
+
+	* java/awt/LightweightDispatcher.java
+	(handleMouseEvent): Replaced calls to AWTUtilities.convertPoint()
+	with convertPointToChild(). This is more efficient and avoids
+	problems with getLocationOnScreen().
+	(findTarget): Check for component beeing showing() early.
+	Simplified AWTUtilities.convertPoint() to a simple substraction
+	operation.
+	(convertPointToChild): New helper method.
+
 2006-06-08  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* native/plugin/gcjwebplugin.cc (SECURITY_DESCRIPTION): Update



From MAILER-DAEMON Thu Jun 08 16:28:12 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoR6y-0006nL-8p
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 16:28:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoR6w-0006mk-KR
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 16:28:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoR6u-0006lj-NK
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 16:28:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoR6u-0006lb-Ar
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 16:28:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoREn-0002M2-LA
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 16:36:17 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoR6i-0007sw-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 16:27:56 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FoR6h-0007sp-5a
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 20:27:56 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoR6h-0007sp-5a@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Thu, 08 Jun 2006 20:27:55 +0000
Subject: [commit-cp] classpath ChangeLog native/plugin/Makefile.am n...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 20:28:11 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/08 20:27:54

Modified files:
	.              : ChangeLog 
	native/plugin  : Makefile.am gcjwebplugin.cc 

Log message:
	2006-06-08  Lillian Angel  <langel@redhat.com>
	
	        * native/plugin/Makefile.am:
	        Changed DATA_DIRECTORY to be ~/.gcjwebplugin.
	        * native/plugin/gcjwebplugin.cc:
	        Changed all instances of PLUGIN_DATA_DIRECTORY
	        to DATA_DIRECTORY.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7721&r2=1.7722
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/Makefile.am?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/gcjwebplugin.cc?cvsroot=classpath&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7721
retrieving revision 1.7722
diff -u -b -r1.7721 -r1.7722
--- ChangeLog	8 Jun 2006 16:10:30 -0000	1.7721
+++ ChangeLog	8 Jun 2006 20:27:54 -0000	1.7722
@@ -1,3 +1,11 @@
+2006-06-08  Lillian Angel  <langel@redhat.com>
+
+	* native/plugin/Makefile.am:
+	Changed DATA_DIRECTORY to be ~/.gcjwebplugin.
+	* native/plugin/gcjwebplugin.cc:
+	Changed all instances of PLUGIN_DATA_DIRECTORY
+	to DATA_DIRECTORY.
+
 2006-06-08  Roman Kennke  <kennke@aicas.com>
 
 	* java/awt/LightweightDispatcher.java

Index: native/plugin/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/plugin/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- native/plugin/Makefile.am	5 Jun 2006 14:20:00 -0000	1.2
+++ native/plugin/Makefile.am	8 Jun 2006 20:27:54 -0000	1.3
@@ -4,7 +4,7 @@
 
 libgcjwebplugin_la_CXXFLAGS = \
 	-Wall -DAPPLETVIEWER_EXECUTABLE="\"$(bindir)/appletviewer\"" \
-	-DPLUGIN_DATA_DIRECTORY="\"$(PLUGIN_DIR)/gcjwebplugin-data\"" \
+	-DDATA_DIRECTORY="\"$(HOME)/.gcjwebplugin\"" \
 	$(MOZILLA_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
 
 libgcjwebplugin_la_LDFLAGS = -avoid-version \

Index: native/plugin/gcjwebplugin.cc
===================================================================
RCS file: /cvsroot/classpath/classpath/native/plugin/gcjwebplugin.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- native/plugin/gcjwebplugin.cc	8 Jun 2006 15:59:20 -0000	1.7
+++ native/plugin/gcjwebplugin.cc	8 Jun 2006 20:27:54 -0000	1.8
@@ -120,7 +120,7 @@
 // Security dialog messages.
 #define RESPONSE_TRUST_APPLET "Trust Applet"
 #define RESPONSE_TRUST_APPLET_ADD_TO_LIST "Trust Applet and Add to Whitelist"
-#define WHITELIST_FILENAME PLUGIN_DATA_DIRECTORY "/whitelist.txt"
+#define WHITELIST_FILENAME DATA_DIRECTORY "/whitelist.txt"
 #define SECURITY_WARNING                                        \
   "%s wants to load an applet.\n"                               \
   "GNU Classpath's security implementation is not complete.\n"  \
@@ -326,7 +326,7 @@
   // pipe.
 
   // data->in_pipe_name
-  data->in_pipe_name = g_strdup_printf (PLUGIN_DATA_DIRECTORY
+  data->in_pipe_name = g_strdup_printf (DATA_DIRECTORY
                                         "/gcj-%s-appletviewer-to-plugin",
                                         data->instance_string);
   if (!data->in_pipe_name)
@@ -349,7 +349,7 @@
   // output pipe.
 
   // data->out_pipe_name
-  data->out_pipe_name = g_strdup_printf (PLUGIN_DATA_DIRECTORY
+  data->out_pipe_name = g_strdup_printf (DATA_DIRECTORY
                                          "/gcj-%s-plugin-to-appletviewer",
                                          data->instance_string);
 
@@ -1608,16 +1608,16 @@
 
   // Make sure the plugin data directory exists, creating it if
   // necessary.
-  if (!g_file_test (PLUGIN_DATA_DIRECTORY,
+  if (!g_file_test (DATA_DIRECTORY,
                     (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
     {
       int file_error = 0;
 
-      file_error = g_mkdir (PLUGIN_DATA_DIRECTORY, 0700);
+      file_error = g_mkdir (DATA_DIRECTORY, 0700);
       if (file_error != 0)
         {
           PLUGIN_ERROR_TWO ("Failed to create data directory "
-                            PLUGIN_DATA_DIRECTORY " ",
+                            DATA_DIRECTORY " ",
                             strerror (errno));
           return NPERR_GENERIC_ERROR;
         }



From MAILER-DAEMON Thu Jun 08 17:43:50 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoSIA-0004jG-1B
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 17:43:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoSI8-0004hW-Mg
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 17:43:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoSI7-0004ga-Tj
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 17:43:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoSI7-0004gN-K7
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 17:43:47 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoSQ1-00009s-Qm
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 17:51:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoSI7-0004wP-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 17:43:47 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FoSI6-0004wI-Sm
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 21:43:47 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoSI6-0004wI-Sm@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Thu, 08 Jun 2006 21:43:46 +0000
Subject: [commit-cp] classpath ChangeLog native/plugin/Makefile.am n...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 21:43:49 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/08 21:43:45

Modified files:
	.              : ChangeLog 
	native/plugin  : Makefile.am gcjwebplugin.cc 

Log message:
	2006-06-08  Lillian Angel  <langel@redhat.com>
	
	        * native/plugin/Makefile.am:
	        Removed DATA_DIRECTORY.
	        * native/plugin/gcjwebplugin.cc:
	        Added new global fields for whitelist_file
	        and data_directory. Removed WHITELIST_FILE.
	        (NP_Initialize): Initialized new fields. Also,
	        Changed to use new fields.
	        (NP_Shutdown): Freed data_directory.
	        (GCJ_New): Changed to use new fields.
	        (plugin_ask_user_about_documentbase): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7722&r2=1.7723
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/Makefile.am?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/gcjwebplugin.cc?cvsroot=classpath&r1=1.8&r2=1.9

Patches:





From MAILER-DAEMON Thu Jun 08 17:43:51 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoSIB-0004kn-AJ
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 17:43:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoSI9-0004j8-O8
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 17:43:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoSI7-0004gS-Ly
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 17:43:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoSI7-0004gM-Ie
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 17:43:47 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoSQ1-00009n-LF
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 17:51:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoSI6-0004wL-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 17:43:46 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FoSI5-0004wB-Ty
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 21:43:46 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoSI5-0004wB-Ty@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Thu, 08 Jun 2006 21:43:45 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 21:43:50 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/08 21:43:45

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicTabbedPaneUI.java 

Log message:
	2006-06-07  Lillian Angel  <langel@redhat.com>
	
	        * javax/swing/plaf/basic/BasicTabbedPaneUI.java
	        (getTabBounds): If this method is called with a tab index
	        that is not in the rects array, we need to re-layout the container
	        so it is created.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7699&r2=1.7700
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java?cvsroot=classpath&r1=1.44&r2=1.45

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7699
retrieving revision 1.7700
diff -u -b -r1.7699 -r1.7700
--- ChangeLog	7 Jun 2006 15:22:50 -0000	1.7699
+++ ChangeLog	7 Jun 2006 18:50:57 -0000	1.7700
@@ -1,5 +1,12 @@
 2006-06-07  Lillian Angel  <langel@redhat.com>
 
+	* javax/swing/plaf/basic/BasicTabbedPaneUI.java
+	(getTabBounds): If this method is called with a tab index
+	that is not in the rects array, we need to re-layout the container
+	so it is created.
+
+2006-06-07  Lillian Angel  <langel@redhat.com>
+
 	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
 	(FreetypeGlyphVector): Removed assignment. Caused compilation error.
 	* java/lang/String.java




From MAILER-DAEMON Thu Jun 08 17:49:17 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoSNR-0007Qx-7F
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 17:49:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoSNP-0007Pq-FA
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 17:49:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoSNO-0007P8-RX
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 17:49:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoSNO-0007Oz-GY
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 17:49:14 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoSVI-0000Wy-M9
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 17:57:24 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoSNN-00059c-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 17:49:13 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FoSNM-00059W-0T
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 21:49:13 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoSNM-00059W-0T@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Thu, 08 Jun 2006 21:49:12 +0000
Subject: [commit-cp] classpath ChangeLog native/plugin/gcjwebplugin.cc
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 21:49:15 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/08 21:49:11

Modified files:
	.              : ChangeLog 
	native/plugin  : gcjwebplugin.cc 

Log message:
	2006-06-08  Lillian Angel  <langel@redhat.com>
	
	        * native/plugin/gcjwebplugin.cc:
	        (NP_Shutdown): Freed whitelist_filename.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7723&r2=1.7724
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/gcjwebplugin.cc?cvsroot=classpath&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7723
retrieving revision 1.7724
diff -u -b -r1.7723 -r1.7724
--- ChangeLog	8 Jun 2006 21:43:44 -0000	1.7723
+++ ChangeLog	8 Jun 2006 21:49:11 -0000	1.7724
@@ -1,5 +1,10 @@
 2006-06-08  Lillian Angel  <langel@redhat.com>
 
+	* native/plugin/gcjwebplugin.cc:
+	(NP_Shutdown): Freed whitelist_filename.
+
+2006-06-08  Lillian Angel  <langel@redhat.com>
+
 	* native/plugin/Makefile.am:
 	Removed DATA_DIRECTORY.
 	* native/plugin/gcjwebplugin.cc:

Index: native/plugin/gcjwebplugin.cc
===================================================================
RCS file: /cvsroot/classpath/classpath/native/plugin/gcjwebplugin.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- native/plugin/gcjwebplugin.cc	8 Jun 2006 21:43:45 -0000	1.9
+++ native/plugin/gcjwebplugin.cc	8 Jun 2006 21:49:11 -0000	1.10
@@ -1762,6 +1762,12 @@
       data_directory = NULL;
     }
   
+  if (whitelist_filename)
+    {
+      g_free (whitelist_filename);
+      whitelist_filename = NULL;
+    }
+  
   initialized = false;
   
   PLUGIN_DEBUG ("NP_Shutdown return");



From MAILER-DAEMON Thu Jun 08 19:12:05 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoTfZ-0006M4-Jz
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 19:12:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoTfW-0006Jp-Uu
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 19:12:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoTfU-0006Iw-5K
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 19:12:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoTfT-0006It-Qb
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 19:11:59 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoTnO-0006W1-Rn
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 19:20:11 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoTfT-00005o-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 19:11:59 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FoTfT-00005l-1x
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 23:11:59 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoTfT-00005l-1x@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Thu, 08 Jun 2006 23:11:59 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/management/Runtim...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 23:12:03 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/08 23:11:58

Modified files:
	.              : ChangeLog 
Added files:
	java/lang/management: RuntimeMXBean.java 

Log message:
	2006-06-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/management/RuntimeMXBean.java:
		New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7724&r2=1.7725
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/RuntimeMXBean.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7724
retrieving revision 1.7725
diff -u -b -r1.7724 -r1.7725
--- ChangeLog	8 Jun 2006 21:49:11 -0000	1.7724
+++ ChangeLog	8 Jun 2006 23:11:57 -0000	1.7725
@@ -1,3 +1,8 @@
+2006-06-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/lang/management/RuntimeMXBean.java:
+	New file.
+	
 2006-06-08  Lillian Angel  <langel@redhat.com>
 
 	* native/plugin/gcjwebplugin.cc:

Index: java/lang/management/RuntimeMXBean.java
===================================================================
RCS file: java/lang/management/RuntimeMXBean.java
diff -N java/lang/management/RuntimeMXBean.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/lang/management/RuntimeMXBean.java	8 Jun 2006 23:11:58 -0000	1.1
@@ -0,0 +1,274 @@
+/* RuntimeMXBean.java - Interface for a runtime bean
+   Copyright (C) 2006 Free Software Foundation
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.lang.management;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Provides access to information about the underlying virtual
+ * machine.  Instances of this bean are obtained by calling
+ * {@link ManagementFactory#getRuntimeMXBean()}.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public interface RuntimeMXBean
+{
+
+  /**
+   * <p>
+   * Returns the boot classpath used by the virtual machine.  This
+   * value follows the standard path syntax used by the underlying
+   * operating system (e.g. directories separated by ':' on UNIX
+   * or ';' on Windows). 
+   * </p>
+   * <p>
+   * Supplying this value is optional.  Users should check the
+   * return value of {@link isBootClassPathSupported()} prior to
+   * calling this method.
+   * </p>
+   *
+   * @return the boot classpath of the virtual machine, if supported.
+   * @throws UnsupportedOperationException in cases where this
+   *                                       functionality is not
+   *                                       supported by the VM.
+   * @throws SecurityException if a security manager exists and
+   *                           denies ManagementPermission("monitor").
+   * @see #isBootClassPathSupported()
+   * @see java.lang.management.ManagementPermission
+   */
+  String getBootClassPath();
+
+  /**
+   * Returns the classpath used by the system classloader.  This
+   * is equivalent to obtaining the <code>java.class.path</code>
+   * property via {@link System#getProperty(String)}.  This value
+   * follows the standard path syntax used by the underlying operating
+   * system (e.g. directories separated by ':' on UNIX or ';' on
+   * Windows). 
+   *
+   * @return the classpath used by the system class loader.
+   * @throws SecurityException if a security manager exists which
+   *                           prevents access to the classpath
+   *                           property.
+   * @see java.lang.System#getProperty(String)
+   * @see java.lang.SecurityManager#checkPropertyAccess(String)
+   */
+  String getClassPath();
+
+  /**
+   * Returns a list of the arguments given to the virtual machine,
+   * excluding those that apply to the <code>main()</code> method
+   * of the class file being executed.  These may not just be those
+   * specified at the command line, but may also include arguments
+   * from environment variables, configuration files, etc.  All
+   * command line arguments may not reach the virtual machine, so
+   * these are not included in this list.
+   *
+   * @return a list of arguments passed to the virtual machine.
+   * @throws SecurityException if a security manager exists and
+   *                           denies ManagementPermission("monitor").
+   * @see java.lang.management.ManagementPermission
+   */
+  List getInputArguments();
+
+  /**
+   * Returns the library path.  This is equivalent to obtaining the
+   * <code>java.library.path</code> property via
+   * {@link System#getProperty(String)}.  This value follows the
+   * standard path syntax used by the underlying operating
+   * system (e.g. directories separated by ':' on UNIX or ';' on
+   * Windows). 
+   *
+   * @return the library path.
+   * @throws SecurityException if a security manager exists which
+   *                           prevents access to the library path
+   *                           property.
+   * @see java.lang.System#getProperty(String)
+   * @see java.lang.SecurityManager#checkPropertyAccess(String)
+   */
+  String getLibraryPath();
+
+  /**
+   * Returns the version of the management specification
+   * implemented by the virtual machine.
+   *
+   * @return the version of the management specification
+   *         implemented.
+   */
+  String getManagementSpecVersion();
+
+  /**
+   * Returns the name of this virtual machine.  The content
+   * of this property is left up to the developer of the
+   * virtual machine.  It may include a number of system
+   * attributes and may differ between instances of the
+   * same virtual machine (for example, it might include
+   * the process identifier).
+   *
+   * @return the name of this virtual machine.
+   */
+  String getName();
+
+  /**
+   * Returns the specification name of the virtual machine.
+   * This is equivalent to obtaining the
+   * <code>java.vm.specification.name</code> property via
+   * {@link System#getProperty(String)}.  
+   *
+   * @return the specification name of the VM.
+   * @throws SecurityException if a security manager exists which
+   *                           prevents access to the VM
+   *                           specification name property.
+   * @see java.lang.System#getProperty(String)
+   * @see java.lang.SecurityManager#checkPropertyAccess(String)
+   */
+  String getSpecName();
+
+  /**
+   * Returns the specification vendor of the virtual machine.
+   * This is equivalent to obtaining the
+   * <code>java.vm.specification.vendor</code> property via
+   * {@link System#getProperty(String)}.  
+   *
+   * @return the specification vendor of the VM.
+   * @throws SecurityException if a security manager exists which
+   *                           prevents access to the VM
+   *                           specification vendor property.
+   * @see java.lang.System#getProperty(String)
+   * @see java.lang.SecurityManager#checkPropertyAccess(String)
+   */
+  String getSpecVendor();
+
+  /**
+   * Returns the specification version of the virtual machine.
+   * This is equivalent to obtaining the
+   * <code>java.vm.specification.version</code> property via
+   * {@link System#getProperty(String)}.  
+   *
+   * @return the specification version of the VM.
+   * @throws SecurityException if a security manager exists which
+   *                           prevents access to the VM
+   *                           specification version property.
+   * @see java.lang.System#getProperty(String)
+   * @see java.lang.SecurityManager#checkPropertyAccess(String)
+   */
+  String getSpecVersion();
+
+  /**
+   * Returns the approximate start time of the virtual machine
+   * in milliseconds.
+   * 
+   * @return the start time of the virtual machine.
+   */
+  long getStartTime();
+
+  /**
+   * Returns a map containing the keys and values of the system
+   * properties.  This gives largely the same result as calling
+   * {@link System#getProperties()}, but the resulting map
+   * is filtered so as to only provide keys and values that
+   * are <code>String</code>s.
+   *
+   * @return the map of system properties.
+   */
+  Map getSystemProperties();
+
+  /**
+   * Returns the uptime of the virtual machine in milliseconds.
+   * 
+   * @return the uptime of the virtual machine.
+   */
+  long getUptime();
+
+  /**
+   * Returns the implementation name of the virtual machine.
+   * This is equivalent to obtaining the
+   * <code>java.vm.name</code> property via
+   * {@link System#getProperty(String)}.  
+   *
+   * @return the implementation name of the VM.
+   * @throws SecurityException if a security manager exists which
+   *                           prevents access to the VM name
+   *                           property.
+   * @see java.lang.System#getProperty(String)
+   * @see java.lang.SecurityManager#checkPropertyAccess(String)
+   */
+  String getVmName();
+
+  /**
+   * Returns the implementation vendor of the virtual machine.
+   * This is equivalent to obtaining the
+   * <code>java.vm.vendor</code> property via
+   * {@link System#getProperty(String)}.  
+   *
+   * @return the implementation vendor of the VM.
+   * @throws SecurityException if a security manager exists which
+   *                           prevents access to the VM vendor
+   *                           property.
+   * @see java.lang.System#getProperty(String)
+   * @see java.lang.SecurityManager#checkPropertyAccess(String)
+   */
+  String getVmVendor();
+
+  /**
+   * Returns the implementation version of the virtual machine.
+   * This is equivalent to obtaining the
+   * <code>java.vm.version</code> property via
+   * {@link System#getProperty(String)}.  
+   *
+   * @return the implementation version of the VM.
+   * @throws SecurityException if a security manager exists which
+   *                           prevents access to the VM version
+   *                           property.
+   * @see java.lang.System#getProperty(String)
+   * @see java.lang.SecurityManager#checkPropertyAccess(String)
+   */
+  String getVmVersion();
+
+  /**
+   * Returns true if the virtual machine supports the boot classpath
+   * mechanism.
+   *
+   * @return true if the boot classpath property is supported by the
+   *         virtual machine.
+   */
+  boolean isBootClassPathSupported();
+
+}



From MAILER-DAEMON Thu Jun 08 19:32:21 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoTzA-0000F8-PX
	for mharc-commit-classpath@gnu.org; Thu, 08 Jun 2006 19:32:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoTz8-0000Aj-4z
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 19:32:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoTz6-000085-Ks
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 19:32:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoTz6-00007c-Cy
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 19:32:16 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoU71-0008KB-H8
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 19:40:27 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoTz5-0000cJ-00
	for <commit-classpath@gnu.org>; Thu, 08 Jun 2006 19:32:15 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FoTz4-0000bm-0x
	for commit-classpath@gnu.org; Thu, 08 Jun 2006 23:32:15 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoTz4-0000bm-0x@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 08 Jun 2006 23:32:14 +0000
Subject: [commit-cp] classpath/java/text Bidi.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 23:32:18 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/08 23:32:13

Modified files:
	java/text      : Bidi.java 
	.              : ChangeLog 

Log message:
		* java/text/Bidi.java (resolveNeutralTypes): Set j'th slot
		of 'types'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/text/Bidi.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7725&r2=1.7726

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7725
retrieving revision 1.7726
diff -u -b -r1.7725 -r1.7726
--- ChangeLog	8 Jun 2006 23:11:57 -0000	1.7725
+++ ChangeLog	8 Jun 2006 23:32:13 -0000	1.7726
@@ -1,3 +1,8 @@
+2006-06-08  Tom Tromey  <tromey@redhat.com>
+
+	* java/text/Bidi.java (resolveNeutralTypes): Set j'th slot
+	of 'types'.
+
 2006-06-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/lang/management/RuntimeMXBean.java:



From MAILER-DAEMON Fri Jun 09 02:54:15 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Foasp-00070o-GV
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 02:54:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Foasn-00070i-Vu
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 02:54:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Foasn-00070W-CY
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 02:54:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Foasn-00070T-6i
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 02:54:13 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fob0m-0005Vh-LH
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 03:02:28 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Foasl-0000Gx-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 02:54:11 -0400
Received: from jfrijters by savannah.gnu.org with local (Exim 4.50)
	id 1Foasl-0000Gu-98
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 06:54:11 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Foasl-0000Gu-98@savannah.gnu.org>
From: Jeroen Frijters <jeroen@sumatra.nl>
Date: Fri, 09 Jun 2006 06:54:11 +0000
Subject: [commit-cp] classpath/sun
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 06:54:14 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Jeroen Frijters <jfrijters>	06/06/09 06:54:11

New directory:
	sun

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/sun/?cvsroot=classpath



From MAILER-DAEMON Fri Jun 09 02:57:09 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Foavd-00008L-B8
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 02:57:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Foavb-00008F-5i
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 02:57:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Foava-000083-PA
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 02:57:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Foava-000080-LE
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 02:57:06 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fob3a-0005l8-2g
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 03:05:22 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Foava-0000J8-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 02:57:06 -0400
Received: from jfrijters by savannah.gnu.org with local (Exim 4.50)
	id 1FoavZ-0000J5-R8
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 06:57:05 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoavZ-0000J5-R8@savannah.gnu.org>
From: Jeroen Frijters <jeroen@sumatra.nl>
Date: Fri, 09 Jun 2006 06:57:05 +0000
Subject: [commit-cp] classpath/sun/reflect
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 06:57:07 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Jeroen Frijters <jfrijters>	06/06/09 06:57:05

New directory:
	sun/reflect

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/sun/reflect/?cvsroot=classpath



From MAILER-DAEMON Fri Jun 09 02:57:25 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Foavt-0000GQ-Eg
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 02:57:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Foavr-0000ED-Cg
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 02:57:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Foavq-0000E1-UN
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 02:57:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Foavq-0000Dy-Q1
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 02:57:22 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fob3q-0005md-6Q
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 03:05:38 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Foavq-0000JR-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 02:57:22 -0400
Received: from jfrijters by savannah.gnu.org with local (Exim 4.50)
	id 1Foavp-0000JM-VI
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 06:57:22 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Foavp-0000JM-VI@savannah.gnu.org>
From: Jeroen Frijters <jeroen@sumatra.nl>
Date: Fri, 09 Jun 2006 06:57:21 +0000
Subject: [commit-cp] classpath/sun/reflect/annotation
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 06:57:23 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Jeroen Frijters <jfrijters>	06/06/09 06:57:21

New directory:
	sun/reflect/annotation

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/sun/reflect/annotation/?cvsroot=classpath



From MAILER-DAEMON Fri Jun 09 02:59:27 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Foaxq-00016h-RG
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 02:59:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Foaxo-00014W-Dv
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 02:59:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Foaxn-00013m-Ap
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 02:59:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Foaxn-00013i-7e
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 02:59:23 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fob5m-0005vc-Gb
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 03:07:38 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Foaxm-0000Kk-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 02:59:22 -0400
Received: from jfrijters by savannah.gnu.org with local (Exim 4.50)
	id 1Foaxl-0000Kh-EY
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 06:59:22 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Foaxl-0000Kh-EY@savannah.gnu.org>
From: Jeroen Frijters <jeroen@sumatra.nl>
Date: Fri, 09 Jun 2006 06:59:21 +0000
Subject: [commit-cp] classpath ChangeLog sun/reflect/annotation/Anno...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 06:59:24 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Jeroen Frijters <jfrijters>	06/06/09 06:59:21

Modified files:
	.              : ChangeLog 
Added files:
	sun/reflect/annotation: AnnotationInvocationHandler.java 

Log message:
	2006-06-09  Jeroen Frijters  <jeroen@frijters.net>
	
	        * sun/reflect/annotation/AnnotationInvocationHandler.java:
	        New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7726&r2=1.7727
http://cvs.savannah.gnu.org/viewcvs/classpath/sun/reflect/annotation/AnnotationInvocationHandler.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7726
retrieving revision 1.7727
diff -u -b -r1.7726 -r1.7727
--- ChangeLog	8 Jun 2006 23:32:13 -0000	1.7726
+++ ChangeLog	9 Jun 2006 06:59:20 -0000	1.7727
@@ -1,3 +1,8 @@
+2006-06-09  Jeroen Frijters  <jeroen@frijters.net>
+
+	* sun/reflect/annotation/AnnotationInvocationHandler.java:
+	New file.
+
 2006-06-08  Tom Tromey  <tromey@redhat.com>
 
 	* java/text/Bidi.java (resolveNeutralTypes): Set j'th slot

Index: sun/reflect/annotation/AnnotationInvocationHandler.java
===================================================================
RCS file: sun/reflect/annotation/AnnotationInvocationHandler.java
diff -N sun/reflect/annotation/AnnotationInvocationHandler.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sun/reflect/annotation/AnnotationInvocationHandler.java	9 Jun 2006 06:59:21 -0000	1.1
@@ -0,0 +1,340 @@
+/* sun.reflect.annotation.AnnotationInvocationHandler
+   Copyright (C) 2006
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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 sun.reflect.annotation;
+
+import java.io.Serializable;
+import java.lang.annotation.AnnotationTypeMismatchException;
+import java.lang.annotation.IncompleteAnnotationException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * This class exists for serialization compatibility with the JDK.
+ * VMs can choose to implement annotations by constructing proxies
+ * with this invocation handler, but that is not required.
+ * If a different strategy for proxy objects is chosen, they can
+ * have a writeReplace method to substitute a Proxy based on this
+ * invocation handler is used for serialization.
+ */
+public final class AnnotationInvocationHandler
+  implements InvocationHandler, Serializable
+{
+    private static final long serialVersionUID = 6182022883658399397L;
+    private final Class type;
+    private final Map memberValues;
+
+    /**
+     * Construct a new invocation handler for an annotation proxy.
+     * Note that the VM is responsible for filling the memberValues map
+     * with the default values of all the annotation members.
+     */
+    public AnnotationInvocationHandler(Class type, Map memberValues)
+    {
+        this.type = type;
+        this.memberValues = memberValues;
+    }
+
+    /**
+     * Compare an instance of AnnotationInvocationHandler with another object.
+     * Note that the other object does not have to be an
+     * AnnotationInvocationHandler, any implementation of the annotation
+     * interface is allowed to be compared for equality.
+     * Note that this makes the equals method asymmetric, but this behavior
+     * is specified by Annotation.equals and identical to the JDK.
+     *
+     * This method is public for use by other parts of the VM. Some VMs
+     * (can) use different representations of annotations that reuse this
+     * method.
+     */
+    public static boolean equals(Class type, Map memberValues, Object other)
+    {
+        if (type.isInstance(other))
+        {
+            try
+            {
+                Method[] methods = type.getDeclaredMethods();
+                if (methods.length == memberValues.size())
+                {
+                    for (int i = 0; i < methods.length; i++)
+                    {
+                        String key = methods[i].getName();
+                        Object val = methods[i].invoke(other, new Object[0]);
+                        if (! deepEquals(memberValues.get(key), val))
+                        {
+                            return false;
+                        }
+                    }
+                    return true;
+                }
+            }
+            catch (IllegalAccessException _)
+            {
+                // Ignore exception, like the JDK
+            }
+            catch (InvocationTargetException _)
+            {
+                // Ignore exception, like the JDK
+            }
+        }
+        return false;
+    }
+
+    private static boolean deepEquals(Object o1, Object o2)
+    {
+        if (o1 == o2)
+            return true;
+
+        if (o1 == null || o2 == null)
+            return false;
+
+        if (o1 instanceof boolean[] && o2 instanceof boolean[])
+            return Arrays.equals((boolean[]) o1, (boolean[]) o2);
+
+        if (o1 instanceof byte[] && o2 instanceof byte[])
+            return Arrays.equals((byte[]) o1, (byte[]) o2);
+
+        if (o1 instanceof char[] && o2 instanceof char[])
+            return Arrays.equals((char[]) o1, (char[]) o2);
+
+        if (o1 instanceof short[] && o2 instanceof short[])
+            return Arrays.equals((short[]) o1, (short[]) o2);
+
+        if (o1 instanceof int[] && o2 instanceof int[])
+            return Arrays.equals((int[]) o1, (int[]) o2);
+
+        if (o1 instanceof float[] && o2 instanceof float[])
+            return Arrays.equals((float[]) o1, (float[]) o2);
+
+        if (o1 instanceof long[] && o2 instanceof long[])
+            return Arrays.equals((long[]) o1, (long[]) o2);
+
+        if (o1 instanceof double[] && o2 instanceof double[])
+            return Arrays.equals((double[]) o1, (double[]) o2);
+
+        if (o1 instanceof Object[] && o2 instanceof Object[])
+            return Arrays.equals((Object[]) o1, (Object[]) o2);
+
+        return o1.equals(o2);
+    }
+
+    private static int deepHashCode(Object obj)
+    {
+        if (obj instanceof boolean[])
+            return Arrays.hashCode((boolean[]) obj);
+
+        if (obj instanceof byte[])
+            return Arrays.hashCode((byte[]) obj);
+
+        if (obj instanceof char[])
+            return Arrays.hashCode((char[]) obj);
+
+        if (obj instanceof short[])
+            return Arrays.hashCode((short[]) obj);
+
+        if (obj instanceof int[])
+            return Arrays.hashCode((int[]) obj);
+
+        if (obj instanceof float[])
+            return Arrays.hashCode((float[]) obj);
+
+        if (obj instanceof long[])
+            return Arrays.hashCode((long[]) obj);
+
+        if (obj instanceof double[])
+            return Arrays.hashCode((double[]) obj);
+
+        if (obj instanceof Object[])
+            return Arrays.hashCode((Object[]) obj);
+
+        return obj.hashCode();
+    }
+
+    /**
+     * Compute the hashCode for an annotation. Note that the algorithm is
+     * specified by Annotation.hashCode.
+     *
+     * This method is public for use by other parts of the VM. Some VMs
+     * (can) use different representations of annotations that reuse this
+     * method.
+     */
+    public static int hashCode(Class type, Map memberValues)
+    {
+        int h = 0;
+        Iterator iter = memberValues.keySet().iterator();
+        while (iter.hasNext())
+        {
+            Object key = iter.next();
+            Object val = memberValues.get(key);
+            h += deepHashCode(val) ^ 127 * key.hashCode();
+        }
+        return h;
+    }
+
+    private static String deepToString(Object obj)
+    {
+        if (obj instanceof boolean[])
+            return Arrays.toString((boolean[]) obj);
+
+        if (obj instanceof byte[])
+            return Arrays.toString((byte[]) obj);
+
+        if (obj instanceof char[])
+            return Arrays.toString((char[]) obj);
+
+        if (obj instanceof short[])
+            return Arrays.toString((short[]) obj);
+
+        if (obj instanceof int[])
+            return Arrays.toString((int[]) obj);
+
+        if (obj instanceof float[])
+            return Arrays.toString((float[]) obj);
+
+        if (obj instanceof long[])
+            return Arrays.toString((long[]) obj);
+
+        if (obj instanceof double[])
+            return Arrays.toString((double[]) obj);
+
+        if (obj instanceof Object[])
+            return Arrays.toString((Object[]) obj);
+
+        return obj.toString();
+    }
+
+    /**
+     * This method is public for use by other parts of the VM. Some VMs
+     * (can) use different representations of annotations that reuse this
+     * method.
+     */
+    public static String toString(Class type, Map memberValues)
+    {
+        StringBuffer sb = new StringBuffer();
+        sb.append('@').append(type.getName()).append('(');
+        String sep = "";
+        Iterator iter = memberValues.keySet().iterator();
+        while (iter.hasNext())
+        {
+            Object key = iter.next();
+            Object val = memberValues.get(key);
+            sb.append(sep).append(key).append('=').append(deepToString(val));
+            sep = ", ";
+        }
+        sb.append(')');
+        return sb.toString();
+    }
+
+    private static Class getBoxedReturnType(Method method)
+    {
+        Class returnType = method.getReturnType();
+
+        if (returnType == boolean.class)
+            return Boolean.class;
+
+        if (returnType == byte.class)
+            return Byte.class;
+
+        if (returnType == char.class)
+            return Character.class;
+
+        if (returnType == short.class)
+            return Short.class;
+
+        if (returnType == int.class)
+            return Integer.class;
+
+        if (returnType == float.class)
+            return Float.class;
+
+        if (returnType == long.class)
+            return Long.class;
+
+        if (returnType == double.class)
+            return Double.class;
+
+        return returnType;
+    }
+
+    public Object invoke(Object proxy, Method method, Object[] args)
+      throws Throwable
+    {
+        String methodName = method.getName().intern();
+        if (args == null || args.length == 0)
+        {
+            if (methodName == "toString")
+            {
+                return toString(type, memberValues);
+            }
+            else if (methodName == "hashCode")
+            {
+                return Integer.valueOf(hashCode(type, memberValues));
+            }
+            else if (methodName == "annotationType")
+            {
+                return type;
+            }
+            else
+            {
+                Object val = memberValues.get(methodName);
+                if (val == null)
+                {
+                    throw new IncompleteAnnotationException(type, methodName);
+                }
+                if (! getBoxedReturnType(method).isInstance(val))
+                {
+                    throw new AnnotationTypeMismatchException(method,
+                        val.getClass().getName());
+                }
+                return val;
+            }
+        }
+        else if (args.length == 1)
+        {
+            if (methodName == "equals")
+            {
+                return Boolean.valueOf(equals(type, memberValues, args[0]));
+            }
+        }
+        throw new InternalError("Invalid annotation proxy");
+    }
+}



From MAILER-DAEMON Fri Jun 09 05:35:55 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FodPH-0006YR-ER
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 05:35:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FodPF-0006W5-Kw
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 05:35:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FodPE-0006Vd-7C
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 05:35:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FodPD-0006VP-TH
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 05:35:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FodXE-0000nY-VA
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 05:44:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FodPD-0001Az-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 05:35:51 -0400
Received: from jfrijters by savannah.gnu.org with local (Exim 4.50)
	id 1FodPC-0001An-Iv
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 09:35:50 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FodPC-0001An-Iv@savannah.gnu.org>
From: Jeroen Frijters <jeroen@sumatra.nl>
Date: Fri, 09 Jun 2006 09:35:50 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/font/opentype/...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 09:35:53 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Jeroen Frijters <jfrijters>	06/06/09 09:35:50

Modified files:
	.              : ChangeLog 
	gnu/java/awt/font/opentype/truetype: VirtualMachine.java 

Log message:
	2006-06-09  Jeroen Frijters  <jeroen@frijters.net>
	
	        * gnu/java/awt/font/opentype/truetype/VirtualMachine.java
	        (executeInstruction): Added NOT support.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7727&r2=1.7728
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java?cvsroot=classpath&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7727
retrieving revision 1.7728
diff -u -b -r1.7727 -r1.7728
--- ChangeLog	9 Jun 2006 06:59:20 -0000	1.7727
+++ ChangeLog	9 Jun 2006 09:35:49 -0000	1.7728
@@ -1,5 +1,10 @@
 2006-06-09  Jeroen Frijters  <jeroen@frijters.net>
 
+	* gnu/java/awt/font/opentype/truetype/VirtualMachine.java
+	(executeInstruction): Added NOT support.
+
+2006-06-09  Jeroen Frijters  <jeroen@frijters.net>
+
 	* sun/reflect/annotation/AnnotationInvocationHandler.java:
 	New file.
 

Index: gnu/java/awt/font/opentype/truetype/VirtualMachine.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/java/awt/font/opentype/truetype/VirtualMachine.java	30 Apr 2006 09:45:11 -0000	1.1
+++ gnu/java/awt/font/opentype/truetype/VirtualMachine.java	9 Jun 2006 09:35:50 -0000	1.2
@@ -1066,6 +1066,10 @@
       stack[sp] = ((e1 != 0) || (stack[sp] != 0)) ? 1 : 0;
       break;
 
+    case 0x5C: // NOT
+      stack[sp] = (stack[sp] != 0) ? 0 : 1;
+      break;
+
     case 0x5e: // SDB, Set Delta Base in the graphics state
       deltaBase = stack[sp--];
       break;
@@ -1764,7 +1768,7 @@
     /* 50 */ "LT", "LTEQ", "GT", "GTEQ",
     /* 54 */ "EQ", "NEQ", "INST_56", "INST_57",
     /* 58 */ "IF", "EIF", "AND", "OR",
-    /* 5c */ "INST_5C", "INST_5D", "SDB", "SDS",
+    /* 5c */ "NOT", "INST_5D", "SDB", "SDS",
     /* 60 */ "ADD", "SUB", "DIV", "MUL",
     /* 64 */ "ABS", "NEG", "FLOOR", "CEILING",
     /* 68 */ "ROUND[0]", "ROUND[1]", "ROUND[2]", "ROUND[3]",



From MAILER-DAEMON Fri Jun 09 05:58:42 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FodlK-0001r8-MP
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 05:58:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FodlJ-0001r0-F9
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 05:58:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FodlH-0001qo-17
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 05:58:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FodlG-0001ql-SS
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 05:58:38 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FodtI-0002ef-0r
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 06:06:56 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FodlF-00028z-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 05:58:37 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FodlE-00028u-Hi
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 09:58:37 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FodlE-00028u-Hi@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Fri, 09 Jun 2006 09:58:36 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 09:58:41 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/09 09:58:36

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicScrollPaneUI.java 

Log message:
	2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/plaf/basic/BasicScrollPaneUI.java
		(getActionMap): Use correct key to store action map.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7728&r2=1.7729
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java?cvsroot=classpath&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7728
retrieving revision 1.7729
diff -u -b -r1.7728 -r1.7729
--- ChangeLog	9 Jun 2006 09:35:49 -0000	1.7728
+++ ChangeLog	9 Jun 2006 09:58:35 -0000	1.7729
@@ -1,3 +1,8 @@
+2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/plaf/basic/BasicScrollPaneUI.java
+	(getActionMap): Use correct key to store action map.
+
 2006-06-09  Jeroen Frijters  <jeroen@frijters.net>
 
 	* gnu/java/awt/font/opentype/truetype/VirtualMachine.java

Index: javax/swing/plaf/basic/BasicScrollPaneUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- javax/swing/plaf/basic/BasicScrollPaneUI.java	8 Jun 2006 10:52:51 -0000	1.26
+++ javax/swing/plaf/basic/BasicScrollPaneUI.java	9 Jun 2006 09:58:36 -0000	1.27
@@ -516,7 +516,7 @@
       {
         map = createActionMap();
         if (map != null)
-          UIManager.put("Slider.actionMap", map);
+          UIManager.put("ScrollPane.actionMap", map);
       }
     return map;
   }



From MAILER-DAEMON Fri Jun 09 07:17:15 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoezL-0001Vt-Jb
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 07:17:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoezJ-0001V3-Od
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:17:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoezJ-0001Uk-5H
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:17:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoezI-0001Ud-Qq
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:17:12 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fof7K-0000z1-QR
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:25:31 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoezH-0005Q4-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 07:17:11 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FoezG-0005Pz-7r
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 11:17:10 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoezG-0005Pz-7r@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Fri, 09 Jun 2006 11:17:10 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 11:17:14 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/09 11:17:09

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicLookAndFeel.java 
	                        BasicScrollBarUI.java 

Log message:
	2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/plaf/basic/BasicLookAndFeel.java
		(initComponentDefaults): Corrected 'ScrollBar.focusInputMap' entry,
		* javax/swing/plaf/basic/BasicScrollBarUI.java
		(installKeyboardActions): Implemented,
		(uninstallKeyboardActions): Implemented,
		(getInputMap): New method,
		(getActionMap): New method,
		(createActionMap): New method,
		(installUI): Call installKeyboardActions(),
		(uninstallUI): Call uninstallKeyboardActions().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7729&r2=1.7730
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java?cvsroot=classpath&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java?cvsroot=classpath&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7729
retrieving revision 1.7730
diff -u -b -r1.7729 -r1.7730
--- ChangeLog	9 Jun 2006 09:58:35 -0000	1.7729
+++ ChangeLog	9 Jun 2006 11:17:08 -0000	1.7730
@@ -1,5 +1,18 @@
 2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
 
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	(initComponentDefaults): Corrected 'ScrollBar.focusInputMap' entry,
+	* javax/swing/plaf/basic/BasicScrollBarUI.java
+	(installKeyboardActions): Implemented,
+	(uninstallKeyboardActions): Implemented,
+	(getInputMap): New method,
+	(getActionMap): New method,
+	(createActionMap): New method,
+	(installUI): Call installKeyboardActions(),
+	(uninstallUI): Call uninstallKeyboardActions().
+	
+2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
+
 	* javax/swing/plaf/basic/BasicScrollPaneUI.java
 	(getActionMap): Use correct key to store action map.
 

Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- javax/swing/plaf/basic/BasicLookAndFeel.java	6 Jun 2006 15:12:10 -0000	1.91
+++ javax/swing/plaf/basic/BasicLookAndFeel.java	9 Jun 2006 11:17:09 -0000	1.92
@@ -1069,14 +1069,14 @@
         "PAGE_DOWN", "positiveBlockIncrement",
         "END",  "maxScroll",
         "HOME",  "minScroll",
-        "LEFT",  "positiveUnitIncrement",
+        "LEFT",  "negativeUnitIncrement",
         "KP_UP", "negativeUnitIncrement",
         "KP_DOWN", "positiveUnitIncrement",
         "UP",  "negativeUnitIncrement",
-        "RIGHT", "negativeUnitIncrement",
-        "KP_LEFT", "positiveUnitIncrement",
+        "RIGHT", "positiveUnitIncrement",
+        "KP_LEFT", "negativeUnitIncrement",
         "DOWN",  "positiveUnitIncrement",
-        "KP_RIGHT", "negativeUnitIncrement"
+        "KP_RIGHT", "positiveUnitIncrement"
       }),
       "ScrollBar.foreground", new ColorUIResource(light),
       "ScrollBar.maximumThumbSize", new DimensionUIResource(4096, 4096),

Index: javax/swing/plaf/basic/BasicScrollBarUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- javax/swing/plaf/basic/BasicScrollBarUI.java	17 Apr 2006 07:41:05 -0000	1.33
+++ javax/swing/plaf/basic/BasicScrollBarUI.java	9 Jun 2006 11:17:09 -0000	1.34
@@ -1,5 +1,5 @@
 /* BasicScrollBarUI.java --
-   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006,  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,8 +38,6 @@
 
 package javax.swing.plaf.basic;
 
-import gnu.classpath.NotImplementedException;
-
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
@@ -56,10 +54,14 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
+import javax.swing.AbstractAction;
+import javax.swing.ActionMap;
 import javax.swing.BoundedRangeModel;
+import javax.swing.InputMap;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JScrollBar;
+import javax.swing.JSlider;
 import javax.swing.LookAndFeel;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
@@ -67,6 +69,7 @@
 import javax.swing.UIManager;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import javax.swing.plaf.ActionMapUIResource;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.ScrollBarUI;
 
@@ -762,12 +765,148 @@
   }
 
   /**
-   * This method installs the keyboard actions for the scrollbar.
+   * Installs the input map from the look and feel defaults, and a 
+   * corresponding action map.  Note the the keyboard bindings will only
+   * work when the {@link JScrollBar} component has the focus, which is rare.
    */
   protected void installKeyboardActions()
-    throws NotImplementedException
   {
-    // FIXME: implement.
+    InputMap keyMap = getInputMap(
+        JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+    SwingUtilities.replaceUIInputMap(scrollbar, 
+        JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, keyMap);
+    ActionMap map = getActionMap();
+    SwingUtilities.replaceUIActionMap(scrollbar, map);
+  }
+
+  /**
+   * Uninstalls the input map and action map installed by
+   * {@link #installKeyboardActions()}.
+   */
+  protected void uninstallKeyboardActions()
+  {
+    SwingUtilities.replaceUIActionMap(scrollbar, null);
+    SwingUtilities.replaceUIInputMap(scrollbar, 
+        JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, null);
+  }
+
+  InputMap getInputMap(int condition) 
+  {
+    if (condition == JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+      return (InputMap) UIManager.get("ScrollBar.focusInputMap");
+    return null;
+  }
+  
+  /**
+   * Returns the action map for the {@link JScrollBar}.  All scroll bars 
+   * share a single action map which is created the first time this method is 
+   * called, then stored in the UIDefaults table for subsequent access.
+   * 
+   * @return The shared action map.
+   */
+  ActionMap getActionMap() 
+  {
+    ActionMap map = (ActionMap) UIManager.get("ScrollBar.actionMap");
+
+    if (map == null) // first time here
+      {
+        map = createActionMap();
+        if (map != null)
+          UIManager.put("ScrollBar.actionMap", map);
+      }
+    return map;
+  }
+
+  /**
+   * Creates the action map shared by all {@link JSlider} instances.
+   * This method is called once by {@link #getActionMap()} when it 
+   * finds no action map in the UIDefaults table...after the map is 
+   * created, it gets added to the defaults table so that subsequent 
+   * calls to {@link #getActionMap()} will return the same shared 
+   * instance.
+   * 
+   * @return The action map.
+   */
+  ActionMap createActionMap()
+  {
+    ActionMap map = new ActionMapUIResource();
+    map.put("positiveUnitIncrement", 
+            new AbstractAction("positiveUnitIncrement") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollBar sb = (JScrollBar) event.getSource();
+                if (sb.isVisible()) 
+                  {
+                    int delta = sb.getUnitIncrement(1);
+                    sb.setValue(sb.getValue() + delta);
+                  }
+              }
+            }
+    );
+    map.put("positiveBlockIncrement", 
+            new AbstractAction("positiveBlockIncrement") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollBar sb = (JScrollBar) event.getSource();
+                if (sb.isVisible()) 
+                  {
+                    int delta = sb.getBlockIncrement(1);
+                    sb.setValue(sb.getValue() + delta);
+                  }
+              }
+            }
+    );
+    map.put("negativeUnitIncrement", 
+            new AbstractAction("negativeUnitIncrement") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollBar sb = (JScrollBar) event.getSource();
+                if (sb.isVisible()) 
+                  {
+                    int delta = sb.getUnitIncrement(-1);
+                    sb.setValue(sb.getValue() + delta);
+                  }
+              }
+            }
+    );
+    map.put("negativeBlockIncrement", 
+            new AbstractAction("negativeBlockIncrement") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollBar sb = (JScrollBar) event.getSource();
+                if (sb.isVisible()) 
+                  {
+                    int delta = sb.getBlockIncrement(-1);
+                    sb.setValue(sb.getValue() + delta);
+                  }
+              }
+            }
+    );
+    map.put("minScroll", 
+            new AbstractAction("minScroll") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollBar sb = (JScrollBar) event.getSource();
+                if (sb.isVisible()) 
+                  {
+                    sb.setValue(sb.getMinimum());
+                  }
+              }
+            }
+    );
+    map.put("maxScroll", 
+            new AbstractAction("maxScroll") {
+              public void actionPerformed(ActionEvent event)
+              {
+                JScrollBar sb = (JScrollBar) event.getSource();
+                if (sb.isVisible()) 
+                  {
+                    sb.setValue(sb.getMaximum());
+                  }
+              }
+            }
+    );
+    return map;
   }
 
   /**
@@ -817,6 +956,7 @@
 	installComponents();
 	configureScrollBarColors();
 	installListeners();
+        installKeyboardActions();
 
 	calculatePreferredSize();
       }
@@ -1140,16 +1280,6 @@
   }
 
   /**
-   * This method uninstalls any keyboard actions this scrollbar acquired
-   * during install.
-   */
-  protected void uninstallKeyboardActions()
-    throws NotImplementedException
-  {
-    // FIXME: implement.
-  }
-
-  /**
    * This method uninstalls any listeners that were registered during install.
    */
   protected void uninstallListeners()
@@ -1186,6 +1316,7 @@
    */
   public void uninstallUI(JComponent c)
   {
+    uninstallKeyboardActions();
     uninstallListeners();
     uninstallDefaults();
     uninstallComponents();



From MAILER-DAEMON Fri Jun 09 07:28:53 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FofAb-0008Nk-GM
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 07:28:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FofAZ-0008Mf-AP
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:28:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FofAY-0008MM-BE
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:28:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FofAY-0008MI-6d
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:28:50 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FofIa-0001sP-CW
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:37:08 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FofAX-0005ZH-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 07:28:49 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FofAV-0005ZD-Tn
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 11:28:49 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FofAV-0005ZD-Tn@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Fri, 09 Jun 2006 11:28:47 +0000
Subject: [commit-cp] classpath/gnu/javax/crypto/pad BasePad.java Cha...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 11:28:51 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/09 11:28:47

Modified files:
	gnu/javax/crypto/pad: BasePad.java 
	.              : ChangeLog 

Log message:
	2006-06-09  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/javax/crypto/pad/BasePad.java (selfTest): Re-factored to allow more
		flexible self-test by sub-classes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/BasePad.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7730&r2=1.7731

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7730
retrieving revision 1.7731
diff -u -b -r1.7730 -r1.7731
--- ChangeLog	9 Jun 2006 11:17:08 -0000	1.7730
+++ ChangeLog	9 Jun 2006 11:28:47 -0000	1.7731
@@ -1,3 +1,8 @@
+2006-06-09  Raif S. Naffah  <raif@swiftdsl.com.au>
+
+	* gnu/javax/crypto/pad/BasePad.java (selfTest): Re-factored to allow more
+	flexible self-test by sub-classes.
+
 2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/plaf/basic/BasicLookAndFeel.java



From MAILER-DAEMON Fri Jun 09 07:30:47 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FofCR-0000fn-D1
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 07:30:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FofCP-0000ds-Al
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:30:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FofCN-0000cF-Oo
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:30:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FofCN-0000c6-Ma
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:30:43 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FofKP-00024q-VF
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:39:02 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FofCN-0005ce-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 07:30:43 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FofCM-0005cb-Dr
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 11:30:42 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FofCM-0005cb-Dr@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Fri, 09 Jun 2006 11:30:42 +0000
Subject: [commit-cp] classpath ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 11:30:45 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/09 11:30:42

Modified files:
	.              : ChangeLog 

Log message:
	2006-06-09  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/javax/crypto/pad/BasePad.java (selfTest): Re-factored to allow more
		flexible self-test by sub-classes.
		(test1BlockSize): New method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7731&r2=1.7732

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7731
retrieving revision 1.7732
diff -u -b -r1.7731 -r1.7732
--- ChangeLog	9 Jun 2006 11:28:47 -0000	1.7731
+++ ChangeLog	9 Jun 2006 11:30:41 -0000	1.7732
@@ -2,6 +2,7 @@
 
 	* gnu/javax/crypto/pad/BasePad.java (selfTest): Re-factored to allow more
 	flexible self-test by sub-classes.
+	(test1BlockSize): New method.
 
 2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
 



From MAILER-DAEMON Fri Jun 09 07:49:59 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FofV1-0007Hd-98
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 07:49:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FofV0-0007FG-5w
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:49:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FofUz-0007Dm-8k
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:49:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FofUz-0007DM-4V
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:49:57 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fofd1-0004Dg-88
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 07:58:15 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FofUy-00074U-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 07:49:56 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FofUx-00074P-1d
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 11:49:56 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FofUx-00074P-1d@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Fri, 09 Jun 2006 11:49:55 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/security/Registry....
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 11:49:58 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/09 11:49:54

Modified files:
	.              : ChangeLog 
	gnu/java/security: Registry.java 
	gnu/javax/crypto/pad: PadFactory.java 
Added files:
	gnu/javax/crypto/pad: ISO10126.java 

Log message:
	2006-06-09  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		On behalf of Matthew Wringe <mwringe@redhat.com>
		* gnu/java/security/Registry.java (ISO10126_PAD): New constant.
		* gnu/javax/crypto/pad/ISO10126.java: New class.
		* gnu/javax/crypto/pad/PadFactory.java (names): New field.
		(getInstance): Added support for ISO-10126 scheme.
		(getNames): Likewise.
		Cache result for speed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7732&r2=1.7733
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/Registry.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/PadFactory.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/ISO10126.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7732
retrieving revision 1.7733
diff -u -b -r1.7732 -r1.7733
--- ChangeLog	9 Jun 2006 11:30:41 -0000	1.7732
+++ ChangeLog	9 Jun 2006 11:49:53 -0000	1.7733
@@ -1,5 +1,15 @@
 2006-06-09  Raif S. Naffah  <raif@swiftdsl.com.au>
 
+	On behalf of Matthew Wringe <mwringe@redhat.com>
+	* gnu/java/security/Registry.java (ISO10126_PAD): New constant.
+	* gnu/javax/crypto/pad/ISO10126.java: New class.
+	* gnu/javax/crypto/pad/PadFactory.java (names): New field.
+	(getInstance): Added support for ISO-10126 scheme.
+	(getNames): Likewise.
+	Cache result for speed.
+
+2006-06-09  Raif S. Naffah  <raif@swiftdsl.com.au>
+
 	* gnu/javax/crypto/pad/BasePad.java (selfTest): Re-factored to allow more
 	flexible self-test by sub-classes.
 	(test1BlockSize): New method.

Index: gnu/java/security/Registry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/Registry.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/java/security/Registry.java	22 Mar 2006 22:49:24 -0000	1.5
+++ gnu/java/security/Registry.java	9 Jun 2006 11:49:54 -0000	1.6
@@ -177,6 +177,9 @@
   /** TLSv1 padding scheme. */
   String TLS1_PAD = "tls1";
 
+  /** ISO 10126-2 padding scheme. */
+  String ISO10126_PAD = "iso10126";
+
   // Pseudo-random number generators..........................................
 
   /** (Apparently) RC4 keystream PRNG. */

Index: gnu/javax/crypto/pad/PadFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/PadFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/pad/PadFactory.java	22 Mar 2006 22:49:24 -0000	1.2
+++ gnu/javax/crypto/pad/PadFactory.java	9 Jun 2006 11:49:54 -0000	1.3
@@ -49,12 +49,8 @@
  */
 public class PadFactory implements Registry
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -------------------------------------------------------------------------
+  /** Collection of padding algorithm names --cached for speed. */
+  private static Set names;
 
   /** Trivial constructor to enforce Singleton pattern. */
   private PadFactory()
@@ -104,6 +100,10 @@
       {
         result = new TLS1();
       }
+    else if (pad.equals(ISO10126_PAD))
+      {
+        result = new ISO10126();
+      }
 
     if (result != null && !result.selfTest())
       {
@@ -114,13 +114,15 @@
   }
 
   /**
-   * <p>Returns a {@link java.util.Set} of names of padding algorithms
-   * supported by this <i>Factory</i>.</p>
+   * Returns a {@link java.util.Set} of names of padding algorithms
+   * supported by this <i>Factory</i>.
    *
    * @return a {@link Set} of padding algorithm names (Strings).
    */
   public static final Set getNames()
   {
+    if (names == null)
+      {
     HashSet hs = new HashSet();
     hs.add(PKCS5_PAD);
     hs.add(PKCS7_PAD);
@@ -128,10 +130,9 @@
     hs.add(EME_PKCS1_V1_5_PAD);
     hs.add(SSL3_PAD);
     hs.add(TLS1_PAD);
-
-    return Collections.unmodifiableSet(hs);
+        hs.add(ISO10126_PAD);
+        names = Collections.unmodifiableSet(hs);
+      }
+    return names;
   }
-
-  // Instance methods
-  // -------------------------------------------------------------------------
 }

Index: gnu/javax/crypto/pad/ISO10126.java
===================================================================
RCS file: gnu/javax/crypto/pad/ISO10126.java
diff -N gnu/javax/crypto/pad/ISO10126.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/javax/crypto/pad/ISO10126.java	9 Jun 2006 11:49:54 -0000	1.1
@@ -0,0 +1,109 @@
+/* ISO10126.java -- An implementation of the ISO 10126-2 padding scheme
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is a 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 of the License, 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; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
+
+
+package gnu.javax.crypto.pad;
+
+import gnu.java.security.Registry;
+import gnu.java.security.util.PRNG;
+
+/**
+ * The implementation of the ISO 10126-2 padding algorithm.
+ * <p>
+ * The last byte of the padding block is the number of padding bytes, all other
+ * padding bytes are random.
+ * <p>
+ * References:
+ * <ol>
+ *    <li><a href="http://www.w3.org/TR/xmlenc-core/">XML Encryption Syntax and
+ *    Processing</a> Section "5.2 Block Encryption Algorithms"; "Padding".</li>
+ * </ol>
+ */
+public final class ISO10126
+    extends BasePad
+{
+  /** Used to generate random numbers for padding bytes. */
+  private PRNG prng;
+
+  ISO10126()
+  {
+    super(Registry.ISO10126_PAD);
+    prng = PRNG.getInstance();
+  }
+
+  public void setup()
+  {
+    // Nothing to do here
+  }
+
+  public byte[] pad(byte[] in, int offset, int length)
+  {
+    int padLength = blockSize - (length % blockSize);
+    final byte[] pad = new byte[padLength];
+
+    // generate random numbers for the padding bytes except for the last byte
+    prng.nextBytes(pad, 0, padLength - 1);
+    // the last byte contains the number of padding bytes
+    pad[padLength - 1] = (byte) padLength;
+
+    return pad;
+  }
+
+  public int unpad(byte[] in, int offset, int length)
+      throws WrongPaddingException
+  {
+    // the last byte contains the number of padding bytes
+    int padLength = in[offset + length - 1] & 0xFF;
+    if (padLength > length)
+      throw new WrongPaddingException();
+
+    return padLength;
+  }
+
+  /**
+   * The default self-test in the super-class would take too long to finish
+   * with this type of padder --due to the large amount of random data needed.
+   * We override the default test and replace it with a simple one for a 16-byte
+   * block-size (default AES block-size). The Mauve test TestOfISO10126 will
+   * exercise all block-sizes that the default self-test uses for the other
+   * padders.
+   */
+  public boolean selfTest()
+  {
+    return test1BlockSize(16, new byte[1024]);
+  }
+}



From MAILER-DAEMON Fri Jun 09 08:51:43 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FogSl-0002T3-Eo
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 08:51:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FogSk-0002Sg-6N
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 08:51:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FogSi-0002ST-UF
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 08:51:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FogSi-0002SM-OS
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 08:51:40 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fogal-0001WS-Fe
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 08:59:59 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FogST-0000kD-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 08:51:25 -0400
Received: from audriusa by savannah.gnu.org with local (Exim 4.50)
	id 1FogSS-0000kA-Nz
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:51:25 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FogSS-0000kA-Nz@savannah.gnu.org>
From: Audrius Meskauskas <audriusa@bluewin.ch>
Date: Fri, 09 Jun 2006 12:51:24 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/text/html/HTMLD...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 12:51:42 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Audrius Meskauskas <audriusa>	06/06/09 12:51:24

Modified files:
	.              : ChangeLog 
	javax/swing/text/html: HTMLDocument.java 
	gnu/javax/swing/text/html/parser: SmallHtmlAttributeSet.java 
Added files:
	examples/gnu/classpath/examples/swing: HtmlDemo.java 

Log message:
	2006-06-09  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
	
	    * gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java
	    (constructor): Do not lowercase the values.
	    * javax/swing/text/html/HTMLDocument.java
	    (HTMLReader.addSpecialElement): Implemented.
	    * examples/gnu/classpath/examples/swing/HtmlDemo.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7733&r2=1.7734
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/HTMLDocument.java?cvsroot=classpath&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/swing/HtmlDemo.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7733
retrieving revision 1.7734
diff -u -b -r1.7733 -r1.7734
--- ChangeLog	9 Jun 2006 11:49:53 -0000	1.7733
+++ ChangeLog	9 Jun 2006 12:51:22 -0000	1.7734
@@ -1,3 +1,11 @@
+2006-06-09  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
+	* gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java
+	(constructor): Do not lowercase the values.
+	* javax/swing/text/html/HTMLDocument.java
+	(HTMLReader.addSpecialElement): Implemented.
+	* examples/gnu/classpath/examples/swing/HtmlDemo.java: New file.
+
 2006-06-09  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	On behalf of Matthew Wringe <mwringe@redhat.com>

Index: javax/swing/text/html/HTMLDocument.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/text/html/HTMLDocument.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- javax/swing/text/html/HTMLDocument.java	6 Jun 2006 19:39:53 -0000	1.31
+++ javax/swing/text/html/HTMLDocument.java	9 Jun 2006 12:51:24 -0000	1.32
@@ -39,13 +39,15 @@
 package javax.swing.text.html;
 
 import gnu.classpath.NotImplementedException;
-
 import gnu.javax.swing.text.html.CharacterAttributeTranslator;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Stack;
 import java.util.Vector;
+
+import javax.swing.JEditorPane;
 import javax.swing.text.AbstractDocument;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
@@ -59,9 +61,15 @@
 import javax.swing.text.html.HTML.Tag;
 
 /**
- * TODO: Add more comments here 
+ * Represents the HTML document that is constructed by defining the text and
+ * other components (images, buttons, etc) in HTML language. This class can
+ * becomes the default document for {@link JEditorPane} after setting its
+ * content type to "text/html". HTML document also serves as an intermediate
+ * data structure when it is needed to parse HTML and then obtain the content of
+ * the certain types of tags. This class also has methods for modifying the HTML
+ * content.
  * 
- * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  * @author Anthony Balkissoon (abalkiss@redhat.com)
  * @author Lillian Angel (langel@redhat.com)
  */
@@ -727,11 +735,17 @@
       } 
     }
     
+    /**
+     * Inserts the elements that are represented by ths single tag with 
+     * attributes (only). The closing tag, even if present, mut follow
+     * immediately after the starting tag without providing any additional
+     * information. Hence the {@link TagAction#end} method need not be
+     * overridden and still does nothing.
+     */
     public class SpecialAction extends TagAction
     {
       /**
-       * This method is called when a start tag is seen for one of the types
-       * of tags associated with this Action.
+       * The functionality is delegated to {@link HTMLReader#addSpecialElement}
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
       {
@@ -1407,10 +1421,19 @@
      * @param a the attribute set specifying the special content
      */
     protected void addSpecialElement(HTML.Tag t, MutableAttributeSet a)
-      throws NotImplementedException
     {
-      // FIXME: Implement
-      print ("HTMLReader.addSpecialElement not implemented yet");
+      a.addAttribute(StyleConstants.NameAttribute, t);
+      
+      // Migrate from the rather htmlAttributeSet to the faster, lighter and 
+      // unchangeable alternative implementation.
+      AttributeSet copy = a.copyAttributes();
+      
+      // TODO: Figure out why we must always insert this single character
+      // (otherwise the element does not appear). Either fix or add explaining
+      // comment or at least report a normal bug.
+      ElementSpec spec = new ElementSpec(copy, ElementSpec.ContentType, 
+                                         new char[] {' '}, 0, 1 );
+      parseBuffer.add(spec);
     }
     
     void printBuffer()

Index: gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java	6 Jun 2006 12:57:27 -0000	1.1
+++ gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java	9 Jun 2006 12:51:24 -0000	1.2
@@ -100,8 +100,6 @@
         key = en.nextElement();
         keys[i] = key;
         value = copyFrom.getAttribute(key);
-        if (value instanceof String)
-          value = ((String) value).toLowerCase();
         values[i] = value;
       }
   }

Index: examples/gnu/classpath/examples/swing/HtmlDemo.java
===================================================================
RCS file: examples/gnu/classpath/examples/swing/HtmlDemo.java
diff -N examples/gnu/classpath/examples/swing/HtmlDemo.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ examples/gnu/classpath/examples/swing/HtmlDemo.java	9 Jun 2006 12:51:24 -0000	1.1
@@ -0,0 +1,165 @@
+/* HtmlDemo.java -- HTML viewer demo
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.examples.swing;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextPane;
+import javax.swing.SwingUtilities;
+
+/**
+ * Parses and displays HTML content.
+ * 
+ * @author Audrius Meskauskas (audriusa@bioinformatics.org)
+ */
+public class HtmlDemo extends JPanel
+{ 
+  
+  JTextPane html = new JTextPane();
+
+  //JTextArea text = new JTextArea("<html><body><p><img src='' alt='alt txt'></p></body></html>");
+  JTextArea text = new JTextArea("<html><body><p>nor<font color=red>ma</font>l<sup>sup</sup>normal<sub>sub</sub>normal</p></body></html>");
+  
+  JPanel buttons;
+
+  public HtmlDemo()
+  {
+    super();
+    html.setContentType("text/html"); // not now.
+    createContent();
+  }
+  
+  /**
+   * Returns a panel with the demo content. The panel uses a BorderLayout(), and
+   * the BorderLayout.SOUTH area is empty, to allow callers to add controls to
+   * the bottom of the panel if they want to (a close button is added if this
+   * demo is being run as a standalone demo).
+   */
+  private void createContent()
+  {
+    setLayout(new BorderLayout());
+    
+    JPanel center = new JPanel();
+    GridLayout layout = new GridLayout();
+    layout.setRows(2);
+    center.setLayout(layout);
+    center.add(new JScrollPane(text));
+    center.add(new JScrollPane(html));
+    
+    buttons = new JPanel();
+    
+    JButton parse = new JButton("parse");
+    parse.addActionListener(new ActionListener()
+      {
+        public void actionPerformed(ActionEvent event)
+          {
+            String t = text.getText();
+            System.out.println("HtmlDemo.java.createContent:Parsing started");
+            html.setText(t);
+            System.out.println("HtmlDemo.java.createContent:Parsing completed");            
+          }
+      });
+    
+    buttons.add(parse);
+
+    add(center, BorderLayout.CENTER);
+    add(buttons, BorderLayout.SOUTH);
+  }
+ 
+  /**
+   * The executable method to display the editable table.
+   * 
+   * @param args
+   *          unused.
+   */
+  public static void main(String[] args)
+  {
+    SwingUtilities.invokeLater
+    (new Runnable()
+     {
+       public void run()
+       {
+         HtmlDemo demo = new HtmlDemo();
+         
+         JButton exit = new JButton("exit");
+         exit.addActionListener(new ActionListener()
+           {
+             public void actionPerformed(ActionEvent event)
+               {
+                 System.exit(0);
+               }
+           });
+         
+         demo.buttons.add(exit);
+         
+         JFrame frame = new JFrame();
+         frame.getContentPane().add(demo);
+         frame.setSize(new Dimension(640, 480));
+         frame.setVisible(true);
+       }
+     });
+  }
+
+  /**
+   * Returns a DemoFactory that creates a HtmlDemo.
+   *
+   * @return a DemoFactory that creates a HtmlDemo
+   */
+  public static DemoFactory createDemoFactory()
+  {
+    return new DemoFactory()
+    {
+      public JComponent createDemo()
+      {
+        return new HtmlDemo();
+      }
+    };
+  }
+}
+



From MAILER-DAEMON Fri Jun 09 09:09:20 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fogjo-0007i2-8z
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 09:09:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fogjm-0007gu-JU
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 09:09:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fogjm-0007gi-AW
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 09:09:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fogjl-0007gf-Tb
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 09:09:17 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fogro-0002xi-Uu
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 09:17:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fogjk-0000zG-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 09:09:16 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1Fogjj-0000zD-EF
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 13:09:16 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fogjj-0000zD-EF@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Fri, 09 Jun 2006 13:09:15 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/datatransfer/DataF...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 13:09:18 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/09 13:09:15

Modified files:
	.              : ChangeLog 
	java/awt/datatransfer: DataFlavor.java 
	java/awt/dnd   : DropTargetContext.java DropTargetDropEvent.java 

Log message:
	2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
	
		* java/awt/datatransfer/DataFlavor.java
		(readExternal): Mark as stub,
		(writeExternal): Likewise,
		* java/awt/dnd/DropTargetContext.java
		(dropComplete): Mark as stub,
		(acceptDrag): Likewise,
		(rejectDrag): Likewise,
		(acceptDrop): Likewise,
		(rejectDrop): Likewise,
		(getCurrentDataFlavors): Likewise,
		(getTransferable): Likewise,
		* java/awt/dnd/DropTargetDropEvent.java
		(dropComplete): Mark as stub.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7734&r2=1.7735
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/datatransfer/DataFlavor.java?cvsroot=classpath&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/dnd/DropTargetContext.java?cvsroot=classpath&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/dnd/DropTargetDropEvent.java?cvsroot=classpath&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7734
retrieving revision 1.7735
diff -u -b -r1.7734 -r1.7735
--- ChangeLog	9 Jun 2006 12:51:22 -0000	1.7734
+++ ChangeLog	9 Jun 2006 13:09:14 -0000	1.7735
@@ -1,3 +1,19 @@
+2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* java/awt/datatransfer/DataFlavor.java
+	(readExternal): Mark as stub,
+	(writeExternal): Likewise,
+	* java/awt/dnd/DropTargetContext.java
+	(dropComplete): Mark as stub,
+	(acceptDrag): Likewise,
+	(rejectDrag): Likewise,
+	(acceptDrop): Likewise,
+	(rejectDrop): Likewise,
+	(getCurrentDataFlavors): Likewise,
+	(getTransferable): Likewise,
+	* java/awt/dnd/DropTargetDropEvent.java
+	(dropComplete): Mark as stub.
+
 2006-06-09  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	* gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java

Index: java/awt/datatransfer/DataFlavor.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/datatransfer/DataFlavor.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- java/awt/datatransfer/DataFlavor.java	18 Feb 2006 10:25:39 -0000	1.29
+++ java/awt/datatransfer/DataFlavor.java	9 Jun 2006 13:09:14 -0000	1.30
@@ -38,6 +38,8 @@
 
 package java.awt.datatransfer;
 
+import gnu.classpath.NotImplementedException;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -785,7 +787,8 @@
    *
    * @exception IOException If an error occurs.
    */
-  public void writeExternal(ObjectOutput stream) throws IOException
+  public void writeExternal(ObjectOutput stream) 
+    throws IOException, NotImplementedException
   {
     // FIXME: Implement me
   }
@@ -801,7 +804,7 @@
    * cannot be found.
    */
   public void readExternal(ObjectInput stream) 
-    throws IOException, ClassNotFoundException
+    throws IOException, ClassNotFoundException, NotImplementedException
   {
     // FIXME: Implement me
   }

Index: java/awt/dnd/DropTargetContext.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/dnd/DropTargetContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- java/awt/dnd/DropTargetContext.java	16 Mar 2006 00:50:23 -0000	1.10
+++ java/awt/dnd/DropTargetContext.java	9 Jun 2006 13:09:15 -0000	1.11
@@ -1,5 +1,5 @@
 /* DropTargetContext.java --
-   Copyright (C) 2002, 2003, 2004  Free Software Foundation
+   Copyright (C) 2002, 2003, 2004, 2006,  Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -37,6 +37,8 @@
 
 package java.awt.dnd;
 
+import gnu.classpath.NotImplementedException;
+
 import java.awt.Component;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
@@ -59,23 +61,23 @@
     protected boolean isLocal;
     protected Transferable transferable;
 
-    TransferableProxy (Transferable t, boolean local)
+    TransferableProxy(Transferable t, boolean local)
     {
       this.transferable = t;
       this.isLocal = local;
     }
     
-    public DataFlavor[] getTransferDataFlavors ()
+    public DataFlavor[] getTransferDataFlavors()
     {
-      return transferable.getTransferDataFlavors ();
+      return transferable.getTransferDataFlavors();
     }
 
-    public boolean isDataFlavorSupported (DataFlavor flavor)
+    public boolean isDataFlavorSupported(DataFlavor flavor)
     {
-      return transferable.isDataFlavorSupported (flavor);
+      return transferable.isDataFlavorSupported(flavor);
     }
 
-    public Object getTransferData (DataFlavor flavor)
+    public Object getTransferData(DataFlavor flavor)
       throws UnsupportedFlavorException, IOException
     {
       return transferable.getTransferData (flavor);
@@ -87,32 +89,32 @@
   private java.awt.dnd.peer.DropTargetContextPeer dtcp;
 
   // package private
-  DropTargetContext (DropTarget dropTarget)
+  DropTargetContext(DropTarget dropTarget)
   {
     this.dropTarget = dropTarget;
   }
 
-  public DropTarget getDropTarget ()
+  public DropTarget getDropTarget()
   {
     return dropTarget;
   }
 
-  public Component getComponent ()
+  public Component getComponent()
   {
-    return dropTarget.getComponent ();
+    return dropTarget.getComponent();
   }
 
-  public void addNotify (java.awt.dnd.peer.DropTargetContextPeer dtcp)
+  public void addNotify(java.awt.dnd.peer.DropTargetContextPeer dtcp)
   {
     this.dtcp = dtcp;
   }
 
-  public void removeNotify ()
+  public void removeNotify()
   {
     this.dtcp = null;
   }
 
-  protected void setTargetActions (int actions)
+  protected void setTargetActions(int actions)
   {
     targetActions = actions;
   }
@@ -127,45 +129,51 @@
    *
    * @exception InvalidDnDOperationException If a drop is not outstanding.
    */
-  public void dropComplete (boolean success)
+  public void dropComplete(boolean success)
+    throws NotImplementedException
   {
     // FIXME: implement this
   }
 
-  protected void acceptDrag (int dragOperation)
+  protected void acceptDrag(int dragOperation)
+    throws NotImplementedException
   {
     // FIXME: implement this
   }
 
-  protected void rejectDrag ()
+  protected void rejectDrag()
+    throws NotImplementedException
   {
     // FIXME: implement this
   }
 
-  protected void acceptDrop (int dropOperation)
+  protected void acceptDrop(int dropOperation)
+    throws NotImplementedException
   {
     // FIXME: implement this
   }
 
-  protected void rejectDrop ()
+  protected void rejectDrop()
+    throws NotImplementedException
   {
     // FIXME: implement this
   }
 
-  protected DataFlavor[] getCurrentDataFlavors ()
+  protected DataFlavor[] getCurrentDataFlavors()
+    throws NotImplementedException
   {
     // FIXME: implement this
     return null;
   }
 
-  protected List getCurrentDataFlavorsAsList ()
+  protected List getCurrentDataFlavorsAsList()
   {
-    return Arrays.asList (getCurrentDataFlavors ());
+    return Arrays.asList(getCurrentDataFlavors());
   }
 
-  protected boolean isDataFlavorSupported (DataFlavor flavor)
+  protected boolean isDataFlavorSupported(DataFlavor flavor)
   {
-    return getCurrentDataFlavorsAsList ().contains (flavor);
+    return getCurrentDataFlavorsAsList().contains(flavor);
   }
 
   /**
@@ -173,7 +181,8 @@
    *
    * @exception InvalidDnDOperationException If a drag is not outstanding.
    */
-  protected Transferable getTransferable() throws InvalidDnDOperationException
+  protected Transferable getTransferable() 
+    throws InvalidDnDOperationException, NotImplementedException
   {
     // FIXME: implement this
     return null;
@@ -181,6 +190,6 @@
 
   protected Transferable createTransferableProxy(Transferable t, boolean local)
   {
-    return new TransferableProxy (t, local);
+    return new TransferableProxy(t, local);
   }
 } // class DropTargetContext

Index: java/awt/dnd/DropTargetDropEvent.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/dnd/DropTargetDropEvent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- java/awt/dnd/DropTargetDropEvent.java	2 Jul 2005 20:32:26 -0000	1.3
+++ java/awt/dnd/DropTargetDropEvent.java	9 Jun 2006 13:09:15 -0000	1.4
@@ -37,6 +37,8 @@
 
 package java.awt.dnd;
 
+import gnu.classpath.NotImplementedException;
+
 import java.awt.Point;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
@@ -65,10 +67,10 @@
    * actions is not a bitwise mask of DnDConstants, or dtc is null.
    * @exception NullPointerException If location is null.
    */
-  public DropTargetDropEvent (DropTargetContext dtc, Point location,
+  public DropTargetDropEvent(DropTargetContext dtc, Point location,
                               int dropAction, int actions)
   {
-    this (dtc, location, dropAction, actions, false);
+    this(dtc, location, dropAction, actions, false);
   }
 
   /**
@@ -78,16 +80,16 @@
    * actions is not a bitwise mask of DnDConstants, or dtc is null.
    * @exception NullPointerException If location is null.
    */
-  public DropTargetDropEvent (DropTargetContext dtc, Point location,
+  public DropTargetDropEvent(DropTargetContext dtc, Point location,
                               int dropAction, int actions, boolean isLocalTx)
   {
-    super (dtc);
+    super(dtc);
 
     if (location == null)
-      throw new NullPointerException ();
+      throw new NullPointerException();
 
     if (dtc == null)
-      throw new IllegalArgumentException ();
+      throw new IllegalArgumentException();
 
     if (dropAction != DnDConstants.ACTION_NONE
         && dropAction != DnDConstants.ACTION_COPY
@@ -95,7 +97,7 @@
         && dropAction != DnDConstants.ACTION_COPY_OR_MOVE
         && dropAction != DnDConstants.ACTION_LINK
         && dropAction != DnDConstants.ACTION_REFERENCE)
-      throw new IllegalArgumentException ();
+      throw new IllegalArgumentException();
 
     int actionsMask = DnDConstants.ACTION_NONE
                       | DnDConstants.ACTION_COPY
@@ -105,7 +107,7 @@
                       | DnDConstants.ACTION_REFERENCE;
     
     if (~(actions ^ actionsMask) != 0)
-      throw new IllegalArgumentException ();
+      throw new IllegalArgumentException();
     
     this.dropAction = dropAction;
     this.actions = actions;
@@ -113,52 +115,53 @@
     this.isLocalTx = isLocalTx;
   }
   
-  public Point getLocation ()
+  public Point getLocation()
   {
     return location;
   }
 
-  public DataFlavor[] getCurrentDataFlavors ()
+  public DataFlavor[] getCurrentDataFlavors()
   {
-    return context.getCurrentDataFlavors ();
+    return context.getCurrentDataFlavors();
   }
 
-  public List getCurrentDataFlavorsAsList ()
+  public List getCurrentDataFlavorsAsList()
   {
-    return context.getCurrentDataFlavorsAsList ();
+    return context.getCurrentDataFlavorsAsList();
   }
 
-  public boolean isDataFlavorSupported (DataFlavor flavor)
+  public boolean isDataFlavorSupported(DataFlavor flavor)
   {
-    return context.isDataFlavorSupported (flavor);
+    return context.isDataFlavorSupported(flavor);
   }
 
-  public int getSourceActions ()
+  public int getSourceActions()
   {
     return actions;
   }
 
-  public int getDropAction ()
+  public int getDropAction()
   {
     return dropAction;
   }
 
-  public Transferable getTransferable ()
+  public Transferable getTransferable()
   {
     return context.getTransferable ();
   }
 
-  public void acceptDrop (int dropAction)
+  public void acceptDrop(int dropAction)
   {
-    context.acceptDrop (dropAction);
+    context.acceptDrop(dropAction);
   }
 
-  public void rejectDrop ()
+  public void rejectDrop()
   {
-    context.rejectDrop ();
+    context.rejectDrop();
   }
 
-  public void dropComplete (boolean success)
+  public void dropComplete(boolean success)
+    throws NotImplementedException
   {
     // FIXME: implement this
   }



From MAILER-DAEMON Fri Jun 09 10:08:55 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FohfT-0000mT-JR
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 10:08:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FohfS-0000m5-3V
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 10:08:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FohfQ-0000kx-LJ
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 10:08:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FohfQ-0000ku-Fo
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 10:08:52 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FohnR-0007tb-8N
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 10:17:10 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FohfE-0002yv-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 10:08:40 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FohfE-0002yr-2I
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 14:08:40 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FohfE-0002yr-2I@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Fri, 09 Jun 2006 14:08:40 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 14:08:54 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/09 14:08:39

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicComboBoxRenderer.java 

Log message:
	2006-06-09  Francis Kung  <fkung@redhat.com>
	
	        * javax/swing/plaf/basic/BasicComboBoxRenderer.java:
	        (getPreferredSize): Return correct height for null or empty
	        items.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7735&r2=1.7736
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java?cvsroot=classpath&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7735
retrieving revision 1.7736
diff -u -b -r1.7735 -r1.7736
--- ChangeLog	9 Jun 2006 13:09:14 -0000	1.7735
+++ ChangeLog	9 Jun 2006 14:08:38 -0000	1.7736
@@ -1,3 +1,9 @@
+2006-06-09  Francis Kung  <fkung@redhat.com>
+
+	* javax/swing/plaf/basic/BasicComboBoxRenderer.java:
+	(getPreferredSize): Return correct height for null or empty 
+	items.
+
 2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* java/awt/datatransfer/DataFlavor.java

Index: javax/swing/plaf/basic/BasicComboBoxRenderer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- javax/swing/plaf/basic/BasicComboBoxRenderer.java	17 Mar 2006 15:18:24 -0000	1.9
+++ javax/swing/plaf/basic/BasicComboBoxRenderer.java	9 Jun 2006 14:08:39 -0000	1.10
@@ -80,7 +80,19 @@
    */
   public Dimension getPreferredSize()
   {
+    if (this.getText() != null && ! this.getText().equals(""))
     return super.getPreferredSize();
+    else
+      {
+        // If the combo box option's text is empty or null, it won't size
+        // properly (ie, it'll be way too short)... so we throw in a dummy
+        // space to trick the superclass's sizing methods.
+        String oldText = this.getText();
+        this.setText(" ");
+        Dimension d = super.getPreferredSize();
+        this.setText(oldText);
+        return d;
+      }
   }
 
   /**



From MAILER-DAEMON Fri Jun 09 10:53:40 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoiMm-0006cM-7m
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 10:53:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoiMk-0006aV-3N
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 10:53:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoiMj-0006a0-OL
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 10:53:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoiMj-0006Zl-Fv
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 10:53:37 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoiUn-0003Oe-I0
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 11:01:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoiMi-0004zD-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 10:53:36 -0400
Received: from fitzsim by savannah.gnu.org with local (Exim 4.50)
	id 1FoiMh-0004zA-2U
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 14:53:36 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoiMh-0004zA-2U@savannah.gnu.org>
From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Fri, 09 Jun 2006 14:53:35 +0000
Subject: [commit-cp] classpath ChangeLog native/plugin/gcjwebplugin.cc
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 14:53:38 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Thomas Fitzsimmons <fitzsim>	06/06/09 14:53:34

Modified files:
	.              : ChangeLog 
	native/plugin  : gcjwebplugin.cc 

Log message:
	2006-06-09  Thomas Fitzsimmons  <fitzsim@redhat.com>
	
		* native/plugin/gcjwebplugin.cc (PLUGIN_ERROR_THREE): New macro.
		(NP_Initialize): Use PLUGIN_ERROR_THREE in place of g_strconcat.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7736&r2=1.7737
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/gcjwebplugin.cc?cvsroot=classpath&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7736
retrieving revision 1.7737
diff -u -b -r1.7736 -r1.7737
--- ChangeLog	9 Jun 2006 14:08:38 -0000	1.7736
+++ ChangeLog	9 Jun 2006 14:53:33 -0000	1.7737
@@ -1,3 +1,8 @@
+2006-06-09  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* native/plugin/gcjwebplugin.cc (PLUGIN_ERROR_THREE): New macro.
+	(NP_Initialize): Use PLUGIN_ERROR_THREE in place of g_strconcat.
+
 2006-06-09  Francis Kung  <fkung@redhat.com>
 
 	* javax/swing/plaf/basic/BasicComboBoxRenderer.java:

Index: native/plugin/gcjwebplugin.cc
===================================================================
RCS file: /sources/classpath/classpath/native/plugin/gcjwebplugin.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- native/plugin/gcjwebplugin.cc	8 Jun 2006 21:49:11 -0000	1.10
+++ native/plugin/gcjwebplugin.cc	9 Jun 2006 14:53:34 -0000	1.11
@@ -79,6 +79,10 @@
   g_printerr ("%s:%d: thread %p: Error: %s: %s\n", __FILE__, __LINE__,  \
               g_thread_self (), first, second)
 
+#define PLUGIN_ERROR_THREE(first, second, third)                        \
+  g_printerr ("%s:%d: thread %p: Error: %s: %s: %s\n", __FILE__,        \
+              __LINE__, g_thread_self (), first, second, third)
+
 // Plugin information passed to about:plugins.
 #define PLUGIN_NAME "GCJ Web Browser Plugin"
 #define PLUGIN_DESC "The " PLUGIN_NAME " executes Java applets."
@@ -1621,8 +1625,8 @@
       file_error = g_mkdir (data_directory, 0700);
       if (file_error != 0)
         {
-          PLUGIN_ERROR_TWO (g_strconcat("Failed to create data directory ", 
-                            data_directory, NULL),
+          PLUGIN_ERROR_THREE ("Failed to create data directory",
+                              data_directory,
                             strerror (errno));
           return NPERR_GENERIC_ERROR;
         }
@@ -1635,15 +1639,15 @@
     {
       if (channel_error)
         {
-          PLUGIN_ERROR_TWO (g_strconcat("Failed to open whitelist file ",
-                            whitelist_filename, NULL),
+          PLUGIN_ERROR_THREE ("Failed to open whitelist file",
+                              whitelist_filename,
                             channel_error->message);
           g_error_free (channel_error);
           channel_error = NULL;
         }
       else
-        PLUGIN_ERROR (g_strconcat("Failed to open whitelist file ",
-                      whitelist_filename, NULL));
+        PLUGIN_ERROR_TWO ("Failed to open whitelist file",
+                          whitelist_filename);
                       
       return NPERR_GENERIC_ERROR;
     }



From MAILER-DAEMON Fri Jun 09 11:01:02 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoiTu-0001re-3N
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 11:01:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoiTs-0001qv-27
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 11:01:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoiTr-0001qi-P7
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 11:00:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoiTr-0001qf-H7
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 11:00:59 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Foibv-0003wv-Iw
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 11:09:19 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoiTp-00055o-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 11:00:57 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FoiTp-00055j-92
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 15:00:57 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoiTp-00055j-92@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Fri, 09 Jun 2006 15:00:57 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/image/BufferedImag...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 15:01:00 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/09 15:00:57

Modified files:
	.              : ChangeLog 
	java/awt/image : BufferedImage.java 

Log message:
	2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
	
		* java/awt/image/BufferedImage.java
		(BufferedImage(int, int, int)): Added API docs,
		(getProperty(String)): Return correct value for undefined properties,
		(getPropertyNames()): Added comments and removed FIXME.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7737&r2=1.7738
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/image/BufferedImage.java?cvsroot=classpath&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7737
retrieving revision 1.7738
diff -u -b -r1.7737 -r1.7738
--- ChangeLog	9 Jun 2006 14:53:33 -0000	1.7737
+++ ChangeLog	9 Jun 2006 15:00:56 -0000	1.7738
@@ -1,3 +1,10 @@
+2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* java/awt/image/BufferedImage.java
+	(BufferedImage(int, int, int)): Added API docs,
+	(getProperty(String)): Return correct value for undefined properties,
+	(getPropertyNames()): Added comments and removed FIXME.
+
 2006-06-09  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* native/plugin/gcjwebplugin.cc (PLUGIN_ERROR_THREE): New macro.

Index: java/awt/image/BufferedImage.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/image/BufferedImage.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- java/awt/image/BufferedImage.java	6 Jun 2006 07:53:41 -0000	1.14
+++ java/awt/image/BufferedImage.java	9 Jun 2006 15:00:57 -0000	1.15
@@ -1,5 +1,5 @@
 /* BufferedImage.java --
-   Copyright (C) 2000, 2002, 2003, 2004, 2005  Free Software Foundation
+   Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006,  Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -99,6 +99,13 @@
 
   Vector observers;
   
+  /**
+   * Creates a new buffered image.
+   * 
+   * @param w  the width.
+   * @param h  the height.
+   * @param type  the image type (see the constants defined by this class).
+   */
   public BufferedImage(int w, int h, int type)
   {
     ColorModel cm = null;
@@ -363,11 +370,28 @@
 	return 1;
   }
 
+  /**
+   * Returns the value of the specified property, or 
+   * {@link Image#UndefinedProperty} if the property is not defined.
+   * 
+   * @param string  the property key (<code>null</code> not permitted).
+   * 
+   * @return The property value.
+   * 
+   * @throws NullPointerException if <code>string</code> is <code>null</code>.
+   */
   public Object getProperty(String string)
   {
-    if (properties == null)
-      return null;
-    return properties.get(string);
+    if (string == null)
+      throw new NullPointerException("The property name cannot be null.");
+    Object result = Image.UndefinedProperty;
+    if (properties != null)
+      {
+        Object v = properties.get(string);
+        if (v != null)
+          result = v;
+      }
+    return result;
   }
 
   public Object getProperty(String string, ImageObserver imageobserver)
@@ -375,10 +399,15 @@
     return getProperty(string);
   }
 
-  
+  /**
+   * Returns <code>null</code> always.
+   * 
+   * @return <code>null</code> always.
+   */
   public String[] getPropertyNames()
   {
-    // FIXME: implement
+    // This method should always return null, see:
+    // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4640609
     return null;
   }
 



From MAILER-DAEMON Fri Jun 09 12:04:29 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FojTJ-0001xP-17
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 12:04:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FojTG-0001wa-Mg
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:04:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FojTF-0001vr-5n
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:04:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FojTE-0001vh-ON
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:04:24 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FojbJ-0005Bo-B3
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:12:45 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FojTD-0007j9-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 12:04:23 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FojTB-0007j6-TN
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:04:23 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FojTB-0007j6-TN@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Fri, 09 Jun 2006 16:04:21 +0000
Subject: [commit-cp] classpath/gnu/java/awt/peer/gtk CairoGraphics2D...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 16:04:27 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/09 16:04:21

Modified files:
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 
	.              : ChangeLog 

Log message:
	2006-06-08  Roman Kennke  <kennke@aicas.com>
	
		* gnu/java/awt/peer/gtk/CairoGraphics2D.java
		(drawGlyphVector): Added fallback for non-FreetypeGlyphVector
		implementations.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7738&r2=1.7739

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7738
retrieving revision 1.7739
diff -u -b -r1.7738 -r1.7739
--- ChangeLog	9 Jun 2006 15:00:56 -0000	1.7738
+++ ChangeLog	9 Jun 2006 16:04:21 -0000	1.7739
@@ -1,3 +1,9 @@
+2006-06-08  Roman Kennke  <kennke@aicas.com>
+
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
+	(drawGlyphVector): Added fallback for non-FreetypeGlyphVector
+	implementations.
+
 2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* java/awt/image/BufferedImage.java



From MAILER-DAEMON Fri Jun 09 12:16:41 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fojf7-000191-AF
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 12:16:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fojf5-00018V-W2
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:16:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fojf2-00015W-OV
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:16:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fojf2-00015T-Lc
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:16:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fojn7-0006Mt-Kd
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:24:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fojf2-0007s9-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 12:16:36 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fojf1-0007s6-MZ
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:16:36 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fojf1-0007s6-MZ@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 09 Jun 2006 16:16:35 +0000
Subject: [commit-cp] classpath ChangeLog native/fdlibm/dtoa.c native...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 16:16:40 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/09 16:16:35

Modified files:
	.              : ChangeLog 
	native/fdlibm  : dtoa.c mprec.c mprec.h 

Log message:
		PR classpath/23863:
		* native/fdlibm/dtoa.c (_dtoa): Free contents of _Jv_reent when
		finished.
		* native/fdlibm/mprec.c: New version from newlib.  Commented out
		some includes.  Added <assert.h>.
		(_reent, _Bigint): New defines.
		(_REENT_CHECK_MP, _REENT_MP_FREELIST, _REENT_MP_P5S): Likewise.
		(__ULong, __Long): New types.
		(_calloc_r): New function.
		(Balloc): Dynamically add new _freelist entries as needed.
		* native/fdlibm/mprec.h (struct _Jv_Bigint): Don't use
		MAX_BIGNUMS to size _x[].
		(struct _Jv_reent): _freelist now a _Jv_Bigint**.  Removed
		_allocation_map, num.  Added _max_k.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7739&r2=1.7740
http://cvs.savannah.gnu.org/viewcvs/classpath/native/fdlibm/dtoa.c?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/native/fdlibm/mprec.c?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/native/fdlibm/mprec.h?cvsroot=classpath&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7739
retrieving revision 1.7740
diff -u -b -r1.7739 -r1.7740
--- ChangeLog	9 Jun 2006 16:04:21 -0000	1.7739
+++ ChangeLog	9 Jun 2006 16:16:34 -0000	1.7740
@@ -1,3 +1,20 @@
+2006-06-09  Tom Tromey  <tromey@redhat.com>
+
+	PR classpath/23863:
+	* native/fdlibm/dtoa.c (_dtoa): Free contents of _Jv_reent when
+	finished.
+	* native/fdlibm/mprec.c: New version from newlib.  Commented out
+	some includes.  Added <assert.h>.
+	(_reent, _Bigint): New defines.
+	(_REENT_CHECK_MP, _REENT_MP_FREELIST, _REENT_MP_P5S): Likewise.
+	(__ULong, __Long): New types.
+	(_calloc_r): New function.
+	(Balloc): Dynamically add new _freelist entries as needed.
+	* native/fdlibm/mprec.h (struct _Jv_Bigint): Don't use
+	MAX_BIGNUMS to size _x[].
+	(struct _Jv_reent): _freelist now a _Jv_Bigint**.  Removed
+	_allocation_map, num.  Added _max_k.
+
 2006-06-08  Roman Kennke  <kennke@aicas.com>
 
 	* gnu/java/awt/peer/gtk/CairoGraphics2D.java

Index: native/fdlibm/dtoa.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/fdlibm/dtoa.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- native/fdlibm/dtoa.c	5 Mar 2005 14:46:53 -0000	1.4
+++ native/fdlibm/dtoa.c	9 Jun 2006 16:16:35 -0000	1.5
@@ -2,7 +2,7 @@
  *
  * The author of this software is David M. Gay.
  *
- * Copyright (c) 1991 by AT&T.
+ * Copyright (c) 1991, 2006 by AT&T.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose without fee is hereby granted, provided that this entire notice
@@ -897,10 +897,23 @@
 {
   struct _Jv_reent reent;
   char *p;
+  int i;
+
   memset (&reent, 0, sizeof reent);
 
   p = _dtoa_r (&reent, _d, mode, ndigits, decpt, sign, rve, float_type);
   strcpy (buf, p);
 
-  return;
+  for (i = 0; i < reent._result_k; ++i)
+    {
+      struct _Jv_Bigint *l = reent._freelist[i];
+      while (l)
+	{
+	  struct _Jv_Bigint *next = l->_next;
+	  free (l);
+	  l = next;
+	}
+    }
+  if (reent._freelist)
+    free (reent._freelist);
 }

Index: native/fdlibm/mprec.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/fdlibm/mprec.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- native/fdlibm/mprec.c	12 Jan 2006 09:26:49 -0000	1.7
+++ native/fdlibm/mprec.c	9 Jun 2006 16:16:35 -0000	1.8
@@ -80,72 +80,112 @@
  *	down depends on the machine and the number being converted.
  */
 
+/*#include <_ansi.h>*/
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+/* #include <reent.h> */
 #include "mprec.h"
 
 /* reent.c knows this value */
-#define _Kmax 15
-#include <stdio.h>
+/* #define _Kmax 15 */
 
-_Jv_Bigint *
-_DEFUN (Balloc, (ptr, k), struct _Jv_reent *ptr _AND int k)
-{
-  _Jv_Bigint *rv = NULL;
+#define _reent _Jv_reent
+#define _Bigint _Jv_Bigint
 
-  int i = 0;
-  int j = 1;
+#define _REENT_CHECK_MP(x)
+#define _REENT_MP_FREELIST(x) ((x)->_freelist)
+#define _REENT_MP_P5S(x) ((x)->_p5s)
 
-  /* FIXME - assert disabled because of PR classpath/23863
-   * assert ((1 << k) < MAX_BIGNUM_WDS);
-   */
+typedef unsigned long __ULong;
+typedef long __Long;
 
-  while ((ptr->_allocation_map & j) && i < MAX_BIGNUMS)
-    i++, j <<= 1;
+static void *
+_calloc_r (void *ignore, size_t x1, size_t x2)
+{
+  char *result = (char *) malloc (x1 * x2);
+  memset (result, 0, x1 * x2);
+  return result;
+}
 
-  assert (i < MAX_BIGNUMS);
+_Bigint *
+_DEFUN (Balloc, (ptr, k), struct _reent *ptr _AND int k)
+{
+  int x;
+  _Bigint *rv ;
+  int new_k = k + 1;
 
-  if (i >= MAX_BIGNUMS) 
+  _REENT_CHECK_MP(ptr);
+  if (_REENT_MP_FREELIST(ptr) == NULL)
+    {
+      /* Allocate a list of pointers to the mprec objects */
+      _REENT_MP_FREELIST(ptr) = (struct _Bigint **) _calloc_r (ptr, 
+						      sizeof (struct _Bigint *),
+							       new_k);
+      if (_REENT_MP_FREELIST(ptr) == NULL)
+	{
     return NULL;
+	}
+      ptr->_max_k = new_k;
+    }
+  else if (new_k > ptr->_max_k)
+    {
+      struct _Bigint **new_list
+	= (struct _Bigint **) realloc (ptr->_freelist,
+				       new_k * sizeof (struct _Bigint *));
+      memset (&new_list[ptr->_max_k], 0,
+	      (new_k - ptr->_max_k) * sizeof (struct _Bigint *));
+      ptr->_freelist = new_list;
+      ptr->_max_k = new_k;
 
-  ptr->_allocation_map |= j;
-  rv = &ptr->_freelist[i];
+    }
       
-  rv->_k = k;
-  rv->_maxwds = 32;
+  assert (k <= ptr->_max_k);
 
+  if ((rv = _REENT_MP_FREELIST(ptr)[k]) != 0)
+    {
+      _REENT_MP_FREELIST(ptr)[k] = rv->_next;
+    }
+  else
+    {
+      x = 1 << k;
+      /* Allocate an mprec Bigint and stick in in the freelist */
+      rv = (_Bigint *) _calloc_r (ptr,
+				  1,
+				  sizeof (_Bigint) +
+				  (x-1) * sizeof(rv->_x));
+      if (rv == NULL) return NULL;
+      rv->_k = k;
+      rv->_maxwds = x;
+    }
+  rv->_sign = rv->_wds = 0;
   return rv;
 }
 
-
 void
-_DEFUN (Bfree, (ptr, v), struct _Jv_reent *ptr _AND _Jv_Bigint * v)
+_DEFUN (Bfree, (ptr, v), struct _reent *ptr _AND _Bigint * v)
 {
-  long i;
-
-  i = v - ptr->_freelist;
-
-  assert (i >= 0 && i < MAX_BIGNUMS);
-
-  if (i >= 0 && i < MAX_BIGNUMS)
-    ptr->_allocation_map &= ~ (1 << i);
+  _REENT_CHECK_MP(ptr);
+  if (v)
+    {
+      v->_next = _REENT_MP_FREELIST(ptr)[v->_k];
+      _REENT_MP_FREELIST(ptr)[v->_k] = v;
+    }
 }
 
-
-_Jv_Bigint *
+_Bigint *
 _DEFUN (multadd, (ptr, b, m, a),
-	struct _Jv_reent *ptr _AND
-	_Jv_Bigint * b _AND
+	struct _reent *ptr _AND
+	_Bigint * b _AND
 	int m _AND
 	int a)
 {
   int i, wds;
-  unsigned long *x, y;
+  __ULong *x, y;
 #ifdef Pack_32
-  unsigned long xi, z;
+  __ULong xi, z;
 #endif
-  _Jv_Bigint *b1;
+  _Bigint *b1;
 
   wds = b->_wds;
   x = b->_x;
@@ -180,17 +220,17 @@
   return b;
 }
 
-_Jv_Bigint *
+_Bigint *
 _DEFUN (s2b, (ptr, s, nd0, nd, y9),
-	struct _Jv_reent * ptr _AND
+	struct _reent * ptr _AND
 	_CONST char *s _AND
 	int nd0 _AND
 	int nd _AND
-	unsigned long y9)
+	__ULong y9)
 {
-  _Jv_Bigint *b;
+  _Bigint *b;
   int i, k;
-  long x, y;
+  __Long x, y;
 
   x = (nd + 8) / 9;
   for (k = 0, y = 1; x > y; y <<= 1, k++);
@@ -222,7 +262,7 @@
 
 int
 _DEFUN (hi0bits,
-	(x), register unsigned long x)
+	(x), register __ULong x)
 {
   register int k = 0;
 
@@ -256,10 +296,10 @@
 }
 
 int
-_DEFUN (lo0bits, (y), unsigned long *y)
+_DEFUN (lo0bits, (y), __ULong *y)
 {
   register int k;
-  register unsigned long x = *y;
+  register __ULong x = *y;
 
   if (x & 7)
     {
@@ -298,17 +338,17 @@
     {
       k++;
       x >>= 1;
-      if (!(x & 1))
+      if (!x & 1)
 	return 32;
     }
   *y = x;
   return k;
 }
 
-_Jv_Bigint *
-_DEFUN (i2b, (ptr, i), struct _Jv_reent * ptr _AND int i)
+_Bigint *
+_DEFUN (i2b, (ptr, i), struct _reent * ptr _AND int i)
 {
-  _Jv_Bigint *b;
+  _Bigint *b;
 
   b = Balloc (ptr, 1);
   b->_x[0] = i;
@@ -316,15 +356,15 @@
   return b;
 }
 
-_Jv_Bigint *
-_DEFUN (mult, (ptr, a, b), struct _Jv_reent * ptr _AND _Jv_Bigint * a _AND _Jv_Bigint * b)
+_Bigint *
+_DEFUN (mult, (ptr, a, b), struct _reent * ptr _AND _Bigint * a _AND _Bigint * b)
 {
-  _Jv_Bigint *c;
+  _Bigint *c;
   int k, wa, wb, wc;
-  unsigned long carry, y, z;
-  unsigned long *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
+  __ULong carry, y, z;
+  __ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
 #ifdef Pack_32
-  unsigned long z2;
+  __ULong z2;
 #endif
 
   if (a->_wds < b->_wds)
@@ -350,7 +390,7 @@
 #ifdef Pack_32
   for (; xb < xbe; xb++, xc0++)
     {
-      if ((y = *xb & 0xffff))
+      if ((y = *xb & 0xffff) != 0)
 	{
 	  x = xa;
 	  xc = xc0;
@@ -366,7 +406,7 @@
 	  while (x < xae);
 	  *xc = carry;
 	}
-      if ((y = *xb >> 16))
+      if ((y = *xb >> 16) != 0)
 	{
 	  x = xa;
 	  xc = xc0;
@@ -387,7 +427,7 @@
 #else
   for (; xb < xbe; xc0++)
     {
-      if ((y = *xb++))
+      if (y = *xb++)
 	{
 	  x = xa;
 	  xc = xc0;
@@ -408,23 +448,24 @@
   return c;
 }
 
-_Jv_Bigint *
+_Bigint *
 _DEFUN (pow5mult,
-	(ptr, b, k), struct _Jv_reent * ptr _AND _Jv_Bigint * b _AND int k)
+	(ptr, b, k), struct _reent * ptr _AND _Bigint * b _AND int k)
 {
-  _Jv_Bigint *b1, *p5, *p51;
+  _Bigint *b1, *p5, *p51;
   int i;
   static _CONST int p05[3] = {5, 25, 125};
 
-  if ((i = k & 3))
+  if ((i = k & 3) != 0)
     b = multadd (ptr, b, p05[i - 1], 0);
 
   if (!(k >>= 2))
     return b;
-  if (!(p5 = ptr->_p5s))
+  _REENT_CHECK_MP(ptr);
+  if (!(p5 = _REENT_MP_P5S(ptr)))
     {
       /* first time */
-      p5 = ptr->_p5s = i2b (ptr, 625);
+      p5 = _REENT_MP_P5S(ptr) = i2b (ptr, 625);
       p5->_next = 0;
     }
   for (;;)
@@ -447,12 +488,12 @@
   return b;
 }
 
-_Jv_Bigint *
-_DEFUN (lshift, (ptr, b, k), struct _Jv_reent * ptr _AND _Jv_Bigint * b _AND int k)
+_Bigint *
+_DEFUN (lshift, (ptr, b, k), struct _reent * ptr _AND _Bigint * b _AND int k)
 {
   int i, k1, n, n1;
-  _Jv_Bigint *b1;
-  unsigned long *x, *x1, *xe, z;
+  _Bigint *b1;
+  __ULong *x, *x1, *xe, z;
 
 #ifdef Pack_32
   n = k >> 5;
@@ -480,7 +521,7 @@
 	  z = *x++ >> k1;
 	}
       while (x < xe);
-      if ((*x1 = z))
+      if ((*x1 = z) != 0)
 	++n1;
     }
 #else
@@ -490,11 +531,11 @@
       z = 0;
       do
 	{
-	  *x1++ = (*x << k & 0xffff) | z;
+	  *x1++ = *x << k & 0xffff | z;
 	  z = *x++ >> k1;
 	}
       while (x < xe);
-      if ((*x1 = z))
+      if (*x1 = z)
 	++n1;
     }
 #endif
@@ -508,9 +549,9 @@
 }
 
 int
-_DEFUN (cmp, (a, b), _Jv_Bigint * a _AND _Jv_Bigint * b)
+_DEFUN (cmp, (a, b), _Bigint * a _AND _Bigint * b)
 {
-  unsigned long *xa, *xa0, *xb, *xb0;
+  __ULong *xa, *xa0, *xb, *xb0;
   int i, j;
 
   i = a->_wds;
@@ -537,16 +578,16 @@
   return 0;
 }
 
-_Jv_Bigint *
-_DEFUN (diff, (ptr, a, b), struct _Jv_reent * ptr _AND
-	_Jv_Bigint * a _AND _Jv_Bigint * b)
+_Bigint *
+_DEFUN (diff, (ptr, a, b), struct _reent * ptr _AND
+	_Bigint * a _AND _Bigint * b)
 {
-  _Jv_Bigint *c;
+  _Bigint *c;
   int i, wa, wb;
-  long borrow, y;		/* We need signed shifts here. */
-  unsigned long *xa, *xae, *xb, *xbe, *xc;
+  __Long borrow, y;		/* We need signed shifts here. */
+  __ULong *xa, *xae, *xb, *xbe, *xc;
 #ifdef Pack_32
-  long z;
+  __Long z;
 #endif
 
   i = cmp (a, b);
@@ -625,7 +666,7 @@
 _DEFUN (ulp, (_x), double _x)
 {
   union double_union x, a;
-  register long L;
+  register __Long L;
 
   x.d = _x;
 
@@ -669,13 +710,13 @@
 
 double
 _DEFUN (b2d, (a, e),
-	_Jv_Bigint * a _AND int *e)
+	_Bigint * a _AND int *e)
 {
-  unsigned long *xa, *xa0, w, y, z;
+  __ULong *xa, *xa0, w, y, z;
   int k;
   union double_union d;
 #ifdef VAX
-  unsigned long d0, d1;
+  __ULong d0, d1;
 #else
 #define d0 word0(d)
 #define d1 word1(d)
@@ -696,7 +737,7 @@
       d0 = Exp_1 | y >> (Ebits - k);
       w = xa > xa0 ? *--xa : 0;
 #ifndef _DOUBLE_IS_32BITS
-      d1 = y << (32 - Ebits + k) | w >> (Ebits - k);
+      d1 = y << ((32 - Ebits) + k) | w >> (Ebits - k);
 #endif
       goto ret_d;
     }
@@ -720,18 +761,18 @@
   if (k < Ebits + 16)
     {
       z = xa > xa0 ? *--xa : 0;
-      d0 = Exp_1 | y << (k - Ebits) | z >> (Ebits + 16 - k);
+      d0 = Exp_1 | y << k - Ebits | z >> Ebits + 16 - k;
       w = xa > xa0 ? *--xa : 0;
       y = xa > xa0 ? *--xa : 0;
-      d1 = z << (k + 16 - Ebits) | w << (k - Ebits) | y >> (16 + Ebits - k);
+      d1 = z << k + 16 - Ebits | w << k - Ebits | y >> 16 + Ebits - k;
       goto ret_d;
     }
   z = xa > xa0 ? *--xa : 0;
   w = xa > xa0 ? *--xa : 0;
   k -= Ebits + 16;
-  d0 = Exp_1 | y << (k + 16) | z << k | w >> (16 - k);
+  d0 = Exp_1 | y << k + 16 | z << k | w >> 16 - k;
   y = xa > xa0 ? *--xa : 0;
-  d1 = w << (k + 16) | y << k;
+  d1 = w << k + 16 | y << k;
 #endif
 ret_d:
 #ifdef VAX
@@ -744,22 +785,24 @@
   return d.d;
 }
 
-_Jv_Bigint *
+_Bigint *
 _DEFUN (d2b,
 	(ptr, _d, e, bits),
-	struct _Jv_reent * ptr _AND
+	struct _reent * ptr _AND
 	double _d _AND
 	int *e _AND
 	int *bits)
 
 {
   union double_union d;
-  _Jv_Bigint *b;
+  _Bigint *b;
   int de, i, k;
-  unsigned long *x, y, z;
+  __ULong *x, y, z;
 #ifdef VAX
-  unsigned long d0, d1;
+  __ULong d0, d1;
+#endif
   d.d = _d;
+#ifdef VAX
   d0 = word0 (d) >> 16 | word0 (d) << 16;
   d1 = word1 (d) >> 16 | word1 (d) << 16;
 #else
@@ -783,14 +826,16 @@
   z |= Exp_msk11;
 #endif
 #else
-  if ((de = (int) (d0 >> Exp_shift)))
+  if ((de = (int) (d0 >> Exp_shift)) != 0)
     z |= Exp_msk1;
 #endif
 #ifdef Pack_32
 #ifndef _DOUBLE_IS_32BITS
-  if ((y = d1))
+  if (d1)
     {
-      if ((k = lo0bits (&y)))
+      y = d1;
+      k = lo0bits (&y);
+      if (k)
 	{
 	  x[0] = y | z << (32 - k);
 	  z >>= k;
@@ -814,22 +859,24 @@
 #endif
     }
 #else
-  if ((y = d1))
+  if (d1)
     {
-      if ((k = lo0bits (&y)))
+      y = d1;
+      k = lo0bits (&y);
+      if (k)
 	if (k >= 16)
 	  {
-	    x[0] = y | (z << (32 - k) & 0xffff);
-	    x[1] = z >> (k - 16) & 0xffff;
+	    x[0] = y | z << 32 - k & 0xffff;
+	    x[1] = z >> k - 16 & 0xffff;
 	    x[2] = z >> k;
 	    i = 2;
 	  }
 	else
 	  {
 	    x[0] = y & 0xffff;
-	    x[1] = (y >> 16 | z << (16 - k)) & 0xffff;
+	    x[1] = y >> 16 | z << 16 - k & 0xffff;
 	    x[2] = z >> k & 0xffff;
-	    x[3] = z >> (k + 16);
+	    x[3] = z >> k + 16;
 	    i = 3;
 	  }
       else
@@ -894,7 +941,7 @@
 #undef d1
 
 double
-_DEFUN (ratio, (a, b), _Jv_Bigint * a _AND _Jv_Bigint * b)
+_DEFUN (ratio, (a, b), _Bigint * a _AND _Bigint * b)
 
 {
   union double_union da, db;
@@ -958,3 +1005,17 @@
 #endif
 
 
+double
+_DEFUN (_mprec_log10, (dig),
+	int dig)
+{
+  double v = 1.0;
+  if (dig < 24)
+    return tens[dig];
+  while (dig > 0)
+    {
+      v *= 10;
+      dig--;
+    }
+  return v;
+}

Index: native/fdlibm/mprec.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/fdlibm/mprec.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- native/fdlibm/mprec.h	4 Jan 2006 16:37:55 -0000	1.8
+++ native/fdlibm/mprec.h	9 Jun 2006 16:16:35 -0000	1.9
@@ -282,7 +282,7 @@
 {
   struct _Jv_Bigint *_next;
   int _k, _maxwds, _sign, _wds;
-  unsigned long _x[MAX_BIGNUM_WDS];
+  unsigned long _x[1];
 };
 
 
@@ -310,10 +310,8 @@
   int _result_k;
   struct _Jv_Bigint *_p5s;
 
-  struct _Jv_Bigint _freelist[MAX_BIGNUMS];
-  int _allocation_map;
-
-  int num;
+  struct _Jv_Bigint **_freelist;
+  int _max_k;
 };
 
 



From MAILER-DAEMON Fri Jun 09 12:41:19 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fok2x-0005dD-Eo
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 12:41:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fok2v-0005aw-PZ
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:41:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fok2v-0005Zn-1D
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:41:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fok2u-0005ZV-RA
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:41:16 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FokB0-0000Ye-0z
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:49:38 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fok2u-0000zg-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 12:41:16 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fok2t-0000zd-2j
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:41:16 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fok2t-0000zd-2j@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 09 Jun 2006 16:41:15 +0000
Subject: [commit-cp] classpath ChangeLog gnu/javax/security/auth/log...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 16:41:18 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/09 16:41:14

Modified files:
	.              : ChangeLog 
	gnu/javax/security/auth/login: ConfigFileParser.java 

Log message:
		PR classpath/27966:
		* gnu/javax/security/auth/login/ConfigFileParser.java
		(validateClassName): Quote '.' in regexp.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7740&r2=1.7741
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/login/ConfigFileParser.java?cvsroot=classpath&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7740
retrieving revision 1.7741
diff -u -b -r1.7740 -r1.7741
--- ChangeLog	9 Jun 2006 16:16:34 -0000	1.7740
+++ ChangeLog	9 Jun 2006 16:41:14 -0000	1.7741
@@ -1,3 +1,9 @@
+2006-06-09  Kazuya Ujihara  <ujihara@aurora.dti.ne.jp>
+
+	PR classpath/27966:
+	* gnu/javax/security/auth/login/ConfigFileParser.java
+	(validateClassName): Quote '.' in regexp.
+
 2006-06-09  Tom Tromey  <tromey@redhat.com>
 
 	PR classpath/23863:

Index: gnu/javax/security/auth/login/ConfigFileParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/security/auth/login/ConfigFileParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/security/auth/login/ConfigFileParser.java	15 Jan 2006 19:42:53 -0000	1.1
+++ gnu/javax/security/auth/login/ConfigFileParser.java	9 Jun 2006 16:41:14 -0000	1.2
@@ -264,7 +264,7 @@
     if (cn.startsWith(".") || cn.endsWith("."))
       abort("MODULE_CLASS MUST NOT start or end with a '.'");
 
-    String[] tokens = cn.split(".");
+    String[] tokens = cn.split("\\.");
     for (int i = 0; i < tokens.length; i++)
       {
         String t = tokens[i];



From MAILER-DAEMON Fri Jun 09 12:45:01 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fok6X-0002aC-BV
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 12:45:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fok6V-0002ZH-At
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:44:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fok6U-0002Z4-Fp
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:44:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fok6U-0002Yz-Bl
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:44:58 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FokEY-00015w-Vk
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 12:53:19 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fok6T-000123-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 12:44:57 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fok6R-000120-UN
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:44:57 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fok6R-000120-UN@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 09 Jun 2006 16:44:55 +0000
Subject: [commit-cp] classpath ChangeLog tools/.cvsignore
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 16:44:59 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/09 16:44:55

Modified files:
	.              : ChangeLog 
	tools          : .cvsignore 

Log message:
		* tools/.cvsignore: Added .deps.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7741&r2=1.7742
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/.cvsignore?cvsroot=classpath&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7741
retrieving revision 1.7742
diff -u -b -r1.7741 -r1.7742
--- ChangeLog	9 Jun 2006 16:41:14 -0000	1.7741
+++ ChangeLog	9 Jun 2006 16:44:55 -0000	1.7742
@@ -1,3 +1,7 @@
+2006-06-09  Tom Tromey  <tromey@redhat.com>
+
+	* tools/.cvsignore: Added .deps.
+
 2006-06-09  Kazuya Ujihara  <ujihara@aurora.dti.ne.jp>
 
 	PR classpath/27966:

Index: tools/.cvsignore
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tools/.cvsignore	9 May 2006 19:38:42 -0000	1.7
+++ tools/.cvsignore	9 Jun 2006 16:44:55 -0000	1.8
@@ -4,3 +4,4 @@
 Makefile
 tools.zip
 appletviewer
+.deps



From MAILER-DAEMON Fri Jun 09 13:02:36 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FokNY-0004Lf-9D
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 13:02:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FokNX-0004LJ-54
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 13:02:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FokNW-0004L7-Mg
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 13:02:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FokNW-0004L4-GR
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 13:02:34 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FokVb-0003F3-OV
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 13:10:55 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FokNV-0001Gb-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 13:02:33 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FokNU-0001GY-FS
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 17:02:33 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FokNU-0001GY-FS@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 09 Jun 2006 17:02:32 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/text/GapContent...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 17:02:35 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/09 17:02:32

Modified files:
	.              : ChangeLog 
	javax/swing/text: GapContent.java 
	java/util      : Collections.java Arrays.java 

Log message:
	2006-06-09  Anthony Green  <green@redhat.com>
	
		PR classpath/27888:
		* javax/swing/text/GapContent.java (binarySearch): Use unsigned shift.
		* java/util/Collections.java (binarySearch): Use unsigned shift.
		* java/util/Arrays.java (binarySearch): Use unsigned shift.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7742&r2=1.7743
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/GapContent.java?cvsroot=classpath&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/Collections.java?cvsroot=classpath&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/Arrays.java?cvsroot=classpath&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7742
retrieving revision 1.7743
diff -u -b -r1.7742 -r1.7743
--- ChangeLog	9 Jun 2006 16:44:55 -0000	1.7742
+++ ChangeLog	9 Jun 2006 17:02:31 -0000	1.7743
@@ -1,3 +1,10 @@
+2006-06-09  Anthony Green  <green@redhat.com>
+
+	PR classpath/27888:
+	* javax/swing/text/GapContent.java (binarySearch): Use unsigned shift.
+	* java/util/Collections.java (binarySearch): Use unsigned shift.
+	* java/util/Arrays.java (binarySearch): Use unsigned shift.
+
 2006-06-09  Tom Tromey  <tromey@redhat.com>
 
 	* tools/.cvsignore: Added .deps.

Index: javax/swing/text/GapContent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/GapContent.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- javax/swing/text/GapContent.java	5 Jun 2006 11:44:50 -0000	1.49
+++ javax/swing/text/GapContent.java	9 Jun 2006 17:02:32 -0000	1.50
@@ -918,7 +918,7 @@
     int mid = 0;
     while (low <= hi)
       {
-        mid = (low + hi) >> 1;
+        mid = (low + hi) >>> 1;
         final int d = a[mid];
         if (d == key)
           return mid;

Index: java/util/Collections.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Collections.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- java/util/Collections.java	11 May 2006 07:56:42 -0000	1.41
+++ java/util/Collections.java	9 Jun 2006 17:02:32 -0000	1.42
@@ -655,7 +655,7 @@
 	boolean forward = true;
         while (low <= hi)
           {
-            pos = (low + hi) >> 1;
+            pos = (low + hi) >>> 1;
             if (i < pos)
 	      {
 		if (!forward)
@@ -684,7 +684,7 @@
       {
 	while (low <= hi)
 	  {
-	    pos = (low + hi) >> 1;
+	    pos = (low + hi) >>> 1;
 	    final int d = compare(l.get(pos), key, c);
 	    if (d == 0)
               return pos;

Index: java/util/Arrays.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Arrays.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- java/util/Arrays.java	7 Apr 2006 19:45:46 -0000	1.28
+++ java/util/Arrays.java	9 Jun 2006 17:02:32 -0000	1.29
@@ -97,7 +97,7 @@
     int mid = 0;
     while (low <= hi)
       {
-        mid = (low + hi) >> 1;
+        mid = (low + hi) >>> 1;
         final byte d = a[mid];
         if (d == key)
           return mid;
@@ -131,7 +131,7 @@
     int mid = 0;
     while (low <= hi)
       {
-        mid = (low + hi) >> 1;
+        mid = (low + hi) >>> 1;
         final char d = a[mid];
         if (d == key)
           return mid;
@@ -165,7 +165,7 @@
     int mid = 0;
     while (low <= hi)
       {
-        mid = (low + hi) >> 1;
+        mid = (low + hi) >>> 1;
         final short d = a[mid];
         if (d == key)
           return mid;
@@ -199,7 +199,7 @@
     int mid = 0;
     while (low <= hi)
       {
-        mid = (low + hi) >> 1;
+        mid = (low + hi) >>> 1;
         final int d = a[mid];
         if (d == key)
           return mid;
@@ -233,7 +233,7 @@
     int mid = 0;
     while (low <= hi)
       {
-        mid = (low + hi) >> 1;
+        mid = (low + hi) >>> 1;
         final long d = a[mid];
         if (d == key)
           return mid;
@@ -268,7 +268,7 @@
     int mid = 0;
     while (low <= hi)
       {
-        mid = (low + hi) >> 1;
+        mid = (low + hi) >>> 1;
         final int r = Float.compare(a[mid], key);
         if (r == 0)
           return mid;
@@ -303,7 +303,7 @@
     int mid = 0;
     while (low <= hi)
       {
-        mid = (low + hi) >> 1;
+        mid = (low + hi) >>> 1;
         final int r = Double.compare(a[mid], key);
         if (r == 0)
           return mid;
@@ -369,7 +369,7 @@
     int mid = 0;
     while (low <= hi)
       {
-        mid = (low + hi) >> 1;
+        mid = (low + hi) >>> 1;
         final int d = Collections.compare(key, a[mid], c);
         if (d == 0)
           return mid;



From MAILER-DAEMON Fri Jun 09 16:24:03 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FonWV-00009b-Jy
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 16:24:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FonWU-00008u-Db
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:24:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FonWR-00005n-JC
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:24:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FonWR-00005P-CO
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:23:59 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoneY-0001vH-Go
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:32:22 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FonWP-0007aD-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 16:23:57 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FonWN-0007aA-SG
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 20:23:57 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FonWN-0007aA-SG@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Fri, 09 Jun 2006 20:23:55 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Freet...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 20:24:02 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/09 20:23:55

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: FreetypeGlyphVector.java GdkFontPeer.java 
	java/awt/font  : TextLayout.java 
	java/text      : Bidi.java 

Log message:
	2006-06-08  Sven de Marothy  <sven@physto.se>
	
		* java/text/Bidi.java: Treat WS as neutral for rules N1 & N2.
		* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
		New constructor for bidirectionality.
		(getGlyphMetrics): Return whitespace glyphs.
		(getLogicalBounds): Offset rectangles to correct positions.
		* gnu/java/awt/peer/gtk/GdkFontPeer.java
		(getBaselineFor): Default to ROMAN_BASELINE.
		(GdkFontLineMetrics): Guess some values for underline and 
		strikethrough.
		(layoutGlyphVector): Use bidirectionality.
		* java/awt/font/TextLayout.java: Implement, mostly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7743&r2=1.7744
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java?cvsroot=classpath&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/TextLayout.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/java/text/Bidi.java?cvsroot=classpath&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7743
retrieving revision 1.7744
diff -u -b -r1.7743 -r1.7744
--- ChangeLog	9 Jun 2006 17:02:31 -0000	1.7743
+++ ChangeLog	9 Jun 2006 20:23:54 -0000	1.7744
@@ -1,3 +1,17 @@
+2006-06-08  Sven de Marothy  <sven@physto.se>
+
+	* java/text/Bidi.java: Treat WS as neutral for rules N1 & N2.
+	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
+	New constructor for bidirectionality.
+	(getGlyphMetrics): Return whitespace glyphs.
+	(getLogicalBounds): Offset rectangles to correct positions.
+	* gnu/java/awt/peer/gtk/GdkFontPeer.java
+	(getBaselineFor): Default to ROMAN_BASELINE.
+	(GdkFontLineMetrics): Guess some values for underline and 
+	strikethrough.
+	(layoutGlyphVector): Use bidirectionality.
+	* java/awt/font/TextLayout.java: Implement, mostly.
+	
 2006-06-09  Anthony Green  <green@redhat.com>
 
 	PR classpath/27888:

Index: gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	7 Jun 2006 23:48:05 -0000	1.3
+++ gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	9 Jun 2006 20:23:55 -0000	1.4
@@ -82,10 +82,25 @@
   private AffineTransform[] glyphTransforms;
 
   /**
+   * Keep track of which glyphs are whitespace, since we don't have
+   * reporting from the peers yet. TextLayout needs this for justification.
+   */
+  private boolean[] whiteSpace;
+
+  /**
    * Create a glyphvector from a given (Freetype) font and a String.
    */
   public FreetypeGlyphVector(Font f, String s, FontRenderContext frc)
   {
+    this(f, s, frc, Font.LAYOUT_LEFT_TO_RIGHT);
+  }
+
+  /**
+   * Create a glyphvector from a given (Freetype) font and a String.
+   */
+  public FreetypeGlyphVector(Font f, String s, FontRenderContext frc,
+			     int flags)
+  {
     this.s = s;
     this.font = f;
     this.frc = frc;
@@ -94,6 +109,14 @@
     peer = (GdkFontPeer)font.getPeer();
 
     getGlyphs();
+    if( flags == Font.LAYOUT_RIGHT_TO_LEFT )
+      {
+	// reverse the glyph ordering.
+	int[] temp = new int[ nGlyphs ];
+	for(int i = 0; i < nGlyphs; i++)
+	  temp[ i ] = glyphCodes[ nGlyphs - i - 1];
+	glyphCodes = temp;
+      }
     performDefaultLayout();
   }
 
@@ -180,10 +203,12 @@
    */
   public void performDefaultLayout()
   {
+    whiteSpace = new boolean[ nGlyphs ]; 
     glyphTransforms = new AffineTransform[ nGlyphs ]; 
     double x = 0;
     for(int i = 0; i < nGlyphs; i++)
       {
+	whiteSpace[i] = Character.isWhitespace( glyphCodes[ i ] );
 	GlyphMetrics gm = getGlyphMetrics( i );
 	Rectangle2D r = gm.getBounds2D();
 	glyphTransforms[ i ] = AffineTransform.getTranslateInstance(x, 0);
@@ -237,17 +262,20 @@
 
   /**
    * Returns the metrics of a single glyph.
+   * FIXME: Not all glyph types are supported.
    */
   public GlyphMetrics getGlyphMetrics(int glyphIndex)
   {
     double[] val = getMetricsNative( glyphCodes[ glyphIndex ] );
     if( val == null )
       return null;
+    byte type = whiteSpace[ glyphIndex ] ? 
+      GlyphMetrics.WHITESPACE : GlyphMetrics.STANDARD;
     
     return new GlyphMetrics( true, (float)val[1], (float)val[2], 
 			     new Rectangle2D.Double( val[3], val[4], 
 						     val[5], val[6] ),
-			     GlyphMetrics.STANDARD );
+			     type );
   }
 
   /**
@@ -319,7 +347,12 @@
 
     Rectangle2D rect = (Rectangle2D)getGlyphLogicalBounds( 0 );
     for( int i = 1; i < nGlyphs; i++ )
-      rect = rect.createUnion( (Rectangle2D)getGlyphLogicalBounds( i ) );
+      {
+	Rectangle2D r2 = (Rectangle2D)getGlyphLogicalBounds( i );
+	Point2D p = getGlyphPosition( i );
+	r2.setRect( p.getX(), p.getY(), r2.getWidth(), r2.getHeight() );
+	rect = rect.createUnion( r2 );
+      }
 
     return rect;
   }

Index: gnu/java/awt/peer/gtk/GdkFontPeer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gnu/java/awt/peer/gtk/GdkFontPeer.java	7 Jun 2006 13:54:32 -0000	1.15
+++ gnu/java/awt/peer/gtk/GdkFontPeer.java	9 Jun 2006 20:23:55 -0000	1.16
@@ -252,18 +252,24 @@
 
   public byte getBaselineFor (Font font, char c)
   {
-    throw new UnsupportedOperationException ();
+    // FIXME: Actually check.
+    return Font.ROMAN_BASELINE;
   }
 
-  protected class GdkFontLineMetrics extends LineMetrics
+  private static class GdkFontLineMetrics extends LineMetrics
   {
-    FontMetrics fm;
-    int nchars; 
+    private FontMetrics fm;
+    private int nchars; 
+    private float strikethroughOffset, strikethroughThickness,
+      underlineOffset, underlineThickness;
 
-    public GdkFontLineMetrics (FontMetrics m, int n)
+    public GdkFontLineMetrics (GdkFontPeer fp, FontMetrics m, int n)
     {
       fm = m;
       nchars = n;
+      strikethroughOffset = 0f;
+      strikethroughThickness = underlineThickness = ((float)fp.size) / 12f;
+      underlineOffset = 0f;
     }
 
     public float getAscent()
@@ -273,6 +279,7 @@
   
     public int getBaselineIndex()
     {
+      // FIXME
       return Font.ROMAN_BASELINE;
     }
     
@@ -303,7 +310,7 @@
   public LineMetrics getLineMetrics (Font font, CharacterIterator ci, 
                                      int begin, int limit, FontRenderContext rc)
   {
-    return new GdkFontLineMetrics (getFontMetrics (font), limit - begin);
+    return new GdkFontLineMetrics (this, getFontMetrics (font), limit - begin);
   }
 
   public Rectangle2D getMaxCharBounds (Font font, FontRenderContext rc)
@@ -350,20 +357,15 @@
                                         char[] chars, int start, int limit, 
                                         int flags)
   {
-    int nchars = (limit - start) + 1;
-    char[] nc = new char[nchars];
-
-    for (int i = 0; i < nchars; ++i)
-      nc[i] = chars[start + i];
-
-    return createGlyphVector (font, frc, 
-                              new StringCharacterIterator (new String (nc)));
+    return new FreetypeGlyphVector( font, new String( chars, start, 
+						      limit - start),
+				    frc, flags);
   }
 
   public LineMetrics getLineMetrics (Font font, String str, 
                                      FontRenderContext frc)
   {
-    return new GdkFontLineMetrics (getFontMetrics (font), str.length ());
+    return new GdkFontLineMetrics (this, getFontMetrics (font), str.length ());
   }
 
   public FontMetrics getFontMetrics (Font font)

Index: java/awt/font/TextLayout.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/font/TextLayout.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- java/awt/font/TextLayout.java	2 Jul 2005 20:32:29 -0000	1.7
+++ java/awt/font/TextLayout.java	9 Jun 2006 20:23:55 -0000	1.8
@@ -1,5 +1,5 @@
 /* TextLayout.java --
-   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,8 +38,7 @@
 
 package java.awt.font;
 
-import gnu.java.awt.ClasspathToolkit;
-import gnu.java.awt.peer.ClasspathTextLayoutPeer;
+import gnu.classpath.NotImplementedException;
 
 import java.awt.Font;
 import java.awt.Graphics2D;
@@ -47,116 +46,269 @@
 import java.awt.Toolkit;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Point2D;
 import java.text.AttributedCharacterIterator;
 import java.text.AttributedString;
+import java.text.Bidi;
 import java.util.Map;
 
 /**
- * @author Michael Koch
+ * @author Sven de Marothy
  */
 public final class TextLayout implements Cloneable
 {
-  public static final CaretPolicy DEFAULT_CARET_POLICY = new CaretPolicy ();
-  ClasspathTextLayoutPeer peer;
+  private GlyphVector[] runs;
+  private Font font;
+  private FontRenderContext frc;
+  private String string;
+  private Rectangle2D boundsCache;
+  private LineMetrics lm;
+
+  /**
+   * Start and end character indices of the runs.
+   * First index is the run number, second is 0 or 1 for the starting 
+   * and ending character index of the run, respectively.
+   */
+  private int[][] runIndices;
 
-  public static class CaretPolicy
-  {
-    public CaretPolicy ()
-    {
-      // Do nothing here.
-    }
+  /**
+   * Base directionality, determined from the first char.
+   */
+  private boolean leftToRight;
 
-    public TextHitInfo getStrongCaret (TextHitInfo hit1, TextHitInfo hit2,
-                                       TextLayout layout)
+  /**
+   * Whether this layout contains whitespace or not.
+   */
+  private boolean hasWhitespace = false;
+
+  /**
+   * The default caret policy.
+   */
+  static TextLayout.CaretPolicy DEFAULT_CARET_POLICY = new CaretPolicy();
+
+  /**
+   * Constructs a TextLayout.
+   */
+  public TextLayout (String string, Font font, FontRenderContext frc) 
     {
-      return layout.peer.getStrongCaret(hit1, hit2);
+    this.font = font;
+    this.frc = frc;
+    this.string = string;
+    lm = font.getLineMetrics(string, frc);
+
+    // Get base direction and whitespace info
+    getStringProperties();
+
+    if( Bidi.requiresBidi( string.toCharArray(), 0, string.length() ) )
+      {
+	Bidi bidi = new Bidi( string, leftToRight ? 
+			      Bidi.DIRECTION_LEFT_TO_RIGHT : 
+			      Bidi.DIRECTION_RIGHT_TO_LEFT );
+	int rc = bidi.getRunCount();
+	byte[] table = new byte[ rc ];
+	for(int i = 0; i < table.length; i++)
+	  table[i] = (byte)bidi.getRunLevel(i);
+
+	runs = new GlyphVector[ rc ];
+	runIndices = new int[rc][2];
+	for(int i = 0; i < runs.length; i++)
+	  {
+	    runIndices[i][0] = bidi.getRunStart( i );
+	    runIndices[i][1] = bidi.getRunLimit( i );
+	    if( runIndices[i][0] != runIndices[i][1] ) // no empty runs.
+	      {
+		runs[i] = font.layoutGlyphVector
+		  ( frc, string.toCharArray(),
+		    runIndices[i][0], runIndices[i][1],
+		    ((table[i] & 1) == 0) ? Font.LAYOUT_LEFT_TO_RIGHT :
+		    Font.LAYOUT_RIGHT_TO_LEFT );
+	      }
+	  }
+	Bidi.reorderVisually( table, 0, runs, 0, runs.length );
+      }
+    else
+      {
+	runs = new GlyphVector[ 1 ];
+	runIndices = new int[1][2];
+	runIndices[0][0] = 0;
+	runIndices[0][1] = string.length();
+	runs[ 0 ] = font.layoutGlyphVector( frc, string.toCharArray(), 
+					    0, string.length(),
+					    leftToRight ?
+					    Font.LAYOUT_LEFT_TO_RIGHT :
+					    Font.LAYOUT_RIGHT_TO_LEFT );
     }
   }
 
-  public TextLayout (AttributedCharacterIterator text, FontRenderContext frc)
+  public TextLayout (String string, Map attributes, FontRenderContext frc)  
   {    
-    AttributedString as = new AttributedString (text);
-    ClasspathToolkit tk = (ClasspathToolkit)(Toolkit.getDefaultToolkit ());
-    peer = tk.getClasspathTextLayoutPeer(as, frc);
+    this( string, new Font( attributes ), frc );
   }
 
-  public TextLayout (String string, Font font, FontRenderContext frc) 
+  public TextLayout (AttributedCharacterIterator text, FontRenderContext frc)
+    throws NotImplementedException
   {
-    AttributedString as = new AttributedString (string);
-    as.addAttribute (TextAttribute.FONT, font);
-    ClasspathToolkit tk = (ClasspathToolkit)(Toolkit.getDefaultToolkit ());
-    peer = tk.getClasspathTextLayoutPeer(as, frc);
+    throw new Error ("not implemented");
   }
 
-  public TextLayout (String string, Map attributes, FontRenderContext frc)  
+  /**
+   * Scan the character run for the first strongly directional character,
+   * which in turn defines the base directionality of the whole layout.
+   */
+  private void getStringProperties()
   {
-    AttributedString as = new AttributedString (string, attributes);
-    ClasspathToolkit tk = (ClasspathToolkit)(Toolkit.getDefaultToolkit ());
-    peer = tk.getClasspathTextLayoutPeer(as, frc);
+    boolean gotDirection = false;
+    int i = 0;
+
+    leftToRight = true;
+    while( i < string.length() && !gotDirection )
+      switch( Character.getDirectionality( string.charAt( i++ ) ) )
+	{
+	case Character.DIRECTIONALITY_LEFT_TO_RIGHT:
+	case Character.DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING:
+	case Character.DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE:
+	  gotDirection = true;
+	  break;
+	  
+	case Character.DIRECTIONALITY_RIGHT_TO_LEFT:
+	case Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC:
+	case Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING:
+	case Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE:
+	  leftToRight = false;
+	  gotDirection = true;
+	  break;
+	}
+
+    // Determine if there's whitespace in the thing.
+    // Ignore trailing chars.
+    i = string.length() - 1; 
+    hasWhitespace = false;
+    while( i >= 0 && Character.isWhitespace( string.charAt(i) ) )
+      i--;
+    // Check the remaining chars
+    while( i >= 0 )
+      if( Character.isWhitespace( string.charAt(i--) ) )
+	hasWhitespace = true;
   }
 
   protected Object clone ()
   {
-    try
-      {
-        TextLayout tl = (TextLayout) super.clone ();
-        tl.peer = (ClasspathTextLayoutPeer) this.peer.clone();
-        return tl;
+    return new TextLayout( string, font, frc );
       }
-    catch (CloneNotSupportedException e)
-      {
-        // This should never occur
-        throw new InternalError ();
-      }
-  }
-
 
   public void draw (Graphics2D g2, float x, float y) 
   {
-    peer.draw(g2, x, y);
+    for(int i = 0; i < runs.length; i++)
+      {
+	g2.drawGlyphVector(runs[i], x, y);
+	Rectangle2D r = runs[i].getLogicalBounds();
+	x += r.getWidth();
+      }
   }
 
   public boolean equals (Object obj)
   {
-    if (! (obj instanceof TextLayout))
+    if( !( obj instanceof TextLayout) )
       return false;
 
-    return equals ((TextLayout) obj);
+    return equals( (TextLayout) obj );
   }
 
   public boolean equals (TextLayout tl)
   {
-    return this.peer.equals(tl.peer);
+    if( runs.length != tl.runs.length )
+      return false;
+    // Compare all glyph vectors.
+    for( int i = 0; i < runs.length; i++ )
+      if( !runs[i].equals( tl.runs[i] ) )
+	return false;
+    return true;
   }
 
   public float getAdvance ()
   {
-    return peer.getAdvance();
+    float totalAdvance = 0f;
+    for(int i = 0; i < runs.length; i++)
+      totalAdvance += runs[i].getLogicalBounds().getWidth();
+    return totalAdvance;
   }
 
   public float getAscent ()
   {
-    return peer.getAscent();
+    return lm.getAscent();
   }
 
   public byte getBaseline ()
   {
-    return peer.getBaseline();
+    return (byte)lm.getBaselineIndex();
   }
 
   public float[] getBaselineOffsets ()
   {
-    return peer.getBaselineOffsets();
+    return lm.getBaselineOffsets();
   }
 
   public Shape getBlackBoxBounds (int firstEndpoint, int secondEndpoint)
   {
-    return peer.getBlackBoxBounds(firstEndpoint, secondEndpoint);
+    if( firstEndpoint < 0 || secondEndpoint > getCharacterCount() )
+      return new Rectangle2D.Float();
+
+    GeneralPath gp = new GeneralPath();
+    int i = 0; // run index
+    double advance = 0;
+
+    // go to first run
+    while( runIndices[i + 1][1] < firstEndpoint ) 
+      {
+	advance += runs[i].getLogicalBounds().getWidth();
+	i++;
+      }
+
+    int j = 0; // index into the run.
+    if( runIndices[i][1] - runIndices[i][0] > 1 )
+      {
+	while( runs[i].getGlyphCharIndex( j + 1 ) <
+	       (firstEndpoint - runIndices[i][0] ) )j++;
+      }
+
+    gp.append(runs[i].getGlyphVisualBounds( j ), false);
+    boolean keepGoing = true;;
+
+    do
+      {
+	while( j < runs[i].getNumGlyphs() && 
+	       runs[i].getGlyphCharIndex( j ) + runIndices[i][0] < 
+	       secondEndpoint )
+	  {
+	    Rectangle2D r2 = (runs[i].getGlyphVisualBounds( j )).
+	      getBounds2D();
+	    Point2D p = runs[i].getGlyphPosition( j );
+	    r2.setRect( advance + p.getX(), r2.getY(), 
+			r2.getWidth(), r2.getHeight() );
+	    gp.append(r2, false);
+	    j++;
+	  }
+
+	if( j >= runs[i].getNumGlyphs() )
+	  {
+	    advance += runs[i].getLogicalBounds().getWidth();
+	    i++; 
+	    j = 0;
+	  }
+	else
+	  keepGoing = false;
+      }
+    while( keepGoing );
+
+    return gp;
   }
 
   public Rectangle2D getBounds()
   {
-    return peer.getBounds();
+    if( boundsCache == null )
+      boundsCache = getOutline(new AffineTransform()).getBounds();
+    return boundsCache;
   }
 
   public float[] getCaretInfo (TextHitInfo hit)
@@ -165,144 +317,272 @@
   }
 
   public float[] getCaretInfo (TextHitInfo hit, Rectangle2D bounds)
+    throws NotImplementedException
   {
-    return peer.getCaretInfo(hit, bounds);
+    throw new Error ("not implemented");
   }
 
   public Shape getCaretShape (TextHitInfo hit)
   {
-    return getCaretShape(hit, getBounds());
+    return getCaretShape( hit, getBounds() );
   }
 
   public Shape getCaretShape (TextHitInfo hit, Rectangle2D bounds)
+    throws NotImplementedException
   {
-    return peer.getCaretShape(hit, bounds);
+    throw new Error ("not implemented");
   }
 
   public Shape[] getCaretShapes (int offset)
   {
-    return getCaretShapes(offset, getBounds());
+    return getCaretShapes( offset, getBounds() );
   }
 
   public Shape[] getCaretShapes (int offset, Rectangle2D bounds)
+    throws NotImplementedException
   {
-    return getCaretShapes(offset, getBounds(), DEFAULT_CARET_POLICY);
-  }
-
-  public Shape[] getCaretShapes (int offset, Rectangle2D bounds,
-                                 TextLayout.CaretPolicy policy)
-  {
-    return peer.getCaretShapes(offset, bounds, policy);
+    throw new Error ("not implemented");
   }
 
   public int getCharacterCount ()
   {
-    return peer.getCharacterCount();
+    return string.length();
   }
 
   public byte getCharacterLevel (int index)
+    throws NotImplementedException
   {
-    return peer.getCharacterLevel(index);
+    throw new Error ("not implemented");
   }
 
   public float getDescent ()
   {
-    return peer.getDescent();
+    return lm.getDescent();
   }
 
   public TextLayout getJustifiedLayout (float justificationWidth)
   {
-    return peer.getJustifiedLayout(justificationWidth);
+    TextLayout newLayout = (TextLayout)clone();
+
+    if( hasWhitespace )
+      newLayout.handleJustify( justificationWidth );
+
+    return newLayout;
   }
 
   public float getLeading ()
   {
-    return peer.getLeading();
+    return lm.getLeading();
   }
 
   public Shape getLogicalHighlightShape (int firstEndpoint, int secondEndpoint)
   {
-    return getLogicalHighlightShape (firstEndpoint, secondEndpoint, getBounds());
+    return getLogicalHighlightShape( firstEndpoint, secondEndpoint, 
+				     getBounds() );
   }
 
   public Shape getLogicalHighlightShape (int firstEndpoint, int secondEndpoint,
                                          Rectangle2D bounds)
   {
-    return peer.getLogicalHighlightShape(firstEndpoint, secondEndpoint, bounds);
+    if( firstEndpoint < 0 || secondEndpoint > getCharacterCount() )
+      return new Rectangle2D.Float();
+
+    int i = 0; // run index
+    double advance = 0;
+
+    // go to first run
+    while( runIndices[i + 1][1] < firstEndpoint ) 
+      {
+	advance += runs[i].getLogicalBounds().getWidth();
+	i++;
   }
 
-  public int[] getLogicalRangesForVisualSelection (TextHitInfo firstEndpoint,
-                                                   TextHitInfo secondEndpoint)
+    int j = 0; // index into the run.
+    if( runIndices[i][1] - runIndices[i][0] > 1 )
   {
-    return peer.getLogicalRangesForVisualSelection(firstEndpoint, secondEndpoint);
+	while( runs[i].getGlyphCharIndex( j + 1 ) <
+	       (firstEndpoint - runIndices[i][0] ) )j++;
   }
 
-  public TextHitInfo getNextLeftHit (int offset)
+    Rectangle2D r = (runs[i].getGlyphLogicalBounds( j )).getBounds2D();
+    boolean keepGoing = true;;
+
+    do
+      {
+	while( j < runs[i].getNumGlyphs() && 
+	       runs[i].getGlyphCharIndex( j ) + runIndices[i][0] < 
+	       secondEndpoint )
   {
-    return getNextLeftHit(offset, DEFAULT_CARET_POLICY);
+	    Rectangle2D r2 = (runs[i].getGlyphLogicalBounds( j )).
+	      getBounds2D();
+	    Point2D p = runs[i].getGlyphPosition( j );
+	    r2.setRect( advance + p.getX(), r2.getY(), 
+			r2.getWidth(), r2.getHeight() );
+	    r = r.createUnion( r2 );
+	    j++;
   }
 
-  public TextHitInfo getNextLeftHit (int offset, TextLayout.CaretPolicy policy)
+	if( j >= runs[i].getNumGlyphs() )
   {
-    return peer.getNextLeftHit(offset, policy);
+	    advance += runs[i].getLogicalBounds().getWidth();
+	    i++; 
+	    j = 0;
   }
+	else
+	  keepGoing = false;
+      }
+    while( keepGoing );
 
-  public TextHitInfo getNextLeftHit (TextHitInfo hit)
+    return r;
+  }
+
+  public int[] getLogicalRangesForVisualSelection (TextHitInfo firstEndpoint,
+                                                   TextHitInfo secondEndpoint)
+    throws NotImplementedException
   {
-    return getNextLeftHit(hit.getCharIndex());
+    throw new Error ("not implemented");
   }
 
-  public TextHitInfo getNextRightHit (int offset)
+  public TextHitInfo getNextLeftHit (int offset)
+    throws NotImplementedException
   {
-    return getNextRightHit(offset, DEFAULT_CARET_POLICY);
+    throw new Error ("not implemented");
   }
 
-  public TextHitInfo getNextRightHit (int offset, TextLayout.CaretPolicy policy)
+  public TextHitInfo getNextLeftHit (TextHitInfo hit)
+    throws NotImplementedException
   {
-    return peer.getNextRightHit(offset, policy);
+    throw new Error ("not implemented");
+  }
+
+  public TextHitInfo getNextRightHit (int offset)
+    throws NotImplementedException
+  {
+    throw new Error ("not implemented");
   }
 
   public TextHitInfo getNextRightHit (TextHitInfo hit)
+    throws NotImplementedException
   {
-    return getNextRightHit(hit.getCharIndex());
+    throw new Error ("not implemented");
   }
 
   public Shape getOutline (AffineTransform tx)
   {
-    return peer.getOutline(tx);
+    float x = 0f;
+    GeneralPath gp = new GeneralPath();
+    for(int i = 0; i < runs.length; i++)
+      {
+	gp.append( runs[i].getOutline( x, 0f ), false );
+	Rectangle2D r = runs[i].getLogicalBounds();
+	x += r.getWidth();
+      }
+    gp.transform( tx );
+    return gp;
   }
 
   public float getVisibleAdvance ()
   {
-    return peer.getVisibleAdvance();
+    float totalAdvance = 0f;
+
+    if( runs.length <= 0 )
+      return 0f;
+
+    // No trailing whitespace
+    if( !Character.isWhitespace( string.charAt( string.length() -1 ) ) )
+      return getAdvance();
+
+    // Get length of all runs up to the last
+    for(int i = 0; i < runs.length - 1; i++)
+      totalAdvance += runs[i].getLogicalBounds().getWidth();
+
+    int lastRun = runIndices[ runs.length - 1 ][0];
+    int j = string.length() - 1;
+    while( j >= lastRun && Character.isWhitespace( string.charAt( j ) ) ) j--;
+
+    if( j < lastRun )
+      return totalAdvance; // entire last run is whitespace
+
+    int lastNonWSChar = j - lastRun;
+    j = 0;
+    while( runs[ runs.length - 1 ].getGlyphCharIndex( j )
+	   <= lastNonWSChar )
+      {
+	totalAdvance += runs[ runs.length - 1 ].getGlyphLogicalBounds( j ).
+	  getBounds2D().getWidth();
+	j ++;
+      }
+    
+    return totalAdvance;
   }
 
   public Shape getVisualHighlightShape (TextHitInfo firstEndpoint,
                                         TextHitInfo secondEndpoint)
   {
-    return getVisualHighlightShape(firstEndpoint, secondEndpoint, getBounds());
+    return getVisualHighlightShape( firstEndpoint, secondEndpoint, 
+				    getBounds() );
   }
 
   public Shape getVisualHighlightShape (TextHitInfo firstEndpoint,
                                         TextHitInfo secondEndpoint,
                                         Rectangle2D bounds)
+    throws NotImplementedException
   {
-    return peer.getVisualHighlightShape(firstEndpoint, secondEndpoint, bounds);
+    throw new Error ("not implemented");
   }
 
   public TextHitInfo getVisualOtherHit (TextHitInfo hit)
+    throws NotImplementedException
   {
-    return peer.getVisualOtherHit(hit);
+    throw new Error ("not implemented");
   }
 
+  /**
+   * This is a protected method of a <code>final</code> class, meaning
+   * it exists only to taunt you.
+   */
   protected void handleJustify (float justificationWidth)
   {
-    peer.handleJustify(justificationWidth);
+    // We assume that the text has non-trailing whitespace.
+    // First get the change in width to insert into the whitespaces.
+    double deltaW = justificationWidth - getVisibleAdvance();
+    int nglyphs = 0; // # of whitespace chars
+
+    // determine last non-whitespace char.
+    int lastNWS = string.length() - 1;
+    while( Character.isWhitespace( string.charAt( lastNWS ) ) ) lastNWS--;
+
+    // locations of the glyphs.
+    int[] wsglyphs = new int[string.length() * 10];
+    for(int run = 0; run < runs.length; run++ )
+      for(int i = 0; i < runs[run].getNumGlyphs(); i++ )
+	{
+	  int cindex = runIndices[run][0] + runs[run].getGlyphCharIndex( i );
+	  if( Character.isWhitespace( string.charAt( cindex ) ) )
+	    //	      && cindex < lastNWS )
+	    {
+	      wsglyphs[ nglyphs * 2 ] = run;
+	      wsglyphs[ nglyphs * 2 + 1] = i;
+	      nglyphs++;
+	    }
   }
 
-  public int hashCode ()
+    deltaW = deltaW / nglyphs; // Change in width per whitespace glyph
+    double w = 0;
+    int cws = 0;
+    // Shift all characters
+    for(int run = 0; run < runs.length; run++ )
+      for(int i = 0; i < runs[ run ].getNumGlyphs(); i++ )
   {
-    return peer.hashCode();
+	  if( wsglyphs[ cws * 2 ] == run && wsglyphs[ cws * 2 + 1 ] == i )
+	    {
+	      cws++; // update 'current whitespace'
+	      w += deltaW; // increment the shift
+	    }
+	  Point2D p = runs[ run ].getGlyphPosition( i );
+	  p.setLocation( p.getX() + w, p.getY() );
+	  runs[ run ].setGlyphPosition( i, p );
+	}
   }
 
   public TextHitInfo hitTestChar (float x, float y)
@@ -312,21 +592,48 @@
 
   public TextHitInfo hitTestChar (float x, float y, Rectangle2D bounds)
   {
-    return peer.hitTestChar(x, y, bounds);
+    return hitTestChar( x, y, getBounds() );
   }
 
   public boolean isLeftToRight ()
   {
-    return peer.isLeftToRight();
+    return leftToRight;
   }
 
   public boolean isVertical ()
   {
-    return peer.isVertical();
+    return false; // FIXME: How do you create a vertical layout?
+  }
+
+  public int hashCode ()
+    throws NotImplementedException
+  {
+    throw new Error ("not implemented");
   }
 
   public String toString ()
   {
-    return peer.toString();
+    return "TextLayout [string:"+string+", Font:"+font+" Rendercontext:"+
+      frc+"]";
+  }
+
+  /**
+   * Inner class describing a caret policy
+   */
+  public static class CaretPolicy
+  {
+    public CaretPolicy()
+    {
+    }
+
+    public TextHitInfo getStrongCaret(TextHitInfo hit1,
+				      TextHitInfo hit2,
+				      TextLayout layout)
+      throws NotImplementedException
+    {
+      throw new Error ("not implemented");
+    }
   }
 }
+
+

Index: java/text/Bidi.java
===================================================================
RCS file: /sources/classpath/classpath/java/text/Bidi.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- java/text/Bidi.java	8 Jun 2006 23:32:13 -0000	1.5
+++ java/text/Bidi.java	9 Jun 2006 20:23:55 -0000	1.6
@@ -644,6 +644,7 @@
               case Character.DIRECTIONALITY_OTHER_NEUTRALS:
               case Character.DIRECTIONALITY_SEGMENT_SEPARATOR:
               case Character.DIRECTIONALITY_PARAGRAPH_SEPARATOR:
+	      case Character.DIRECTIONALITY_WHITESPACE:
                 if (neutralStart == -1)
                   neutralStart = i;
                 break;



From MAILER-DAEMON Fri Jun 09 16:41:05 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fonmz-0007RK-E2
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 16:41:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fonmx-0007Qk-Pc
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:41:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fonmw-0007QK-W2
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:41:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fonmw-0007QG-PS
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:41:02 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fonv4-0003Gh-6L
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:49:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fonmv-0000eO-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 16:41:01 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1Fonmt-0000eI-VB
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 20:41:01 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fonmt-0000eI-VB@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Fri, 09 Jun 2006 20:40:59 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Cairo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 20:41:04 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/09 20:40:59

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 

Log message:
	2006-06-08  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/CairoGraphics2D.java
		(drawString): Use TextLayout instead of GlyphVector.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7744&r2=1.7745
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7744
retrieving revision 1.7745
diff -u -b -r1.7744 -r1.7745
--- ChangeLog	9 Jun 2006 20:23:54 -0000	1.7744
+++ ChangeLog	9 Jun 2006 20:40:58 -0000	1.7745
@@ -1,5 +1,10 @@
 2006-06-08  Sven de Marothy  <sven@physto.se>
 
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
+	(drawString): Use TextLayout instead of GlyphVector.
+
+2006-06-08  Sven de Marothy  <sven@physto.se>
+
 	* java/text/Bidi.java: Treat WS as neutral for rules N1 & N2.
 	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
 	New constructor for bidirectionality.

Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java	9 Jun 2006 16:04:20 -0000	1.16
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java	9 Jun 2006 20:40:59 -0000	1.17
@@ -63,6 +63,7 @@
 import java.awt.Toolkit;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
+import java.awt.font.TextLayout;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Arc2D;
 import java.awt.geom.Area;
@@ -1271,8 +1272,8 @@
   {
     if (str == null || str.length() == 0)
       return;
-
-    drawGlyphVector(getFont().createGlyphVector(null, str), x, y);
+    (new TextLayout( str, getFont(), getFontRenderContext() )).
+      draw(this, x, y);
   }
 
   public void drawString(String str, int x, int y)



From MAILER-DAEMON Fri Jun 09 16:48:08 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fonto-0006Gj-BS
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 16:48:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fontm-0006FQ-8l
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:48:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fontl-0006Eo-RE
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:48:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fontl-0006Eg-FG
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:48:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Foo1t-0003q8-0J
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:56:29 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fontk-0000j6-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 16:48:04 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1Fontj-0000j3-00
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 20:48:04 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fontj-0000j3-00@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Fri, 09 Jun 2006 20:48:03 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/font/TextLayout.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 20:48:06 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/09 20:48:02

Modified files:
	.              : ChangeLog 
	java/awt/font  : TextLayout.java 

Log message:
	2006-06-08  Sven de Marothy  <sven@physto.se>
	
		* java/awt/font/TextLayout.java
		(getOutline): Allow null transform.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7745&r2=1.7746
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/TextLayout.java?cvsroot=classpath&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7745
retrieving revision 1.7746
diff -u -b -r1.7745 -r1.7746
--- ChangeLog	9 Jun 2006 20:40:58 -0000	1.7745
+++ ChangeLog	9 Jun 2006 20:48:01 -0000	1.7746
@@ -1,5 +1,10 @@
 2006-06-08  Sven de Marothy  <sven@physto.se>
 
+	* java/awt/font/TextLayout.java
+	(getOutline): Allow null transform.
+
+2006-06-08  Sven de Marothy  <sven@physto.se>
+
 	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
 	(drawString): Use TextLayout instead of GlyphVector.
 

Index: java/awt/font/TextLayout.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/font/TextLayout.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- java/awt/font/TextLayout.java	9 Jun 2006 20:23:55 -0000	1.8
+++ java/awt/font/TextLayout.java	9 Jun 2006 20:48:02 -0000	1.9
@@ -477,6 +477,7 @@
 	Rectangle2D r = runs[i].getLogicalBounds();
 	x += r.getWidth();
       }
+    if( tx != null )
     gp.transform( tx );
     return gp;
   }



From MAILER-DAEMON Fri Jun 09 16:49:57 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FonvZ-0006y8-Qt
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 16:49:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FonvY-0006xt-Ew
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:49:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FonvV-0006xh-UJ
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:49:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FonvV-0006xe-Ra
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:49:53 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Foo3d-0003xy-9S
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 16:58:17 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FonvV-0000k6-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 16:49:53 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FonvT-0000k3-IP
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 20:49:52 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FonvT-0000k3-IP@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Fri, 09 Jun 2006 20:49:51 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/java2d/Abstrac...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 20:49:56 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/09 20:49:51

Modified files:
	.              : ChangeLog 
	gnu/java/awt/java2d: AbstractGraphics2D.java PolyEdge.java 

Log message:
	2006-06-09  Roman Kennke  <kennke@aicas.com>
	
		* gnu/java/awt/java2d/AbstractGraphics2D.java
		(drawImage): Fixed scaling.
		(fillShape): Removed offset handling.
		(fillShapeImpl): Limit scanlining to device bounds.
		(getSegments): Removed offset handling.
		* gnu/java/awt/java2d/PolyEdge.java
		(toString): Include isClip flag in output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7746&r2=1.7747
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java?cvsroot=classpath&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/java2d/PolyEdge.java?cvsroot=classpath&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7746
retrieving revision 1.7747
diff -u -b -r1.7746 -r1.7747
--- ChangeLog	9 Jun 2006 20:48:01 -0000	1.7746
+++ ChangeLog	9 Jun 2006 20:49:50 -0000	1.7747
@@ -1,4 +1,14 @@
-2006-06-08  Sven de Marothy  <sven@physto.se>
+2006-06-09  Roman Kennke  <kennke@aicas.com>
+
+	* gnu/java/awt/java2d/AbstractGraphics2D.java
+	(drawImage): Fixed scaling.
+	(fillShape): Removed offset handling.
+	(fillShapeImpl): Limit scanlining to device bounds.
+	(getSegments): Removed offset handling.
+	* gnu/java/awt/java2d/PolyEdge.java
+	(toString): Include isClip flag in output.
+
+2006-06-09  Sven de Marothy  <sven@physto.se>
 
 	* java/awt/font/TextLayout.java
 	(getOutline): Allow null transform.
@@ -56,7 +66,7 @@
 	(struct _Jv_reent): _freelist now a _Jv_Bigint**.  Removed
 	_allocation_map, num.  Added _max_k.
 
-2006-06-08  Roman Kennke  <kennke@aicas.com>
+2006-06-09  Roman Kennke  <kennke@aicas.com>
 
 	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
 	(drawGlyphVector): Added fallback for non-FreetypeGlyphVector

Index: gnu/java/awt/java2d/AbstractGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnu/java/awt/java2d/AbstractGraphics2D.java	19 May 2006 22:23:01 -0000	1.8
+++ gnu/java/awt/java2d/AbstractGraphics2D.java	9 Jun 2006 20:49:51 -0000	1.9
@@ -1331,8 +1331,8 @@
   {
     AffineTransform t = new AffineTransform();
     t.translate(x, y);
-    double scaleX = (double) image.getWidth(observer) / (double) width;
-    double scaleY = (double) image.getHeight(observer) / (double) height;
+    double scaleX = (double) width / (double) image.getWidth(observer);
+    double scaleY =  (double) height / (double) image.getHeight(observer);
     t.scale(scaleX, scaleY);
     return drawImage(image, t, observer);
   }
@@ -1473,15 +1473,11 @@
         antialias = (v == RenderingHints.VALUE_ANTIALIAS_ON);
       }
 
-    double offs = 0.5;
-    if (antialias)
-      offs = offs / AA_SAMPLING;
-
     Rectangle2D userBounds = s.getBounds2D();
     Rectangle2D deviceBounds = new Rectangle2D.Double();
-    ArrayList segs = getSegments(s, transform, deviceBounds, false, offs);
+    ArrayList segs = getSegments(s, transform, deviceBounds, false);
     Rectangle2D clipBounds = new Rectangle2D.Double();
-    ArrayList clipSegs = getSegments(clip, transform, clipBounds, true, offs);
+    ArrayList clipSegs = getSegments(clip, transform, clipBounds, true);
     segs.addAll(clipSegs);
     Rectangle2D inclClipBounds = new Rectangle2D.Double();
     Rectangle2D.union(clipBounds, deviceBounds, inclClipBounds);
@@ -1676,7 +1672,10 @@
 
     // Scan all relevant lines.
     int minYInt = (int) Math.ceil(icMinY);
-    for (int y = minYInt; y <= maxY; y++)
+
+    Rectangle devClip = getDeviceBounds();
+    int scanlineMax = (int) Math.min(maxY, devClip.getMaxY());
+    for (int y = minYInt; y < scanlineMax; y++)
       {
         ArrayList bucket = edgeTable[y - minYInt];
         // Update all the x intersections in the current activeEdges table
@@ -2169,8 +2168,7 @@
    * @return a list of PolyEdge that form the shape in device space
    */
   private ArrayList getSegments(Shape s, AffineTransform t,
-                                Rectangle2D deviceBounds, boolean isClip,
-                                double offs)
+                                Rectangle2D deviceBounds, boolean isClip)
   {
     // Flatten the path. TODO: Determine the best flattening factor
     // wrt to speed and quality.
@@ -2213,14 +2211,14 @@
         else if (segType == PathIterator.SEG_CLOSE)
           {
             // Close the polyline.
-            PolyEdge edge = new PolyEdge(segX, segY - offs,
-                                         polyX, polyY - offs, isClip);
+            PolyEdge edge = new PolyEdge(segX, segY,
+                                         polyX, polyY, isClip);
             segs.add(edge);
           }
         else if (segType == PathIterator.SEG_LINETO)
           {
-            PolyEdge edge = new PolyEdge(segX, segY - offs,
-                                         seg[0], seg[1] - offs, isClip);
+            PolyEdge edge = new PolyEdge(segX, segY,
+                                         seg[0], seg[1], isClip);
             segs.add(edge);
             segX = seg[0];
             segY = seg[1];

Index: gnu/java/awt/java2d/PolyEdge.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/java2d/PolyEdge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/java/awt/java2d/PolyEdge.java	8 May 2006 14:39:17 -0000	1.2
+++ gnu/java/awt/java2d/PolyEdge.java	9 Jun 2006 20:49:51 -0000	1.3
@@ -118,6 +118,7 @@
   public String toString()
   {
     return "Edge: " + x0 + ", " + y0 + ", " + x1 + ", " + y1 + ", slope: "
-           + slope + ", xIntersection: " + xIntersection;
+           + slope + ", xIntersection: " + xIntersection
+           + ", isClip: " + isClip;
   }
 }



From MAILER-DAEMON Fri Jun 09 17:30:48 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FooZ6-0001Gg-29
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 17:30:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FooZ5-0001Fv-F3
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 17:30:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FooZ4-0001Ee-M6
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 17:30:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FooZ4-0001E9-EJ
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 17:30:46 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoohC-0007H9-Dt
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 17:39:10 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FooZ3-0001Kh-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 17:30:45 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FooZ2-0001Ka-V7
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 21:30:45 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FooZ2-0001Ka-V7@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 09 Jun 2006 21:30:44 +0000
Subject: [commit-cp] classpath ChangeLog lib/Makefile.am lib/gen-cla...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 21:30:47 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/09 21:30:44

Modified files:
	.              : ChangeLog 
	lib            : Makefile.am gen-classlist.sh.in 

Log message:
		* lib/Makefile.am (install-data-local): Copy 'sun' files.
		(uninstall-local): Delete 'sun' directory.
		(glibj.zip): Include 'sun' classes.
		(clean-local): Delete 'sun' directory.
		* lib/gen-classlist.sh.in: Search 'sun' subdirectories.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7747&r2=1.7748
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/Makefile.am?cvsroot=classpath&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/gen-classlist.sh.in?cvsroot=classpath&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7747
retrieving revision 1.7748
diff -u -b -r1.7747 -r1.7748
--- ChangeLog	9 Jun 2006 20:49:50 -0000	1.7747
+++ ChangeLog	9 Jun 2006 21:30:43 -0000	1.7748
@@ -1,3 +1,11 @@
+2006-06-09  Tom Tromey  <tromey@redhat.com>
+
+	* lib/Makefile.am (install-data-local): Copy 'sun' files.
+	(uninstall-local): Delete 'sun' directory.
+	(glibj.zip): Include 'sun' classes.
+	(clean-local): Delete 'sun' directory.
+	* lib/gen-classlist.sh.in: Search 'sun' subdirectories.
+
 2006-06-09  Roman Kennke  <kennke@aicas.com>
 
 	* gnu/java/awt/java2d/AbstractGraphics2D.java

Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- lib/Makefile.am	5 Apr 2006 22:12:01 -0000	1.117
+++ lib/Makefile.am	9 Jun 2006 21:30:44 -0000	1.118
@@ -73,6 +73,7 @@
 	cp -R java $(DESTDIR)$(pkgdatadir)
 	cp -R javax $(DESTDIR)$(pkgdatadir)
 	cp -R org $(DESTDIR)$(pkgdatadir)
+	cp -R sun $(DESTDIR)$(pkgdatadir)
 	cp -R META-INF $(DESTDIR)$(pkgdatadir)
 
 # FIXME - should mimic doc/api/Makefile.am instead...
@@ -81,6 +82,7 @@
 	rm -rf $(DESTDIR)$(pkgdatadir)/java
 	rm -rf $(DESTDIR)$(pkgdatadir)/javax
 	rm -rf $(DESTDIR)$(pkgdatadir)/org
+	rm -rf $(DESTDIR)$(pkgdatadir)/sun
 	rm -rf $(DESTDIR)$(pkgdatadir)/META-INF
 
 endif # INSTALL_CLASS_FILES
@@ -95,8 +97,8 @@
 else
 
 glibj.zip: classes compile-classes resources
-	if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org META-INF > /dev/null; fi
-	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf glibj.zip gnu java javax org META-INF; fi
+	if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org sun META-INF > /dev/null; fi
+	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf glibj.zip gnu java javax org sun META-INF; fi
 
 endif # USE_PREBUILT_GLIBJ_ZIP
 
@@ -175,6 +177,7 @@
 	-rm -rf javax
 	-rm -rf org
 	-rm -rf com
+	-rm -rf sun
 	-rm -rf META-INF
 	-rm -rf lists
 	-rm -f Makefile.deps

Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- lib/gen-classlist.sh.in	4 Apr 2006 17:16:50 -0000	1.36
+++ lib/gen-classlist.sh.in	9 Jun 2006 21:30:44 -0000	1.37
@@ -18,7 +18,7 @@
 # We do this because it makes splitting for the gcj build much
 # cheaper.
 (cd @top_srcdir@
- @FIND@ java javax gnu org -follow -name '*.java' -print |
+ @FIND@ java javax gnu org sun -follow -name '*.java' -print |
  sort -r | sed -e 's,/\([^/]*\)$, \1,' |
  while read pkg file; do
     echo $pkg @top_srcdir@ $pkg/$file
@@ -43,7 +43,7 @@
 echo "Adding java source files from VM directory $vm_dirlist"
 for dir in $vm_dirlist; do
    (cd $dir
-   for subdir in java javax gnu org com; do
+   for subdir in java javax gnu org com sun; do
       if test -d $subdir; then
 	 @FIND@ $subdir -name '*.java' -print
       fi



From MAILER-DAEMON Fri Jun 09 18:08:13 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fop9J-00021Q-Q7
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 18:08:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fop9I-00021F-W5
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 18:08:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fop9H-00020s-Nb
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 18:08:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fop9H-00020o-Gl
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 18:08:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FopHP-0001LA-St
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 18:16:35 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fop9G-00034N-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 18:08:10 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1Fop9E-00034K-Sw
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 22:08:10 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fop9E-00034K-Sw@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Fri, 09 Jun 2006 22:08:08 +0000
Subject: [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 22:08:13 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/09 22:08:08

Modified files:
	.              : ChangeLog 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_ComponentGraphics.c 

Log message:
	2006-06-09  Sven de Marothy  <sven@physto.se>
	
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
		(Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface):
		Use GTK locks while disposing (Xlib) surface.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7748&r2=1.7749
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c?cvsroot=classpath&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7748
retrieving revision 1.7749
diff -u -b -r1.7748 -r1.7749
--- ChangeLog	9 Jun 2006 21:30:43 -0000	1.7748
+++ ChangeLog	9 Jun 2006 22:08:07 -0000	1.7749
@@ -1,3 +1,9 @@
+2006-06-09  Sven de Marothy  <sven@physto.se>
+
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
+	(Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface):
+	Use GTK locks while disposing (Xlib) surface.
+
 2006-06-09  Tom Tromey  <tromey@redhat.com>
 
 	* lib/Makefile.am (install-data-local): Copy 'sun' files.
@@ -16,7 +22,7 @@
 	* gnu/java/awt/java2d/PolyEdge.java
 	(toString): Include isClip flag in output.
 
-2006-06-09  Sven de Marothy  <sven@physto.se>
+2006-06-08  Sven de Marothy  <sven@physto.se>
 
 	* java/awt/font/TextLayout.java
 	(getOutline): Allow null transform.

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	7 Jun 2006 09:40:54 -0000	1.14
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	9 Jun 2006 22:08:08 -0000	1.15
@@ -186,7 +186,11 @@
 
   surface = cairo_get_target (gr->cr);
   if (surface != NULL)
+    {
+      gdk_threads_enter();
     cairo_surface_destroy (surface);
+      gdk_threads_leave();
+    }
 }
 
 JNIEXPORT jlong JNICALL 



From MAILER-DAEMON Fri Jun 09 19:28:06 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoqOc-0006bt-CF
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 19:28:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoqOa-0006U0-7s
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 19:28:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoqOY-0006ME-G3
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 19:28:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoqOY-0006Lp-CR
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 19:28:02 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoqWh-0006mP-Fp
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 19:36:27 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoqOX-0005IA-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 19:28:01 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FoqOX-0005I7-DZ
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 23:28:01 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoqOX-0005I7-DZ@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Fri, 09 Jun 2006 23:28:01 +0000
Subject: [commit-cp] classpath/javax/swing JComponent.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 23:28:04 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/09 23:28:01

Modified files:
	javax/swing    : JComponent.java 
	.              : ChangeLog 

Log message:
	2006-06-09  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/JComponent.java
		(paintChildrenOptimized): Paint component with a new Graphics
		object to protect the other painting code from modifications
		done in that object, and avoid cleanup ops on possibly dispose()ed
		Graphics object.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7749&r2=1.7750

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7749
retrieving revision 1.7750
diff -u -b -r1.7749 -r1.7750
--- ChangeLog	9 Jun 2006 22:08:07 -0000	1.7749
+++ ChangeLog	9 Jun 2006 23:27:59 -0000	1.7750
@@ -1,3 +1,11 @@
+2006-06-09  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/JComponent.java
+	(paintChildrenOptimized): Paint component with a new Graphics
+	object to protect the other painting code from modifications
+	done in that object, and avoid cleanup ops on possibly dispose()ed
+	Graphics object.
+
 2006-06-09  Sven de Marothy  <sven@physto.se>
 
 	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c



From MAILER-DAEMON Fri Jun 09 19:34:38 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoqUw-0007O3-HF
	for mharc-commit-classpath@gnu.org; Fri, 09 Jun 2006 19:34:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoqUu-0007Ns-Eo
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 19:34:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoqUt-0007Ng-RY
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 19:34:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoqUt-0007Nd-Ny
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 19:34:35 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Foqd2-0007AC-UT
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 19:43:01 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoqUt-00066d-00
	for <commit-classpath@gnu.org>; Fri, 09 Jun 2006 19:34:35 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FoqUt-00066a-1f
	for commit-classpath@gnu.org; Fri, 09 Jun 2006 23:34:35 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoqUt-00066a-1f@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Fri, 09 Jun 2006 23:34:35 +0000
Subject: [commit-cp] classpath/javax/swing JTabbedPane.java plaf/bas...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2006 23:34:36 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/09 23:34:34

Modified files:
	javax/swing    : JTabbedPane.java 
	javax/swing/plaf/basic: BasicTabbedPaneUI.java 
	.              : ChangeLog 

Log message:
	2006-06-09  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/JTabbedPane.java
		(setSelectedIndex): Don't change the visibility of the components,
		this is done by the UI class.
		* javax/swing/plaf/basic/BasicTabbedPaneUI.java
		(TabbedPaneLayout.layoutContainer): Change visibility of component
		here, depending on the selected index. Only do this if the new
		selected component is not null. Some programs seem to expect
		this.
		(visibleComponent): New field.
		(getVisibleComponent): Changed to return visibleComponent field.
		(setVisibleComponent): Changed to set the visibility of
		the old and new visible component.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JTabbedPane.java?cvsroot=classpath&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java?cvsroot=classpath&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7750&r2=1.7751

Patches:


Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7750
retrieving revision 1.7751
diff -u -b -r1.7750 -r1.7751
--- ChangeLog	9 Jun 2006 23:27:59 -0000	1.7750
+++ ChangeLog	9 Jun 2006 23:34:34 -0000	1.7751
@@ -1,5 +1,20 @@
 2006-06-09  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/JTabbedPane.java
+	(setSelectedIndex): Don't change the visibility of the components,
+	this is done by the UI class.
+	* javax/swing/plaf/basic/BasicTabbedPaneUI.java
+	(TabbedPaneLayout.layoutContainer): Change visibility of component
+	here, depending on the selected index. Only do this if the new
+	selected component is not null. Some programs seem to expect
+	this.
+	(visibleComponent): New field.
+	(getVisibleComponent): Changed to return visibleComponent field.
+	(setVisibleComponent): Changed to set the visibility of
+	the old and new visible component.
+
+2006-06-09  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/JComponent.java
 	(paintChildrenOptimized): Paint component with a new Graphics
 	object to protect the other painting code from modifications



From MAILER-DAEMON Sat Jun 10 03:49:20 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoyDg-00067Z-5F
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 03:49:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoyDe-000658-IR
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 03:49:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoyDc-00061p-Gt
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 03:49:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoyDc-00061J-4j
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 03:49:16 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoyLp-0001nj-Tn
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 03:57:46 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoyDb-0007ZH-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 03:49:15 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FoyDa-0007ZE-3v
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 07:49:15 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoyDa-0007ZE-3v@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Sat, 10 Jun 2006 07:49:14 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/metal MetalButtonUI....
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 07:49:18 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/10 07:49:13

Modified files:
	javax/swing/plaf/metal: MetalButtonUI.java 
	.              : ChangeLog 

Log message:
	2006-06-10  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/plaf/metal/MetalButtonUI.java
		(update): Fixed to paint the gradient under the correct conditions.
		(updateWidthGradient): Removed.
		(isToolbarButton): New helper method.
		(isDrawingGradient): New helper method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/metal/MetalButtonUI.java?cvsroot=classpath&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7751&r2=1.7752

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7751
retrieving revision 1.7752
diff -u -b -r1.7751 -r1.7752
--- ChangeLog	9 Jun 2006 23:34:34 -0000	1.7751
+++ ChangeLog	10 Jun 2006 07:49:12 -0000	1.7752
@@ -1,3 +1,17 @@
+2006-06-10  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/plaf/metal/MetalButtonUI.java
+	(update): Fixed to paint the gradient under the correct conditions.
+	(updateWidthGradient): Removed.
+	(isToolbarButton): New helper method.
+	(isDrawingGradient): New helper method.
+
+2006-06-09  Roman Kennke  <kennke@aicas.com>
+
+	* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
+	(VolatileImageGraphics): Call setup() here to initialize native
+	context.
+
 2006-06-09  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/JTabbedPane.java



From MAILER-DAEMON Sat Jun 10 03:53:57 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoyI9-0003Jt-Ec
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 03:53:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoyI7-0003Jo-QV
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 03:53:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoyI7-0003Jc-9O
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 03:53:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoyI7-0003JV-1E
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 03:53:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoyQL-0002Oh-0P
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 04:02:25 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoyI6-0007bW-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 03:53:54 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FoyI5-0007bT-20
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 07:53:54 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoyI5-0007bT-20@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Sat, 10 Jun 2006 07:53:53 +0000
Subject: [commit-cp] classpath/gnu/java/awt/peer/gtk VolatileImageGr...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 07:53:56 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/10 07:53:52

Modified files:
	gnu/java/awt/peer/gtk: VolatileImageGraphics.java 
	.              : ChangeLog 

Log message:
	2006-06-10  Roman Kennke  <kennke@aicas.com>
	
		* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
		(VolatileImageGraphics(VolatileImageGraphics)): Initialize native
		context correctly.
		(getRealBounds): Overridden to return the correct bounds.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7752&r2=1.7753

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7752
retrieving revision 1.7753
diff -u -b -r1.7752 -r1.7753
--- ChangeLog	10 Jun 2006 07:49:12 -0000	1.7752
+++ ChangeLog	10 Jun 2006 07:53:52 -0000	1.7753
@@ -1,5 +1,12 @@
 2006-06-10  Roman Kennke  <kennke@aicas.com>
 
+	* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
+	(VolatileImageGraphics(VolatileImageGraphics)): Initialize native
+	context correctly.
+	(getRealBounds): Overridden to return the correct bounds.
+
+2006-06-10  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/plaf/metal/MetalButtonUI.java
 	(update): Fixed to paint the gradient under the correct conditions.
 	(updateWidthGradient): Removed.
@@ -8,12 +15,6 @@
 
 2006-06-09  Roman Kennke  <kennke@aicas.com>
 
-	* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
-	(VolatileImageGraphics): Call setup() here to initialize native
-	context.
-
-2006-06-09  Roman Kennke  <kennke@aicas.com>
-
 	* javax/swing/JTabbedPane.java
 	(setSelectedIndex): Don't change the visibility of the components,
 	this is done by the UI class.



From MAILER-DAEMON Sat Jun 10 04:01:36 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FoyPY-0000Di-MK
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 04:01:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FoyPX-0000Dc-6s
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 04:01:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FoyPV-0000DP-Uq
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 04:01:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FoyPV-0000DM-Ps
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 04:01:33 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FoyXj-0002lO-Pe
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 04:10:03 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FoyPT-0007hY-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 04:01:31 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FoyPR-0007hU-NC
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 08:01:31 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FoyPR-0007hU-NC@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Sat, 10 Jun 2006 08:01:29 +0000
Subject: [commit-cp] classpath/javax/swing JComponent.java RepaintMa...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 08:01:35 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/10 08:01:28

Modified files:
	javax/swing    : JComponent.java RepaintManager.java 
	.              : ChangeLog 

Log message:
	006-06-10  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/RepaintManager.java
		(getVolatileOffscreenBuffer): Store the created buffer.
		* javax/swing/JComponent.java
		(paintDoubleBuffered): Try to use a volatile offscreen buffer
		for better performance.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.124&r2=1.125
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/RepaintManager.java?cvsroot=classpath&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7753&r2=1.7754

Patches:


Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7753
retrieving revision 1.7754
diff -u -b -r1.7753 -r1.7754
--- ChangeLog	10 Jun 2006 07:53:52 -0000	1.7753
+++ ChangeLog	10 Jun 2006 08:01:27 -0000	1.7754
@@ -1,5 +1,13 @@
 2006-06-10  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/RepaintManager.java
+	(getVolatileOffscreenBuffer): Store the created buffer.
+	* javax/swing/JComponent.java
+	(paintDoubleBuffered): Try to use a volatile offscreen buffer
+	for better performance.
+
+2006-06-10  Roman Kennke  <kennke@aicas.com>
+
 	* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
 	(VolatileImageGraphics(VolatileImageGraphics)): Initialize native
 	context correctly.



From MAILER-DAEMON Sat Jun 10 05:11:25 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FozV6-0003ff-Vo
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 05:11:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FozV5-0003fZ-BC
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 05:11:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FozV2-0003fK-Vu
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 05:11:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FozV2-0003fH-NG
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 05:11:20 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FozdH-0006gg-F4
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 05:19:51 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FozUm-000422-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 05:11:04 -0400
Received: from audriusa by savannah.gnu.org with local (Exim 4.50)
	id 1FozUj-00041n-0E
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 09:11:01 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FozUj-00041n-0E@savannah.gnu.org>
From: Audrius Meskauskas <audriusa@bluewin.ch>
Date: Sat, 10 Jun 2006 09:11:01 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/text/html/HTMLD...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 09:11:23 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Audrius Meskauskas <audriusa>	06/06/10 09:10:58

Modified files:
	.              : ChangeLog 
	javax/swing/text/html: HTMLDocument.java 

Log message:
	2006-06-10  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
	
		* javax/swing/text/html/HTMLDocument.java
		(HTMLReader.HiddenAction): Implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7754&r2=1.7755
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/HTMLDocument.java?cvsroot=classpath&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7754
retrieving revision 1.7755
diff -u -b -r1.7754 -r1.7755
--- ChangeLog	10 Jun 2006 08:01:27 -0000	1.7754
+++ ChangeLog	10 Jun 2006 09:10:48 -0000	1.7755
@@ -1,3 +1,8 @@
+2006-06-10  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
+	* javax/swing/text/html/HTMLDocument.java
+	(HTMLReader.HiddenAction): Implemented.
+
 2006-06-10  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/RepaintManager.java

Index: javax/swing/text/html/HTMLDocument.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/text/html/HTMLDocument.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- javax/swing/text/html/HTMLDocument.java	9 Jun 2006 12:51:24 -0000	1.32
+++ javax/swing/text/html/HTMLDocument.java	10 Jun 2006 09:10:58 -0000	1.33
@@ -648,17 +648,25 @@
       } 
     }
     
-    public class HiddenAction extends TagAction
+    /**
+     * This action indicates that the content between starting and closing HTML
+     * elements (like script - /script) should not be visible. The content is
+     * still inserted and can be accessed when iterating the HTML document. The
+     * parser will only fire
+     * {@link javax.swing.text.html.HTMLEditorKit.ParserCallback#handleText} for
+     * the hidden tags, regardless from that html tags the hidden section may
+     * contain.
+     */
+    public class HiddenAction
+        extends TagAction
     {
       /**
        * This method is called when a start tag is seen for one of the types
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
-        throws NotImplementedException
       {
-        // FIXME: Implement.
-        print ("HiddenAction.start not implemented");
+        blockOpen(t, a);
       }
       
       /**
@@ -666,10 +674,8 @@
        * with this Action.
        */
       public void end(HTML.Tag t)
-        throws NotImplementedException
       {
-        // FIXME: Implement.
-        print ("HiddenAction.end not implemented");
+        blockClose(t);
       } 
     }
     



From MAILER-DAEMON Sat Jun 10 05:18:45 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FozcD-0006Uw-CS
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 05:18:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FozcB-0006UB-TC
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 05:18:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FozcA-0006Tg-Rr
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 05:18:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FozcA-0006Ta-NK
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 05:18:42 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FozkP-00077u-Ll
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 05:27:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fozbv-000482-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 05:18:27 -0400
Received: from audriusa by savannah.gnu.org with local (Exim 4.50)
	id 1Fozbu-00047z-KB
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 09:18:27 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fozbu-00047z-KB@savannah.gnu.org>
From: Audrius Meskauskas <audriusa@bluewin.ch>
Date: Sat, 10 Jun 2006 09:18:26 +0000
Subject: [commit-cp] classpath/javax/swing/text DefaultStyledDocumen...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 09:18:44 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Audrius Meskauskas <audriusa>	06/06/10 09:18:26

Modified files:
	javax/swing/text: DefaultStyledDocument.java 
	.              : ChangeLog 

Log message:
	2006-06-09  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
	
		PR 27973
		* javax/swing/text/DefaultStyledDocument.java 
		(ElementBuffer.insertContentTag):
		Do not recreate leaves and do not remove elements here. 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/DefaultStyledDocument.java?cvsroot=classpath&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7755&r2=1.7756

Patches:

Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7755
retrieving revision 1.7756
diff -u -b -r1.7755 -r1.7756
--- ChangeLog	10 Jun 2006 09:10:48 -0000	1.7755
+++ ChangeLog	10 Jun 2006 09:18:25 -0000	1.7756
@@ -1,3 +1,10 @@
+2006-06-09  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
+	PR 27973
+	* javax/swing/text/DefaultStyledDocument.java 
+	(ElementBuffer.insertContentTag):
+	Do not recreate leaves and do not remove elements here. 
+
 2006-06-10  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	* javax/swing/text/html/HTMLDocument.java



From MAILER-DAEMON Sat Jun 10 06:33:25 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fp0mT-0005sj-6h
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 06:33:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fp0mR-0005qR-Ls
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 06:33:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fp0mP-0005p0-SR
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 06:33:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fp0mP-0005od-J7
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 06:33:21 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fp0ue-0007QB-G5
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 06:41:53 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fp0mO-00032y-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 06:33:20 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fp0mN-00032v-7L
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 10:33:19 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fp0mN-00032v-7L@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Sat, 10 Jun 2006 10:33:19 +0000
Subject: [commit-cp] classpath ChangeLog include/gnu_java_awt_peer_g...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 10:33:24 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/10 10:33:18

Modified files:
	.              : ChangeLog 
	include        : gnu_java_awt_peer_gtk_CairoGraphics2D.h 
	                 gnu_java_awt_peer_gtk_CairoSurface.h 
	                 gnu_java_awt_peer_gtk_ComponentGraphics.h 
	                 gnu_java_awt_peer_gtk_GtkVolatileImage.h 
	native/jni/gtk-peer: cairographics2d.h 
	                     gnu_java_awt_peer_gtk_CairoGraphics2D.c 
	                     gnu_java_awt_peer_gtk_CairoSurface.c 
	                     gnu_java_awt_peer_gtk_ComponentGraphics.c 
	                     gnu_java_awt_peer_gtk_GtkVolatileImage.c 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java CairoSurface.java 
	                       CairoSurfaceGraphics.java 
	                       ComponentGraphics.java 
	                       GtkVolatileImage.java 

Log message:
	2006-06-10  Roman Kennke  <kennke@aicas.com>
	
		* gnu/java/awt/peer/gtk/CairoGraphics2D.java
		* gnu/java/awt/peer/gtk/CairoSurface.java
		* gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java
		* gnu/java/awt/peer/gtk/ComponentGraphics.java
		* gnu/java/awt/peer/gtk/GtkVolatileImage.java
		* native/jni/gtk-peer/cairographics2d.h
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
		Changed method signatures and calls to pass native pointers directly
		into the JNI code, in order to avoid costly lookups on each
		JNI call.
		* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,
		* include/gnu_java_awt_peer_gtk_CairoSurface.h,
		* include/gnu_java_awt_peer_gtk_ComponentGraphics.h,
		* include/gnu_java_awt_peer_gtk_GtkVolatileImage.h:
		Regenerated

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7756&r2=1.7757
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/cairographics2d.h?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c?cvsroot=classpath&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c?cvsroot=classpath&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoSurface.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java?cvsroot=classpath&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java?cvsroot=classpath&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7756
retrieving revision 1.7757
diff -u -b -r1.7756 -r1.7757
--- ChangeLog	10 Jun 2006 09:18:25 -0000	1.7756
+++ ChangeLog	10 Jun 2006 10:33:14 -0000	1.7757
@@ -1,4 +1,25 @@
-2006-06-09  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+2006-06-10  Roman Kennke  <kennke@aicas.com>
+
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
+	* gnu/java/awt/peer/gtk/CairoSurface.java
+	* gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java
+	* gnu/java/awt/peer/gtk/ComponentGraphics.java
+	* gnu/java/awt/peer/gtk/GtkVolatileImage.java
+	* native/jni/gtk-peer/cairographics2d.h
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
+	Changed method signatures and calls to pass native pointers directly
+	into the JNI code, in order to avoid costly lookups on each
+	JNI call.
+	* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,
+	* include/gnu_java_awt_peer_gtk_CairoSurface.h,
+	* include/gnu_java_awt_peer_gtk_ComponentGraphics.h,
+	* include/gnu_java_awt_peer_gtk_GtkVolatileImage.h:
+	Regenerated
+
+2006-06-10  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	PR 27973
 	* javax/swing/text/DefaultStyledDocument.java 

Index: include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	7 Jun 2006 09:40:54 -0000	1.3
+++ include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	10 Jun 2006 10:33:15 -0000	1.4
@@ -1,45 +1,229 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __gnu_java_awt_peer_gtk_CairoGraphics2D__
-#define __gnu_java_awt_peer_gtk_CairoGraphics2D__
-
 #include <jni.h>
+/* Header for class gnu_java_awt_peer_gtk_CairoGraphics2D */
 
+#ifndef _Included_gnu_java_awt_peer_gtk_CairoGraphics2D
+#define _Included_gnu_java_awt_peer_gtk_CairoGraphics2D
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
-
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_init (JNIEnv *env, jobject, jlong);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels (JNIEnv *env, jobject, jintArray, jint, jint, jint, jdoubleArray);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient (JNIEnv *env, jobject, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels (JNIEnv *env, jobject, jintArray, jint, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix (JNIEnv *env, jobject, jdoubleArray);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetOperator (JNIEnv *env, jobject, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetRGBAColor (JNIEnv *env, jobject, jdouble, jdouble, jdouble, jdouble);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFillRule (JNIEnv *env, jobject, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine (JNIEnv *env, jobject, jdouble, jint, jint, jdouble);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash (JNIEnv *env, jobject, jdoubleArray, jint, jdouble);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector (JNIEnv *env, jobject, jobject, jfloat, jfloat, jint, jintArray, jfloatArray);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo (JNIEnv *env, jobject, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle (JNIEnv *env, jobject, jdouble, jdouble, jdouble, jdouble);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoNewPath (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClosePath (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoMoveTo (JNIEnv *env, jobject, jdouble, jdouble);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo (JNIEnv *env, jobject, jdouble, jdouble);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoLineTo (JNIEnv *env, jobject, jdouble, jdouble);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo (JNIEnv *env, jobject, jdouble, jdouble);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo (JNIEnv *env, jobject, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter (JNIEnv *env, jobject, jint);
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    init
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_init
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    disposeNative
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    drawPixels
+ * Signature: (J[IIII[D)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels
+  (JNIEnv *, jobject, jlong, jintArray, jint, jint, jint, jdoubleArray);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    setGradient
+ * Signature: (JDDDDIIIIIIIIZ)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient
+  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    setTexturePixels
+ * Signature: (J[IIII)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels
+  (JNIEnv *, jobject, jlong, jintArray, jint, jint, jint);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoSetMatrix
+ * Signature: (J[D)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix
+  (JNIEnv *, jobject, jlong, jdoubleArray);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoSetOperator
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetOperator
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoSetRGBAColor
+ * Signature: (JDDDD)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetRGBAColor
+  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoSetFillRule
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFillRule
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoSetLine
+ * Signature: (JDIID)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine
+  (JNIEnv *, jobject, jlong, jdouble, jint, jint, jdouble);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoSetDash
+ * Signature: (J[DID)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash
+  (JNIEnv *, jobject, jlong, jdoubleArray, jint, jdouble);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoDrawGlyphVector
+ * Signature: (JLgnu/java/awt/peer/gtk/GdkFontPeer;FFI[I[F)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector
+  (JNIEnv *, jobject, jlong, jobject, jfloat, jfloat, jint, jintArray, jfloatArray);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoRelCurveTo
+ * Signature: (JDDDDDD)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo
+  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoRectangle
+ * Signature: (JDDDD)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle
+  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoNewPath
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoNewPath
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoClosePath
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClosePath
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoMoveTo
+ * Signature: (JDD)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoMoveTo
+  (JNIEnv *, jobject, jlong, jdouble, jdouble);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoRelMoveTo
+ * Signature: (JDD)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo
+  (JNIEnv *, jobject, jlong, jdouble, jdouble);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoLineTo
+ * Signature: (JDD)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoLineTo
+  (JNIEnv *, jobject, jlong, jdouble, jdouble);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoRelLineTo
+ * Signature: (JDD)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo
+  (JNIEnv *, jobject, jlong, jdouble, jdouble);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoCurveTo
+ * Signature: (JDDDDDD)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo
+  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoStroke
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoFill
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoClip
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoPreserveClip
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoResetClip
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
+ * Method:    cairoSurfaceSetFilter
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter
+  (JNIEnv *, jobject, jlong, jint);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __gnu_java_awt_peer_gtk_CairoGraphics2D__ */
+#endif

Index: include/gnu_java_awt_peer_gtk_CairoSurface.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- include/gnu_java_awt_peer_gtk_CairoSurface.h	7 Jun 2006 09:40:54 -0000	1.3
+++ include/gnu_java_awt_peer_gtk_CairoSurface.h	10 Jun 2006 10:33:15 -0000	1.4
@@ -1,28 +1,107 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __gnu_java_awt_peer_gtk_CairoSurface__
-#define __gnu_java_awt_peer_gtk_CairoSurface__
-
 #include <jni.h>
+/* Header for class gnu_java_awt_peer_gtk_CairoSurface */
 
+#ifndef _Included_gnu_java_awt_peer_gtk_CairoSurface
+#define _Included_gnu_java_awt_peer_gtk_CairoSurface
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
-
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_create (JNIEnv *env, jobject, jint, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_destroy (JNIEnv *env, jobject);
-JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem (JNIEnv *env, jobject, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetElem (JNIEnv *env, jobject, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_drawSurface (JNIEnv *env, jobject, jobject, jdoubleArray);
-JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getPixels (JNIEnv *env, jobject, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_setPixels (JNIEnv *env, jobject, jintArray);
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer (JNIEnv *env, jobject, jint);
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_newCairoContext (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint, jint);
+#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_BYTE
+#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_BYTE 0L
+#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_USHORT
+#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_USHORT 1L
+#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_SHORT
+#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_SHORT 2L
+#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_INT
+#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_INT 3L
+#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_FLOAT
+#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_FLOAT 4L
+#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_DOUBLE
+#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_DOUBLE 5L
+#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_UNDEFINED
+#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_UNDEFINED 32L
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoSurface
+ * Method:    create
+ * Signature: (III)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_create
+  (JNIEnv *, jobject, jint, jint, jint);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoSurface
+ * Method:    destroy
+ * Signature: (JJ)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_destroy
+  (JNIEnv *, jobject, jlong, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoSurface
+ * Method:    nativeGetElem
+ * Signature: (JI)I
+ */
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoSurface
+ * Method:    nativeSetElem
+ * Signature: (JII)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetElem
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoSurface
+ * Method:    nativeDrawSurface
+ * Signature: (JJ[D)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface
+  (JNIEnv *, jobject, jlong, jlong, jdoubleArray);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoSurface
+ * Method:    nativeGetPixels
+ * Signature: (JI)[I
+ */
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetPixels
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoSurface
+ * Method:    nativeSetPixels
+ * Signature: (J[I)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetPixels
+  (JNIEnv *, jobject, jlong, jintArray);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoSurface
+ * Method:    getFlippedBuffer
+ * Signature: (JI)J
+ */
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoSurface
+ * Method:    nativeNewCairoContext
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeNewCairoContext
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_CairoSurface
+ * Method:    copyAreaNative2
+ * Signature: (JIIIIIII)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __gnu_java_awt_peer_gtk_CairoSurface__ */
+#endif

Index: include/gnu_java_awt_peer_gtk_ComponentGraphics.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- include/gnu_java_awt_peer_gtk_ComponentGraphics.h	7 Jun 2006 09:40:54 -0000	1.5
+++ include/gnu_java_awt_peer_gtk_ComponentGraphics.h	10 Jun 2006 10:33:15 -0000	1.6
@@ -1,26 +1,77 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __gnu_java_awt_peer_gtk_ComponentGraphics__
-#define __gnu_java_awt_peer_gtk_ComponentGraphics__
-
 #include <jni.h>
+/* Header for class gnu_java_awt_peer_gtk_ComponentGraphics */
 
+#ifndef _Included_gnu_java_awt_peer_gtk_ComponentGraphics
+#define _Included_gnu_java_awt_peer_gtk_ComponentGraphics
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
-
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState (JNIEnv *env, jobject, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface (JNIEnv *env, jobject, jlong);
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile (JNIEnv *env, jobject, jlong, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing (JNIEnv *env, jobject);
-JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender (JNIEnv *env, jclass);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative (JNIEnv *env, jobject, jobject, jint, jint, jint, jint, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile (JNIEnv *env, jobject, jobject, jobject, jint, jint, jint, jint);
+/*
+ * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
+ * Method:    initState
+ * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;)J
+ */
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState
+  (JNIEnv *, jobject, jobject);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
+ * Method:    disposeSurface
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
+ * Method:    initFromVolatile
+ * Signature: (JII)J
+ */
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
+ * Method:    start_gdk_drawing
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
+ * Method:    end_gdk_drawing
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
+ * Method:    hasXRender
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
+ * Method:    copyAreaNative
+ * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;IIIIII)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative
+  (JNIEnv *, jobject, jobject, jint, jint, jint, jint, jint, jint);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
+ * Method:    drawVolatile
+ * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;JIIII)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile
+  (JNIEnv *, jobject, jobject, jlong, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __gnu_java_awt_peer_gtk_ComponentGraphics__ */
+#endif

Index: include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- include/gnu_java_awt_peer_gtk_GtkVolatileImage.h	6 Jun 2006 02:22:28 -0000	1.2
+++ include/gnu_java_awt_peer_gtk_GtkVolatileImage.h	10 Jun 2006 10:33:15 -0000	1.3
@@ -1,23 +1,69 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __gnu_java_awt_peer_gtk_GtkVolatileImage__
-#define __gnu_java_awt_peer_gtk_GtkVolatileImage__
-
 #include <jni.h>
+/* Header for class gnu_java_awt_peer_gtk_GtkVolatileImage */
 
+#ifndef _Included_gnu_java_awt_peer_gtk_GtkVolatileImage
+#define _Included_gnu_java_awt_peer_gtk_GtkVolatileImage
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
-
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, jobject, jobject, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy (JNIEnv *env, jobject);
-JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_getPixels (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_copyArea (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_drawVolatile (JNIEnv *env, jobject, jlong, jint, jint, jint, jint);
+#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_DEFAULT
+#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_DEFAULT 1L
+#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_FAST
+#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_FAST 2L
+#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_SMOOTH
+#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_SMOOTH 4L
+#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_REPLICATE
+#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_REPLICATE 8L
+#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_AREA_AVERAGING
+#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_AREA_AVERAGING 16L
+#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_OK
+#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_OK 0L
+#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_RESTORED
+#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_RESTORED 1L
+#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_INCOMPATIBLE
+#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_INCOMPATIBLE 2L
+/*
+ * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
+ * Method:    init
+ * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;II)J
+ */
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init
+  (JNIEnv *, jobject, jobject, jint, jint);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
+ * Method:    destroy
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
+ * Method:    nativeGetPixels
+ * Signature: (J)[I
+ */
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
+ * Method:    nativeCopyArea
+ * Signature: (JIIIIII)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint);
+
+/*
+ * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
+ * Method:    nativeDrawVolatile
+ * Signature: (JJIIII)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile
+  (JNIEnv *, jobject, jlong, jlong, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __gnu_java_awt_peer_gtk_GtkVolatileImage__ */
+#endif

Index: native/jni/gtk-peer/cairographics2d.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/cairographics2d.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- native/jni/gtk-peer/cairographics2d.h	31 May 2006 23:00:22 -0000	1.2
+++ native/jni/gtk-peer/cairographics2d.h	10 Jun 2006 10:33:16 -0000	1.3
@@ -113,7 +113,6 @@
   char *pattern_pixels;
 };
 
-cairo_t *cp_gtk_get_cairo_t(JNIEnv *env,
-			    jobject cairographics2dobj);
+cairo_t *cp_gtk_get_cairo_t(JNIEnv *env, jlong pointer);
 
 #endif

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	7 Jun 2006 09:40:54 -0000	1.7
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	10 Jun 2006 10:33:17 -0000	1.8
@@ -51,30 +51,15 @@
 
 static void install_font_peer(cairo_t *cr, struct peerfont *pfont);
 static void update_pattern_transform (struct cairographics2d *gr);
-static struct cairographics2d *getPointer(JNIEnv *env, jobject obj);
-
-static struct cairographics2d *
-getPointer(JNIEnv *env, jobject obj)
-{
-  jclass cls;
-  jlong value;
-  jfieldID nofid;
-  cls = (*env)->GetObjectClass( env, obj );
-  nofid = (*env)->GetFieldID( env, cls, "nativePointer", "J" );
-  value = (*env)->GetLongField( env, obj, nofid );
-  (*env)->DeleteLocalRef( env, cls );
-
-  return JLONG_TO_PTR(struct cairographics2d, value);
-}
 
 /**
  * Returns the cairo_t * associated with a CairoGraphics2D object,
  * This is used by GdkTextLayout.
  */
 cairo_t *cp_gtk_get_cairo_t(JNIEnv *env,
-			    jobject cairographics2dobj)
+			    jlong pointer)
 {
-  struct cairographics2d *gr = getPointer(env, cairographics2dobj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert(gr != NULL);
   return gr->cr;
 }
@@ -106,9 +91,9 @@
  */
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative
-  (JNIEnv *env, jobject obj)
+  (JNIEnv *env, jobject obj, jlong pointer)
 {
-  struct cairographics2d *gr = getPointer(env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
 
   if (gr == NULL)
     return;
@@ -136,7 +121,7 @@
  */
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient
-  (JNIEnv *env, jobject obj, 
+(JNIEnv *env, jobject obj, jlong pointer,
    jdouble x1, jdouble y1, 
    jdouble x2, jdouble y2,
    jint r1, jint g1, jint b1, jint a1,
@@ -147,7 +132,7 @@
   cairo_pattern_t* pattern;
   cairo_extend_t extend;
 
-  gr = getPointer (env, obj);
+  gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert( gr != NULL );
 
   pattern = cairo_pattern_create_linear(x1, y1, x2, y2);
@@ -169,12 +154,13 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels
-  (JNIEnv *env, jobject obj, jintArray jarr, jint w, jint h, jint stride)
+(JNIEnv *env, jobject obj, jlong pointer, jintArray jarr, jint w, jint h,
+ jint stride)
 {
   struct cairographics2d *gr = NULL;
   jint *jpixels = NULL;
 
-  gr = getPointer (env, obj);
+  gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   if (gr->pattern)
@@ -210,12 +196,12 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels 
-  (JNIEnv *env, jobject obj, jintArray java_pixels, 
+(JNIEnv *env, jobject obj, jlong pointer, jintArray java_pixels, 
    jint w, jint h, jint stride, jdoubleArray java_matrix)
 {
   jint *native_pixels = NULL;
   jdouble *native_matrix = NULL;
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   native_pixels = (*env)->GetIntArrayElements (env, java_pixels, NULL);
@@ -253,10 +239,12 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix
-   (JNIEnv *env, jobject obj, jdoubleArray java_matrix)
+   (JNIEnv *env, jobject obj, jlong pointer, jdoubleArray java_matrix)
 {
   jdouble *native_matrix = NULL;
-  struct cairographics2d *gr = getPointer (env, obj);
+  g_assert (obj != NULL);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
+  g_assert (gr != NULL);
 
   native_matrix = (*env)->GetDoubleArrayElements (env, java_matrix, NULL);  
   g_assert (native_matrix != NULL);
@@ -270,6 +258,7 @@
                        native_matrix[0], native_matrix[1],
                        native_matrix[2], native_matrix[3],
                        native_matrix[4], native_matrix[5]);
+    g_assert (gr != NULL);
     cairo_set_matrix (gr->cr, &mat);
   }
 
@@ -279,7 +268,7 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector
-   (JNIEnv *env, jobject obj, 
+(JNIEnv *env, jobject obj, jlong pointer,
     jobject font,
     jfloat x, jfloat y, jint n,
     jintArray java_codes,
@@ -297,7 +286,7 @@
   g_assert (java_codes != NULL);
   g_assert (java_positions != NULL);
 
-  gr = getPointer (env, obj);
+  gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, font);
@@ -329,9 +318,9 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetOperator 
-   (JNIEnv *env, jobject obj, jint op)
+   (JNIEnv *env, jobject obj, jlong pointer, jint op)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   switch ((enum java_awt_alpha_composite_rule) op)
@@ -388,9 +377,10 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetRGBAColor
-   (JNIEnv *env, jobject obj, jdouble r, jdouble g, jdouble b, jdouble a)
+(JNIEnv *env, jobject obj, jlong pointer, jdouble r, jdouble g, jdouble b,
+ jdouble a)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   cairo_set_source_rgba (gr->cr, r, g, b, a);
@@ -398,9 +388,9 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFillRule 
-   (JNIEnv *env, jobject obj, jint rule)
+   (JNIEnv *env, jobject obj, jlong pointer, jint rule)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   switch ((enum java_awt_geom_path_iterator_winding_rule) rule)
@@ -419,9 +409,10 @@
  */
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine
-  (JNIEnv *env, jobject obj, jdouble width, int cap, int join, double miterLimit)
+(JNIEnv *env, jobject obj, jlong pointer, jdouble width, int cap, int join,
+ double miterLimit)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   /* set width */
@@ -468,10 +459,11 @@
  */ 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash
-   (JNIEnv *env, jobject obj, jdoubleArray dashes, jint ndash, jdouble offset)
+(JNIEnv *env, jobject obj, jlong pointer, jdoubleArray dashes, jint ndash,
+ jdouble offset)
 {
   jdouble *dasharr = NULL;
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   dasharr = (*env)->GetDoubleArrayElements (env, dashes, NULL);  
@@ -484,9 +476,9 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoNewPath 
-   (JNIEnv *env, jobject obj)
+   (JNIEnv *env, jobject obj, jlong pointer)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   cairo_new_path (gr->cr);
@@ -494,9 +486,9 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoMoveTo 
-   (JNIEnv *env, jobject obj, jdouble x, jdouble y)
+   (JNIEnv *env, jobject obj, jlong pointer, jdouble x, jdouble y)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   cairo_move_to (gr->cr, x, y);
@@ -504,9 +496,9 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoLineTo 
-   (JNIEnv *env, jobject obj, jdouble x, jdouble y)
+(JNIEnv *env, jobject obj, jlong pointer, jdouble x, jdouble y)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   cairo_line_to (gr->cr, x, y);
@@ -514,18 +506,19 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo 
-   (JNIEnv *env, jobject obj, jdouble x1, jdouble y1, jdouble x2, jdouble y2, jdouble x3, jdouble y3)
+(JNIEnv *env, jobject obj, jlong pointer, jdouble x1, jdouble y1,
+ jdouble x2, jdouble y2, jdouble x3, jdouble y3)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
   cairo_curve_to (gr->cr, x1, y1, x2, y2, x3, y3);
 }
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo 
-   (JNIEnv *env, jobject obj, jdouble dx, jdouble dy)
+   (JNIEnv *env, jobject obj, jlong pointer, jdouble dx, jdouble dy)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   cairo_rel_move_to (gr->cr, dx, dy);
@@ -533,9 +526,9 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo 
-   (JNIEnv *env, jobject obj, jdouble dx, jdouble dy)
+   (JNIEnv *env, jobject obj, jlong pointer, jdouble dx, jdouble dy)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   cairo_rel_line_to (gr->cr, dx, dy);
@@ -543,9 +536,10 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo 
-   (JNIEnv *env, jobject obj, jdouble dx1, jdouble dy1, jdouble dx2, jdouble dy2, jdouble dx3, jdouble dy3)
+(JNIEnv *env, jobject obj, jlong pointer, jdouble dx1, jdouble dy1,
+ jdouble dx2, jdouble dy2, jdouble dx3, jdouble dy3)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   cairo_rel_curve_to (gr->cr, dx1, dy1, dx2, dy2, dx3, dy3);
@@ -553,18 +547,19 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle 
-   (JNIEnv *env, jobject obj, jdouble x, jdouble y, jdouble width, jdouble height)
+(JNIEnv *env, jobject obj, jlong pointer, jdouble x, jdouble y,
+ jdouble width, jdouble height)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
 
   cairo_rectangle (gr->cr, x, y, width, height);
 }
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClosePath 
-   (JNIEnv *env, jobject obj)
+   (JNIEnv *env, jobject obj, jlong pointer)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   cairo_close_path (gr->cr);
@@ -572,9 +567,9 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke 
-   (JNIEnv *env, jobject obj)
+   (JNIEnv *env, jobject obj, jlong pointer)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   cairo_stroke (gr->cr);
@@ -582,9 +577,9 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill 
-   (JNIEnv *env, jobject obj)
+(JNIEnv *env, jobject obj, jlong pointer)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   cairo_fill (gr->cr);
@@ -592,9 +587,9 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip 
-   (JNIEnv *env, jobject obj)
+(JNIEnv *env, jobject obj, jlong pointer)
 {
-  struct cairographics2d *gr = getPointer( env, obj );
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert( gr != NULL );
 
   cairo_clip( gr->cr );
@@ -602,9 +597,9 @@
 
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip 
-  (JNIEnv *env, jobject obj)
+(JNIEnv *env, jobject obj, jlong pointer)
 {
-  struct cairographics2d *gr = getPointer( env, obj );
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   cairo_reset_clip( gr->cr );
@@ -612,9 +607,9 @@
 
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip 
-(JNIEnv *env, jobject obj)
+(JNIEnv *env, jobject obj, jlong pointer)
 {
-  struct cairographics2d *gr = getPointer( env, obj );
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
   cairo_clip_preserve( gr->cr );
@@ -622,9 +617,9 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter
-   (JNIEnv *env, jobject obj, jint filter)
+   (JNIEnv *env, jobject obj, jlong pointer, jint filter)
 {
-  struct cairographics2d *gr = getPointer (env, obj);
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
   
   if (gr->pattern == NULL)

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c	7 Jun 2006 09:40:54 -0000	1.16
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c	10 Jun 2006 10:33:17 -0000	1.17
@@ -50,7 +50,6 @@
 #define BUFFER "bufferPointer"
 
 /* prototypes */
-static void *getNativeObject( JNIEnv *env, jobject obj, const char *pointer );
 static void setNativeObject( JNIEnv *env, jobject obj, void *ptr, const char *pointer );
 
 /**
@@ -74,14 +73,15 @@
  * Destroy the surface
  */
 JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_CairoSurface_destroy (JNIEnv *env, jobject obj)
+Java_gnu_java_awt_peer_gtk_CairoSurface_destroy
+(JNIEnv *env, jobject obj, jlong surfacePointer, jlong bufferPointer)
 {
   void *buffer;
-  cairo_surface_t* surface = (cairo_surface_t *)getNativeObject(env, obj, SURFACE);
+  cairo_surface_t* surface = JLONG_TO_PTR(void, surfacePointer);
   if( surface != NULL )
     cairo_surface_destroy(surface);
 
-  buffer = getNativeObject(env, obj, BUFFER);
+  buffer = JLONG_TO_PTR(void, bufferPointer);
   if( buffer != NULL )
     g_free(buffer);
 }
@@ -90,9 +90,10 @@
  * Gets a pixel
  */
 JNIEXPORT jint JNICALL 
-Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem (JNIEnv *env, jobject obj, jint i)
+Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem
+(JNIEnv *env, jobject obj, jlong bufferPointer, jint i)
 {
-  jint *pixeldata = (jint *)getNativeObject(env, obj, BUFFER);
+  jint *pixeldata = JLONG_TO_PTR(void, bufferPointer);
 
   if( pixeldata == NULL )
     return 0;
@@ -105,9 +106,9 @@
  */
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetElem 
-(JNIEnv *env, jobject obj, jint i, jint val)
+(JNIEnv *env, jobject obj, jlong bufferPointer, jint i, jint val)
 {
-  jint *pixeldata = (jint *)getNativeObject(env, obj, BUFFER);
+  jint *pixeldata = JLONG_TO_PTR(void, bufferPointer);
 
   if( pixeldata == NULL )
     return;
@@ -119,13 +120,13 @@
  * Gets all pixels in an array
  */
 JNIEXPORT jintArray JNICALL 
-Java_gnu_java_awt_peer_gtk_CairoSurface_getPixels
-(JNIEnv *env, jobject obj, int size)
+Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetPixels
+(JNIEnv *env, jobject obj, jlong bufferPointer, int size)
 {
   jint *pixeldata, *jpixdata;
   jintArray jpixels;
 
-  pixeldata = (jint *)getNativeObject(env, obj, BUFFER);
+  pixeldata = JLONG_TO_PTR(void, bufferPointer);
   g_assert(pixeldata != NULL);
 
   jpixels = (*env)->NewIntArray (env, size);
@@ -140,8 +141,8 @@
  * Sets all pixels by an array.
  */
 JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_CairoSurface_setPixels
-(JNIEnv *env, jobject obj, jintArray jpixels)
+Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetPixels
+(JNIEnv *env, jobject obj, jlong bufferPointer, jintArray jpixels)
 {
   jint *pixeldata, *jpixdata;
   int size;
@@ -161,7 +162,7 @@
   g_assert (field != 0);
   height = (*env)->GetIntField (env, obj, field);
 
-  pixeldata = (jint *)getNativeObject(env, obj, BUFFER);
+  pixeldata = JLONG_TO_PTR(void, bufferPointer);
   g_assert(pixeldata != NULL);
   
   jpixdata = (*env)->GetIntArrayElements (env, jpixels, NULL);
@@ -174,12 +175,13 @@
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_CairoSurface_drawSurface 
-   (JNIEnv *env, jobject obj, jobject context, jdoubleArray java_matrix)
+Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface 
+(JNIEnv *env, jobject obj, jlong surfacePointer, jlong context,
+ jdoubleArray java_matrix)
 {
   cairo_t *cr;
   jdouble *native_matrix = NULL;
-  cairo_surface_t* surface = (cairo_surface_t *)getNativeObject(env, obj, SURFACE);
+  cairo_surface_t* surface = JLONG_TO_PTR(void, surfacePointer);
   g_assert(surface != NULL);
 
   cr = cp_gtk_get_cairo_t(env, context);
@@ -211,10 +213,10 @@
 
 JNIEXPORT jlong JNICALL 
 Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer 
-(JNIEnv *env, jobject obj, jint size)
+(JNIEnv *env, jobject obj, jlong bufferPointer, jint size)
 {
   jint *dst;
-  jint *src = (jint *)getNativeObject(env, obj, BUFFER);
+  jint *src = JLONG_TO_PTR(void, bufferPointer);
   int i;
   int t;
 
@@ -236,9 +238,10 @@
  * Create and return a cairo context for drawing to the surface.
  */
 JNIEXPORT jlong JNICALL 
-Java_gnu_java_awt_peer_gtk_CairoSurface_newCairoContext (JNIEnv *env, jobject obj)
+Java_gnu_java_awt_peer_gtk_CairoSurface_nativeNewCairoContext
+(JNIEnv *env, jobject obj, jlong surfacePointer)
 {
-  cairo_surface_t* surface = (cairo_surface_t *)getNativeObject(env, obj, SURFACE);
+  cairo_surface_t* surface = JLONG_TO_PTR(cairo_surface_t, surfacePointer);
   cairo_t *ptr;
   g_assert(surface != NULL);
   ptr = cairo_create(surface);
@@ -251,17 +254,14 @@
  * copyArea.
  */
 JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative (JNIEnv *env, 
-							jobject obj, 
-							jint x, jint y, 
-							jint w, jint h, 
-							jint dx, jint dy, 
-							jint stride)
+Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative2
+(JNIEnv *env, jobject obj, jlong bufferPointer,
+ jint x, jint y, jint w, jint h, jint dx, jint dy, jint stride)
 {
   int row;
   int srcOffset, dstOffset;
   jint *temp;
-  jint *pixeldata = (jint *)getNativeObject(env, obj, BUFFER);
+  jint *pixeldata = JLONG_TO_PTR(jint, bufferPointer);
   g_assert( pixeldata != NULL );
 
   temp = g_malloc( h * w * 4 );
@@ -294,19 +294,3 @@
   (*env)->SetLongField( env, obj, nofid, value );
   (*env)->DeleteLocalRef( env, cls );
 }
-
-/**
- * Gets the native object field.
- */
-static void *
-getNativeObject( JNIEnv *env, jobject obj, const char *pointer )
-{
-  jclass cls;
-  jlong value;
-  jfieldID nofid;
-  cls = (*env)->GetObjectClass( env, obj );
-  nofid = (*env)->GetFieldID( env, cls, pointer, "J" );
-  value = (*env)->GetLongField( env, obj, nofid );
-  (*env)->DeleteLocalRef( env, cls );
-  return JLONG_TO_PTR(void, value);
-}

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	9 Jun 2006 22:08:08 -0000	1.15
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	10 Jun 2006 10:33:17 -0000	1.16
@@ -279,7 +279,7 @@
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile
 (JNIEnv *env, jobject obj __attribute__ ((unused)), jobject peer, 
- jobject img, jint x, jint y, jint w, jint h)
+ jlong img, jint x, jint y, jint w, jint h)
 {
   GdkPixmap *pixmap;
   GtkWidget *widget = NULL;
@@ -293,7 +293,7 @@
   widget = GTK_WIDGET (ptr);
   g_assert (widget != NULL);
 
-  pixmap = cp_gtk_get_pixmap( env, img );
+  pixmap = JLONG_TO_PTR(GdkPixmap, img);
  
   gc = gdk_gc_new(widget->window);
   gdk_draw_drawable(widget->window,

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c	6 Jun 2006 02:22:29 -0000	1.3
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c	10 Jun 2006 10:33:17 -0000	1.4
@@ -47,11 +47,6 @@
 #include "gnu_java_awt_peer_gtk_GtkVolatileImage.h"
 #include "cairographics2d.h"
 
-/* prototypes */
-static void *getNativeObject( JNIEnv *env, jobject obj );
-/* static void setNativeObject( JNIEnv *env, jobject obj, void *ptr ); */
-
-GdkPixmap *cp_gtk_get_pixmap( JNIEnv *env, jobject obj);
 
 /**
  * Creates a cairo surface, ARGB32, native ordering, premultiplied alpha.
@@ -91,9 +86,10 @@
  * Destroy the surface
  */
 JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy (JNIEnv *env, jobject obj)
+Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy
+(JNIEnv *env, jobject obj, jlong pointer)
 {
-  GdkPixmap* pixmap = getNativeObject(env, obj);
+  GdkPixmap* pixmap = JLONG_TO_PTR(GdkPixmap, pointer);
   if( pixmap != NULL )
     {
       gdk_threads_enter();
@@ -106,8 +102,8 @@
  * Gets all pixels in an array
  */
 JNIEXPORT jintArray JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkVolatileImage_getPixels
-(JNIEnv *env, jobject obj)
+Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels
+(JNIEnv *env, jobject obj, jlong pointer)
 {
   /* jint *pixeldata, *jpixdata; */
   jint *jpixdata;
@@ -126,7 +122,7 @@
   g_assert (field != 0);
   height = (*env)->GetIntField (env, obj, field);
 
-  pixmap = GDK_PIXMAP(getNativeObject(env, obj));
+  pixmap = JLONG_TO_PTR(GdkPixmap, pointer);
   g_assert(pixmap != NULL);
 
   gdk_threads_enter();
@@ -149,11 +145,12 @@
  * Copy area
  */
 JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkVolatileImage_copyArea
-(JNIEnv *env, jobject obj, jint x, jint y, jint w, jint h, jint dx, jint dy)
+Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea
+(JNIEnv *env, jobject obj, jlong pointer, jint x, jint y, jint w, jint h,
+ jint dx, jint dy)
 {
   GdkPixbuf *pixbuf;
-  GdkPixmap* pixmap = getNativeObject(env, obj);
+  GdkPixmap* pixmap = JLONG_TO_PTR(GdkPixmap, pointer);
 
   g_assert (pixmap != NULL);
 
@@ -169,14 +166,15 @@
 }
 
 JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkVolatileImage_drawVolatile
-(JNIEnv *env, jobject obj, jlong ptr, jint x, jint y, jint w, jint h)
+Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile
+(JNIEnv *env, jobject obj, jlong pointer, jlong srcptr, jint x, jint y, jint w,
+ jint h)
 {
   GdkPixmap *dst, *src;
   GdkGC *gc;
 
-  src = JLONG_TO_PTR(GdkPixmap, ptr);
-  dst = getNativeObject(env, obj);
+  src = JLONG_TO_PTR(GdkPixmap, srcptr);
+  dst = JLONG_TO_PTR(GdkPixmap, pointer);
   g_assert (src != NULL);
   g_assert (dst != NULL);
 
@@ -194,23 +192,3 @@
   gdk_threads_leave();
 }
 
-GdkPixmap *cp_gtk_get_pixmap( JNIEnv *env, jobject obj)
-{
-  return (GdkPixmap *)getNativeObject(env, obj);
-}
-
-/**
- * Gets the native object field.
- */
-static void *
-getNativeObject( JNIEnv *env, jobject obj )
-{
-  jclass cls;
-  jlong value;
-  jfieldID nofid;
-  cls = (*env)->GetObjectClass( env, obj );
-  nofid = (*env)->GetFieldID( env, cls, "nativePointer", "J" );
-  value = (*env)->GetLongField( env, obj, nofid );
-  (*env)->DeleteLocalRef( env, cls );
-  return JLONG_TO_PTR(void, value);
-}

Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java	9 Jun 2006 20:40:59 -0000	1.17
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java	10 Jun 2006 10:33:17 -0000	1.18
@@ -38,14 +38,12 @@
 
 package gnu.java.awt.peer.gtk;
 
-import gnu.classpath.Configuration;
 import gnu.java.awt.ClasspathToolkit;
 
 import java.awt.AlphaComposite;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Composite;
-import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.GradientPaint;
@@ -68,7 +66,6 @@
 import java.awt.geom.Arc2D;
 import java.awt.geom.Area;
 import java.awt.geom.Line2D;
-import java.awt.geom.GeneralPath;
 import java.awt.geom.NoninvertibleTransformException;
 import java.awt.geom.PathIterator;
 import java.awt.geom.Point2D;
@@ -78,11 +75,9 @@
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferedImageOp;
 import java.awt.image.ColorModel;
-import java.awt.image.CropImageFilter;
 import java.awt.image.DataBuffer;
 import java.awt.image.DataBufferInt;
 import java.awt.image.DirectColorModel;
-import java.awt.image.FilteredImageSource;
 import java.awt.image.ImageObserver;
 import java.awt.image.ImagingOpException;
 import java.awt.image.MultiPixelPackedSampleModel;
@@ -95,7 +90,6 @@
 import java.text.AttributedCharacterIterator;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Stack;
 
 /**
  * This is an abstract implementation of Graphics2D on Cairo. 
@@ -277,7 +271,7 @@
    */
   public void dispose()
   {    
-    disposeNative();
+    disposeNative(nativePointer);
     nativePointer = 0;
   }
 
@@ -305,7 +299,7 @@
   /**
    * Dispose of allocate native resouces.
    */
-  public native void disposeNative();
+  public native void disposeNative(long pointer);
 
   /**
    * Draw pixels as an RGBA int matrix
@@ -313,119 +307,125 @@
    * @param stride - stride of the array width
    * @param i2u - affine transform array
    */
-  private native void drawPixels(int[] pixels, int w, int h, int stride,
-                                 double[] i2u);
+  private native void drawPixels(long pointer, int[] pixels, int w, int h,
+                                 int stride, double[] i2u);
 
-  private native void setGradient(double x1, double y1, double x2, double y2,
+  private native void setGradient(long pointer, double x1, double y1,
+                                  double x2, double y2,
                                   int r1, int g1, int b1, int a1, int r2,
                                   int g2, int b2, int a2, boolean cyclic);
   
-  private native void setTexturePixels(int[] pixels, int w, int h, int stride);
+  private native void setTexturePixels(long pointer, int[] pixels, int w,
+                                       int h, int stride);
 
   /**
    * Set the current transform matrix
    */
-  private native void cairoSetMatrix(double[] m);
+  private native void cairoSetMatrix(long pointer, double[] m);
 
   /**
    * Set the compositing operator
    */
-  private native void cairoSetOperator(int cairoOperator);
+  private native void cairoSetOperator(long pointer, int cairoOperator);
 
   /**
    * Sets the current color in RGBA as a 0.0-1.0 double
    */
-  private native void cairoSetRGBAColor(double red, double green,
+  private native void cairoSetRGBAColor(long pointer, double red, double green,
                                         double blue, double alpha);
 
   /**
    * Sets the current winding rule in Cairo
    */
-  private native void cairoSetFillRule(int cairoFillRule);
+  private native void cairoSetFillRule(long pointer, int cairoFillRule);
 
   /**
    * Set the line style, cap, join and miter limit.
    * Cap and join parameters are in the BasicStroke enumerations.
    */
-  private native void cairoSetLine(double width, int cap, int join, double miterLimit);
+  private native void cairoSetLine(long pointer, double width, int cap,
+                                   int join, double miterLimit);
 
   /**
    * Set the dash style
    */
-  private native void cairoSetDash(double[] dashes, int ndash, double offset);
+  private native void cairoSetDash(long pointer, double[] dashes, int ndash,
+                                   double offset);
 
   /*
    * Draws a Glyph Vector
    */
-  native void cairoDrawGlyphVector(GdkFontPeer font, 
+  native void cairoDrawGlyphVector(long pointer, GdkFontPeer font, 
                                    float x, float y, int n, 
                                    int[] codes, float[] positions);
 
 
-  private native void cairoRelCurveTo(double dx1, double dy1, double dx2,
-                                      double dy2, double dx3, double dy3);
+  private native void cairoRelCurveTo(long pointer, double dx1, double dy1,
+                                      double dx2, double dy2, double dx3,
+                                      double dy3);
 
   /**
    * Appends a rectangle to the current path
    */
-  private native void cairoRectangle(double x, double y, double width,
-                                     double height);
+  private native void cairoRectangle(long pointer, double x, double y,
+                                     double width, double height);
 
   /**
    * New current path
    */
-  private native void cairoNewPath();
+  private native void cairoNewPath(long pointer);
 
   /** 
    * Close current path
    */
-  private native void cairoClosePath();
+  private native void cairoClosePath(long pointer);
 
   /** moveTo */
-  private native void cairoMoveTo(double x, double y);
+  private native void cairoMoveTo(long pointer, double x, double y);
 
   /** relative moveTo */
-  private native void cairoRelMoveTo(double dx, double dy);
+  private native void cairoRelMoveTo(long pointer, double dx, double dy);
 
   /** lineTo */
-  private native void cairoLineTo(double x, double y);
+  private native void cairoLineTo(long pointer, double x, double y);
 
   /** relative lineTo */
-  private native void cairoRelLineTo(double dx, double dy);
+  private native void cairoRelLineTo(long pointer, double dx, double dy);
 
   /** Cubic curve-to */
-  private native void cairoCurveTo(double x1, double y1, double x2, double y2,
+  private native void cairoCurveTo(long pointer, double x1, double y1,
+                                   double x2, double y2,
                                    double x3, double y3);
 
   /**
    * Stroke current path
    */
-  private native void cairoStroke();
+  private native void cairoStroke(long pointer);
 
   /**
    * Fill current path
    */
-  private native void cairoFill();
+  private native void cairoFill(long pointer);
 
   /** 
    * Clip current path
    */
-  private native void cairoClip();
+  private native void cairoClip(long pointer);
 
   /** 
    * Save clip
    */
-  private native void cairoPreserveClip();
+  private native void cairoPreserveClip(long pointer);
 
   /** 
    * Save clip
    */
-  private native void cairoResetClip();
+  private native void cairoResetClip(long pointer);
 
   /**
    * Set interpolation types
    */
-  private native void cairoSurfaceSetFilter(int filter);
+  private native void cairoSurfaceSetFilter(long pointer, int filter);
 
   ///////////////////////// TRANSFORMS ///////////////////////////////////
   /**
@@ -438,7 +438,7 @@
       {
 	double[] m = new double[6];
 	transform.getMatrix(m);
-	cairoSetMatrix(m);
+	cairoSetMatrix(nativePointer, m);
       }
   }
   
@@ -539,7 +539,7 @@
       clip = originalClip;
     
     // This is so common, let's optimize this. 
-    else if (clip instanceof Rectangle2D && s instanceof Rectangle2D)
+    if (clip instanceof Rectangle2D && s instanceof Rectangle2D)
       {
         Rectangle2D clipRect = (Rectangle2D) clip;
         Rectangle2D r = (Rectangle2D) s;
@@ -604,7 +604,7 @@
 	AffineTransformOp op = new AffineTransformOp(at, getRenderingHints());
 	BufferedImage texture = op.filter(img, null);
 	int[] pixels = texture.getRGB(0, 0, width, height, null, 0, width);
-	setTexturePixels(pixels, width, height, width);
+	setTexturePixels(nativePointer, pixels, width, height, width);
       }
     else if (paint instanceof GradientPaint)
       {
@@ -613,9 +613,10 @@
 	Point2D p2 = gp.getPoint2();
 	Color c1 = gp.getColor1();
 	Color c2 = gp.getColor2();
-	setGradient(p1.getX(), p1.getY(), p2.getX(), p2.getY(), c1.getRed(),
-	            c1.getGreen(), c1.getBlue(), c1.getAlpha(), c2.getRed(),
-	            c2.getGreen(), c2.getBlue(), c2.getAlpha(), gp.isCyclic());
+	setGradient(nativePointer, p1.getX(), p1.getY(), p2.getX(), p2.getY(),
+                    c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha(),
+                    c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha(),
+                    gp.isCyclic());
       }
     else
       throw new java.lang.UnsupportedOperationException();
@@ -632,7 +633,7 @@
     if (stroke instanceof BasicStroke)
       {
 	BasicStroke bs = (BasicStroke) stroke;
-	cairoSetLine(bs.getLineWidth(), bs.getEndCap(), 
+	cairoSetLine(nativePointer, bs.getLineWidth(), bs.getEndCap(), 
 		     bs.getLineJoin(), bs.getMiterLimit());
 
 	float[] dashes = bs.getDashArray();
@@ -641,11 +642,11 @@
 	    double[] double_dashes = new double[dashes.length];
 	    for (int i = 0; i < dashes.length; i++)
 	      double_dashes[i] = dashes[i];
-	    cairoSetDash(double_dashes, double_dashes.length,
+	    cairoSetDash(nativePointer, double_dashes, double_dashes.length,
 	                 (double) bs.getDashPhase());
 	  }
 	else
-	  cairoSetDash(new double[0], 0, 0.0);
+	  cairoSetDash(nativePointer, new double[0], 0, 0.0);
       }
   }
 
@@ -676,8 +677,9 @@
   {
     if (fg == null)
       fg = Color.BLACK;
-    cairoSetRGBAColor(fg.getRed() / 255.0, fg.getGreen() / 255.0,
-                      fg.getBlue() / 255.0, fg.getAlpha() / 255.0);
+    cairoSetRGBAColor(nativePointer, fg.getRed() / 255.0,
+                      fg.getGreen() / 255.0,fg.getBlue() / 255.0,
+                      fg.getAlpha() / 255.0);
   }
 
   public Color getColor()
@@ -750,19 +752,19 @@
       clip = originalClip;
     else
       clip = s;
+    cairoResetClip(nativePointer);
 
-    cairoResetClip();
-
-    cairoNewPath();
+    cairoNewPath(nativePointer);
     if (clip instanceof Rectangle2D)
       {
 	Rectangle2D r = (Rectangle2D) clip;
-	cairoRectangle(r.getX(), r.getY(), r.getWidth(), r.getHeight());
+	cairoRectangle(nativePointer, r.getX(), r.getY(), r.getWidth(),
+                       r.getHeight());
       }
     else
       walkPath(clip.getPathIterator(null), false);
     
-    cairoClip();
+    cairoClip(nativePointer);
   }
 
   public void setBackground(Color c)
@@ -798,7 +800,7 @@
     if (comp instanceof AlphaComposite)
       {
 	AlphaComposite a = (AlphaComposite) comp;
-	cairoSetOperator(a.getRule());
+	cairoSetOperator(nativePointer, a.getRule());
 	Color c = getColor();
 	setColor(new Color(c.getRed(), c.getGreen(), c.getBlue(),
 	                   (int) (a.getAlpha() * ((float) c.getAlpha()))));
@@ -820,32 +822,33 @@
 	return;
       }
 
-    cairoNewPath();
+    cairoNewPath(nativePointer);
 
     if (s instanceof Rectangle2D)
       {
 	Rectangle2D r = (Rectangle2D) s;
-	cairoRectangle(shifted(r.getX(), shiftDrawCalls),
+	cairoRectangle(nativePointer, shifted(r.getX(), shiftDrawCalls),
 	               shifted(r.getY(), shiftDrawCalls), r.getWidth(),
 	               r.getHeight());
       }
     else
       walkPath(s.getPathIterator(null), shiftDrawCalls);
-    cairoStroke();
+    cairoStroke(nativePointer);
   }
 
   public void fill(Shape s)
   {
-    cairoNewPath();
+    cairoNewPath(nativePointer);
     if (s instanceof Rectangle2D)
       {
 	Rectangle2D r = (Rectangle2D) s;
-	cairoRectangle(r.getX(), r.getY(), r.getWidth(), r.getHeight());
+	cairoRectangle(nativePointer, r.getX(), r.getY(), r.getWidth(),
+                       r.getHeight());
       }
     else
       walkPath(s.getPathIterator(null), false);
 
-    cairoFill();
+    cairoFill(nativePointer);
   }
 
   /**
@@ -857,8 +860,8 @@
   public void clearRect(int x, int y, int width, int height)
   {
     if (bg != null)
-      cairoSetRGBAColor(bg.getRed() / 255.0, bg.getGreen() / 255.0,
-			bg.getBlue() / 255.0, 1.0);
+      cairoSetRGBAColor(nativePointer, bg.getRed() / 255.0,
+                        bg.getGreen() / 255.0, bg.getBlue() / 255.0, 1.0);
     fillRect(x, y, width, height);
     updateColor();
   }
@@ -1006,19 +1009,19 @@
         || hintKey.equals(RenderingHints.KEY_ALPHA_INTERPOLATION))
       {
 	if (hintValue.equals(RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR))
-	  cairoSurfaceSetFilter(0);
+	  cairoSurfaceSetFilter(nativePointer, 0);
 
 	else if (hintValue.equals(RenderingHints.VALUE_INTERPOLATION_BILINEAR))
-	  cairoSurfaceSetFilter(1);
+	  cairoSurfaceSetFilter(nativePointer, 1);
 
 	else if (hintValue.equals(RenderingHints.VALUE_ALPHA_INTERPOLATION_SPEED))
-	  cairoSurfaceSetFilter(2);
+	  cairoSurfaceSetFilter(nativePointer, 2);
 
 	else if (hintValue.equals(RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY))
-	  cairoSurfaceSetFilter(3);
+	  cairoSurfaceSetFilter(nativePointer, 3);
 
 	else if (hintValue.equals(RenderingHints.VALUE_ALPHA_INTERPOLATION_DEFAULT))
-	  cairoSurfaceSetFilter(4);
+	  cairoSurfaceSetFilter(nativePointer, 4);
       }
 
     shiftDrawCalls = hints.containsValue(RenderingHints.VALUE_STROKE_NORMALIZE)
@@ -1038,22 +1041,22 @@
     if (hints.containsKey(RenderingHints.KEY_INTERPOLATION))
       {
 	if (hints.containsValue(RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR))
-	  cairoSurfaceSetFilter(0);
+	  cairoSurfaceSetFilter(nativePointer, 0);
 
 	else if (hints.containsValue(RenderingHints.VALUE_INTERPOLATION_BILINEAR))
-	  cairoSurfaceSetFilter(1);
+	  cairoSurfaceSetFilter(nativePointer, 1);
       }
 
     if (hints.containsKey(RenderingHints.KEY_ALPHA_INTERPOLATION))
       {
 	if (hints.containsValue(RenderingHints.VALUE_ALPHA_INTERPOLATION_SPEED))
-	  cairoSurfaceSetFilter(2);
+	  cairoSurfaceSetFilter(nativePointer, 2);
 
 	else if (hints.containsValue(RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY))
-	  cairoSurfaceSetFilter(3);
+	  cairoSurfaceSetFilter(nativePointer, 3);
 
 	else if (hints.containsValue(RenderingHints.VALUE_ALPHA_INTERPOLATION_DEFAULT))
-	  cairoSurfaceSetFilter(4);
+	  cairoSurfaceSetFilter(nativePointer, 4);
       }
 
     shiftDrawCalls = hints.containsValue(RenderingHints.VALUE_STROKE_NORMALIZE)
@@ -1120,7 +1123,7 @@
 
     if(db instanceof CairoSurface)
       {
-	((CairoSurface)db).drawSurface(this, i2u);
+	((CairoSurface)db).drawSurface(nativePointer, i2u);
 	return true;
       }
 	    
@@ -1156,7 +1159,7 @@
 			  null, 0, width);
       }
 
-    drawPixels(pixels, width, height, width, i2u);
+    drawPixels(nativePointer, pixels, width, height, width, i2u);
 
     // Cairo seems to lose the current color which must be restored.
     updateColor();
@@ -1295,8 +1298,8 @@
         float[] positions = gv.getGlyphPositions (0, n, null);
 
         setFont (gv.getFont ());
-        cairoDrawGlyphVector( (GdkFontPeer)getFont().getPeer(), x, y, n, codes,
-                              positions);
+        cairoDrawGlyphVector(nativePointer, (GdkFontPeer)getFont().getPeer(),
+                             x, y, n, codes, positions);
       }
     else
       {
@@ -1456,7 +1459,8 @@
       for (int i = 0; i < pixels.length; i++)
 	pixels[i] |= 0xFF000000;
 
-    drawPixels(pixels, r.getWidth(), r.getHeight(), r.getWidth(), i2u);
+    drawPixels(nativePointer, pixels, r.getWidth(), r.getHeight(),
+               r.getWidth(), i2u);
 
     // Cairo seems to lose the current color which must be restored.
     updateColor();
@@ -1484,7 +1488,7 @@
     double y = 0;
     double[] coords = new double[6];
 
-    cairoSetFillRule(p.getWindingRule());
+    cairoSetFillRule(nativePointer, p.getWindingRule());
     for (; ! p.isDone(); p.next())
       {
 	int seg = p.currentSegment(coords);
@@ -1493,12 +1497,12 @@
 	  case PathIterator.SEG_MOVETO:
 	    x = shifted(coords[0], doShift);
 	    y = shifted(coords[1], doShift);
-	    cairoMoveTo(x, y);
+	    cairoMoveTo(nativePointer, x, y);
 	    break;
 	  case PathIterator.SEG_LINETO:
 	    x = shifted(coords[0], doShift);
 	    y = shifted(coords[1], doShift);
-	    cairoLineTo(x, y);
+	    cairoLineTo(nativePointer, x, y);
 	    break;
 	  case PathIterator.SEG_QUADTO:
 	    // splitting a quadratic bezier into a cubic:
@@ -1511,18 +1515,18 @@
 
 	    x = shifted(coords[2], doShift);
 	    y = shifted(coords[3], doShift);
-	    cairoCurveTo(x1, y1, x2, y2, x, y);
+	    cairoCurveTo(nativePointer, x1, y1, x2, y2, x, y);
 	    break;
 	  case PathIterator.SEG_CUBICTO:
 	    x = shifted(coords[4], doShift);
 	    y = shifted(coords[5], doShift);
-	    cairoCurveTo(shifted(coords[0], doShift),
+	    cairoCurveTo(nativePointer, shifted(coords[0], doShift),
 	                 shifted(coords[1], doShift),
 	                 shifted(coords[2], doShift),
 	                 shifted(coords[3], doShift), x, y);
 	    break;
 	  case PathIterator.SEG_CLOSE:
-	    cairoClosePath();
+	    cairoClosePath(nativePointer);
 	    break;
 	  }
       }

Index: gnu/java/awt/peer/gtk/CairoSurface.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoSurface.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnu/java/awt/peer/gtk/CairoSurface.java	7 Jun 2006 09:40:54 -0000	1.7
+++ gnu/java/awt/peer/gtk/CairoSurface.java	10 Jun 2006 10:33:18 -0000	1.8
@@ -95,35 +95,51 @@
   /**
    * Destroys the cairo surface and frees the buffer.
    */
-  private native void destroy();
+  private native void destroy(long surfacePointer, long bufferPointer);
 
   /**
    * Gets buffer elements
    */
-  private native int nativeGetElem(int i);
+  private native int nativeGetElem(long bufferPointer, int i);
   
   /**
    * Sets buffer elements.
    */
-  private native void nativeSetElem(int i, int val);
+  private native void nativeSetElem(long bufferPointer, int i, int val);
 
   /**
    * Draws this image to a given CairoGraphics context, 
    * with an affine transform given by i2u.
    */
-  public native void drawSurface(CairoGraphics2D context, double[] i2u);
+  public native void nativeDrawSurface(long surfacePointer, long contextPointer,
+                                       double[] i2u);
+
+  public void drawSurface(long contextPointer, double[] i2u)
+  {
+    nativeDrawSurface(surfacePointer, contextPointer, i2u);
+  }
 
   /**
    * getPixels -return the pixels as a java array.
    */
-  native int[] getPixels(int size);
+  native int[] nativeGetPixels(long bufferPointer, int size);
+
+  public int[] getPixels(int size)
+  {
+    return nativeGetPixels(bufferPointer, size);
+  }
 
   /**
    * getPixels -return the pixels as a java array.
    */
-  native void setPixels(int[] pixels);
+  native void nativeSetPixels(long bufferPointer, int[] pixels);
+
+  public void setPixels(int[] pixels)
+  {
+    nativeSetPixels(bufferPointer, pixels);
+  }
 
-  native long getFlippedBuffer(int size);
+  native long getFlippedBuffer(long bufferPointer, int size);
 
   /**
    * Create a cairo_surface_t with specified width and height.
@@ -195,7 +211,7 @@
   public void dispose()
   {
     if(surfacePointer != 0)
-      destroy();
+      destroy(surfacePointer, bufferPointer);
   }
 
   /**
@@ -211,7 +227,8 @@
    */
   public GtkImage getGtkImage()
   {
-    return new GtkImage( width, height, getFlippedBuffer( width * height ));
+    return new GtkImage( width, height,
+                         getFlippedBuffer(bufferPointer, width * height ));
   }
 
   /**
@@ -251,7 +268,7 @@
   {
     if(bank != 0 || i < 0 || i >= width*height)
       throw new IndexOutOfBoundsException(i+" size: "+width*height);
-    return nativeGetElem(i);
+    return nativeGetElem(bufferPointer, i);
   }
   
   /**
@@ -261,7 +278,7 @@
   {
     if(bank != 0 || i < 0 || i >= width*height)
       throw new IndexOutOfBoundsException(i+" size: "+width*height);
-    nativeSetElem(i, val);
+    nativeSetElem(bufferPointer, i, val);
   }
 
   /**
@@ -277,12 +294,22 @@
    * Creates a cairo_t drawing context, returns the pointer as a long.
    * Used by CairoSurfaceGraphics.
    */
-  native long newCairoContext();
+  native long nativeNewCairoContext(long surfacePointer);
+
+  public long newCairoContext()
+  {
+    return nativeNewCairoContext(surfacePointer);
+  }
 
   /**
    * Copy an area of the surface. Expects parameters must be within bounds. 
    * Count on a segfault otherwise.
    */
-  native void copyAreaNative(int x, int y, int width, int height, 
-			     int dx, int dy, int stride);
+  native void copyAreaNative2(long bufferPointer, int x, int y, int width,
+                             int height, int dx, int dy, int stride);
+  public void copyAreaNative(int x, int y, int width,
+                             int height, int dx, int dy, int stride)
+  {
+    copyAreaNative2(bufferPointer, x, y, width, height, dx, dy, stride);
+  }
 }

Index: gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java	2 Jun 2006 22:57:31 -0000	1.4
+++ gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java	10 Jun 2006 10:33:18 -0000	1.5
@@ -40,6 +40,7 @@
 
 import java.awt.Graphics;
 import java.awt.Color;
+import java.awt.GraphicsEnvironment;
 import java.awt.Image;
 import java.awt.Point;
 import java.awt.Graphics2D;
@@ -85,7 +86,7 @@
   
   public GraphicsConfiguration getDeviceConfiguration()
   {
-    throw new UnsupportedOperationException();
+    return GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration();
   }
   
   protected Rectangle2D getRealBounds()

Index: gnu/java/awt/peer/gtk/ComponentGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gnu/java/awt/peer/gtk/ComponentGraphics.java	7 Jun 2006 09:40:54 -0000	1.11
+++ gnu/java/awt/peer/gtk/ComponentGraphics.java	10 Jun 2006 10:33:18 -0000	1.12
@@ -104,8 +104,8 @@
    */
   public void dispose()
   {
-    disposeSurface(nativePointer);
     super.dispose();
+    disposeSurface(nativePointer);
   }
 
   /**
@@ -138,7 +138,7 @@
 				     int width, int height, int dx, int dy);
 
   private native void drawVolatile(GtkComponentPeer component,
-				   Image vimg, int x, int y, 
+				   long vimg, int x, int y, 
 				   int width, int height);
 
   /**
@@ -219,9 +219,9 @@
   {
     if( img instanceof GtkVolatileImage )
       {
-	drawVolatile( component, img, x, y - 20,
-		      ((GtkVolatileImage)img).width, 
-		      ((GtkVolatileImage)img).height );
+        GtkVolatileImage vimg = (GtkVolatileImage) img;
+	drawVolatile( component, vimg.nativePointer,
+                      x, y - 20, vimg.width, vimg.height );
 	return true;
       }      
     return super.drawImage( img, x, y, observer );
@@ -232,7 +232,8 @@
   {
     if( img instanceof GtkVolatileImage )
       {
-	drawVolatile( component, img, x, y - 20, 
+        GtkVolatileImage vimg = (GtkVolatileImage) img;
+	drawVolatile( component, vimg.nativePointer, x, y - 20, 
 		      width, height );
 	return true;
       }      

Index: gnu/java/awt/peer/gtk/GtkVolatileImage.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnu/java/awt/peer/gtk/GtkVolatileImage.java	6 Jun 2006 02:22:28 -0000	1.6
+++ gnu/java/awt/peer/gtk/GtkVolatileImage.java	10 Jun 2006 10:33:18 -0000	1.7
@@ -57,13 +57,27 @@
 
   native long init(GtkComponentPeer component, int width, int height);
 
-  native void destroy();
+  native void destroy(long pointer);
 
-  native int[] getPixels();
+  native int[] nativeGetPixels(long pointer);
+  public int[] getPixels()
+  {
+    return nativeGetPixels(nativePointer);
+  }
 
-  native void copyArea( int x, int y, int w, int h, int dx, int dy );
+  native void nativeCopyArea(long pointer, int x, int y, int w, int h, int dx,
+                             int dy );
+  public void copyArea(int x, int y, int w, int h, int dx, int dy)
+  {
+    nativeCopyArea(nativePointer, x, y, w, h, dx, dy);
+  }
 
-  native void drawVolatile( long ptr, int x, int y, int w, int h );
+  native void nativeDrawVolatile(long pointer, long srcPtr, int x, int y,
+                                 int w, int h );
+  public void drawVolatile(long srcPtr, int x, int y, int w, int h )
+  {
+    nativeDrawVolatile(nativePointer, srcPtr, x, y, w, h);
+  }
   
   public GtkVolatileImage(GtkComponentPeer component, 
 			  int width, int height, ImageCapabilities caps)
@@ -91,7 +105,7 @@
 
   public void dispose()
   {
-    destroy();
+    destroy(nativePointer);
   }
 
   public BufferedImage getSnapshot()



From MAILER-DAEMON Sat Jun 10 07:10:31 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fp1MM-0007m9-Td
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 07:10:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fp1ML-0007m4-0z
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 07:10:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fp1MJ-0007ls-Lx
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 07:10:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fp1MJ-0007lo-ET
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 07:10:27 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fp1UZ-0001Fy-Du
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 07:18:59 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fp1MI-0004Md-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 07:10:26 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1Fp1MF-0004MR-3G
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 11:10:25 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fp1MF-0004MR-3G@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Sat, 10 Jun 2006 11:10:23 +0000
Subject: [commit-cp] classpath ChangeLog lib/.cvsignore lib/Makefile.am
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 11:10:29 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/10 11:10:17

Modified files:
	.              : ChangeLog 
	lib            : .cvsignore Makefile.am 

Log message:
	       * lib/.cvsignore: Add sun.
	       * lib/Makefile.am (dist-hook): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7757&r2=1.7758
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/.cvsignore?cvsroot=classpath&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/Makefile.am?cvsroot=classpath&r1=1.118&r2=1.119

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7757
retrieving revision 1.7758
diff -u -b -r1.7757 -r1.7758
--- ChangeLog	10 Jun 2006 10:33:14 -0000	1.7757
+++ ChangeLog	10 Jun 2006 11:10:03 -0000	1.7758
@@ -1,3 +1,8 @@
+2006-06-10  Mark Wielaard  <mark@klomp.org>
+
+	* lib/.cvsignore: Add sun.
+	* lib/Makefile.am (dist-hook): Likewise.
+
 2006-06-10  Roman Kennke  <kennke@aicas.com>
 
 	* gnu/java/awt/peer/gtk/CairoGraphics2D.java

Index: lib/.cvsignore
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- lib/.cvsignore	1 May 2006 15:48:51 -0000	1.20
+++ lib/.cvsignore	10 Jun 2006 11:10:15 -0000	1.21
@@ -28,6 +28,7 @@
 classes.1
 resources
 org
+sun
 META-INF
 Makefile.deps
 lists

Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- lib/Makefile.am	9 Jun 2006 21:30:44 -0000	1.118
+++ lib/Makefile.am	10 Jun 2006 11:10:16 -0000	1.119
@@ -184,10 +184,10 @@
 
 dist-hook:
 	mkdir -p $(distdir)
-	cp -pdfR $(top_srcdir)/gnu $(top_srcdir)/java $(top_srcdir)/javax $(top_srcdir)/org $(top_srcdir)/vm $(top_srcdir)/resource $(distdir)/..
+	cp -pdfR $(top_srcdir)/gnu $(top_srcdir)/java $(top_srcdir)/javax $(top_srcdir)/org $(top_srcdir)/sun $(top_srcdir)/vm $(top_srcdir)/resource $(distdir)/..
 # Delete not wanted files.
-	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm $(distdir)/../resource -name CVS -print | xargs rm -fr
-	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm $(distdir)/../resource -name .cvsignore -print | xargs rm -f
-	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm -name class-dependencies.conf -print | xargs rm -f
+	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm $(distdir)/../resource -name CVS -print | xargs rm -fr
+	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm $(distdir)/../resource -name .cvsignore -print | xargs rm -f
+	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm -name class-dependencies.conf -print | xargs rm -f
 	rm -f $(distdir)/../gnu/classpath/Configuration.java
 	rm -f $(distdir)/../gnu/java/locale/LocaleData.java



From MAILER-DAEMON Sat Jun 10 07:40:03 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fp1ox-0003d3-4Z
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 07:40:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fp1ow-0003bg-7n
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 07:40:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fp1ov-0003b4-5B
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 07:40:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fp1ou-0003ao-WE
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 07:40:01 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fp1xB-0003Ox-7k
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 07:48:33 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fp1ou-0007L2-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 07:40:00 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1Fp1os-0007Kq-BD
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 11:39:59 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fp1os-0007Kq-BD@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Sat, 10 Jun 2006 11:39:58 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/text/html/HTMLD...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 11:40:02 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/10 11:39:58

Modified files:
	.              : ChangeLog 
	javax/swing/text/html: HTMLDocument.java 

Log message:
	       * javax/swing/text/html/HTMLDocument.java (addSpecialElement):
	       Qualify ElementSpec.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7758&r2=1.7759
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/HTMLDocument.java?cvsroot=classpath&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7758
retrieving revision 1.7759
diff -u -b -r1.7758 -r1.7759
--- ChangeLog	10 Jun 2006 11:10:03 -0000	1.7758
+++ ChangeLog	10 Jun 2006 11:39:56 -0000	1.7759
@@ -1,5 +1,10 @@
 2006-06-10  Mark Wielaard  <mark@klomp.org>
 
+	* javax/swing/text/html/HTMLDocument.java (addSpecialElement):
+	Qualify ElementSpec.
+
+2006-06-10  Mark Wielaard  <mark@klomp.org>
+
 	* lib/.cvsignore: Add sun.
 	* lib/Makefile.am (dist-hook): Likewise.
 

Index: javax/swing/text/html/HTMLDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/HTMLDocument.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- javax/swing/text/html/HTMLDocument.java	10 Jun 2006 09:10:58 -0000	1.33
+++ javax/swing/text/html/HTMLDocument.java	10 Jun 2006 11:39:58 -0000	1.34
@@ -1437,7 +1437,9 @@
       // TODO: Figure out why we must always insert this single character
       // (otherwise the element does not appear). Either fix or add explaining
       // comment or at least report a normal bug.
-      ElementSpec spec = new ElementSpec(copy, ElementSpec.ContentType, 
+      DefaultStyledDocument.ElementSpec spec;
+      spec = new DefaultStyledDocument.ElementSpec(copy,
+	DefaultStyledDocument.ElementSpec.ContentType, 
                                          new char[] {' '}, 0, 1 );
       parseBuffer.add(spec);
     }



From MAILER-DAEMON Sat Jun 10 08:25:23 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fp2Wp-0003oS-Oa
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 08:25:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fp2Wn-0003m1-Gt
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 08:25:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fp2Wl-0003jr-Gj
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 08:25:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fp2Wl-0003jj-9h
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 08:25:19 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fp2f2-0007tE-1H
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 08:33:52 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fp2Wk-00080u-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 08:25:18 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1Fp2Wj-00080r-8c
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 12:25:18 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fp2Wj-00080r-8c@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Sat, 10 Jun 2006 12:25:17 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/GdkFo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 12:25:21 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/10 12:25:17

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: GdkFontPeer.java 

Log message:
	       * gnu/java/awt/peer/gtk/GdkFontPeer.java (GdkFontLineMetrics):
	       Call getSize() to avoid accessor method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7759&r2=1.7760
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java?cvsroot=classpath&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7759
retrieving revision 1.7760
diff -u -b -r1.7759 -r1.7760
--- ChangeLog	10 Jun 2006 11:39:56 -0000	1.7759
+++ ChangeLog	10 Jun 2006 12:25:07 -0000	1.7760
@@ -1,5 +1,10 @@
 2006-06-10  Mark Wielaard  <mark@klomp.org>
 
+	* gnu/java/awt/peer/gtk/GdkFontPeer.java (GdkFontLineMetrics):
+	Call getSize() to avoid accessor method.
+
+2006-06-10  Mark Wielaard  <mark@klomp.org>
+
 	* javax/swing/text/html/HTMLDocument.java (addSpecialElement):
 	Qualify ElementSpec.
 

Index: gnu/java/awt/peer/gtk/GdkFontPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gnu/java/awt/peer/gtk/GdkFontPeer.java	9 Jun 2006 20:23:55 -0000	1.16
+++ gnu/java/awt/peer/gtk/GdkFontPeer.java	10 Jun 2006 12:25:17 -0000	1.17
@@ -268,8 +268,9 @@
       fm = m;
       nchars = n;
       strikethroughOffset = 0f;
-      strikethroughThickness = underlineThickness = ((float)fp.size) / 12f;
       underlineOffset = 0f;
+      strikethroughThickness = ((float)fp.getSize(null)) / 12f;
+      underlineThickness = strikethroughThickness;
     }
 
     public float getAscent()



From MAILER-DAEMON Sat Jun 10 10:06:31 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fp46h-000812-NS
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 10:06:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fp46g-00080m-AX
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 10:06:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fp46e-00080Z-RT
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 10:06:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fp46e-00080W-Oz
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 10:06:28 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fp4Ew-0002Hj-Cg
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 10:15:02 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fp46d-0003EG-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 10:06:27 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fp46c-0003ED-VA
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 14:06:27 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fp46c-0003ED-VA@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Sat, 10 Jun 2006 14:06:26 +0000
Subject: [commit-cp] classpath/gnu/java/awt/peer/gtk VolatileImageGr...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 14:06:30 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/10 14:06:26

Modified files:
	gnu/java/awt/peer/gtk: VolatileImageGraphics.java 
	.              : ChangeLog 

Log message:
	2006-06-10  Roman Kennke  <kennke@aicas.com>
	
		* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
		(VolatileImageGraphics(VolatileImageGraphics)): Use clipRect()
		instead of setClip(), so that an already present clip is intersected
		and not resetted.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7760&r2=1.7761

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7760
retrieving revision 1.7761
diff -u -b -r1.7760 -r1.7761
--- ChangeLog	10 Jun 2006 12:25:07 -0000	1.7760
+++ ChangeLog	10 Jun 2006 14:06:23 -0000	1.7761
@@ -1,3 +1,10 @@
+2006-06-10  Roman Kennke  <kennke@aicas.com>
+
+	* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
+	(VolatileImageGraphics(VolatileImageGraphics)): Use clipRect()
+	instead of setClip(), so that an already present clip is intersected
+	and not resetted.
+
 2006-06-10  Mark Wielaard  <mark@klomp.org>
 
 	* gnu/java/awt/peer/gtk/GdkFontPeer.java (GdkFontLineMetrics):



From MAILER-DAEMON Sat Jun 10 10:16:17 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fp4G9-0002xp-C4
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 10:16:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fp4G7-0002xV-IF
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 10:16:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fp4G5-0002xJ-Br
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 10:16:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fp4G5-0002xG-5n
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 10:16:13 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fp4OM-0002sp-Jg
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 10:24:47 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fp4G4-0003NX-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 10:16:12 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1Fp4G2-0003NU-Cp
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 14:16:11 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fp4G2-0003NU-Cp@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Sat, 10 Jun 2006 14:16:10 +0000
Subject: [commit-cp] classpath ChangeLog native/jni/gtk-peer/cairogr...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 14:16:15 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/10 14:16:10

Modified files:
	.              : ChangeLog 
	native/jni/gtk-peer: cairographics2d.h 
	                     gnu_java_awt_peer_gtk_CairoGraphics2D.c 
	                     gnu_java_awt_peer_gtk_CairoSurface.c 
	                     gnu_java_awt_peer_gtk_GdkTextLayout.c 
	                     gnu_java_awt_peer_gtk_GtkVolatileImage.c 
	include        : gnu_java_awt_peer_gtk_CairoGraphics2D.h 
	                 gnu_java_awt_peer_gtk_CairoSurface.h 
	                 gnu_java_awt_peer_gtk_ComponentGraphics.h 
	                 gnu_java_awt_peer_gtk_GdkTextLayout.h 
	                 gnu_java_awt_peer_gtk_GtkVolatileImage.h 
	                 java_io_VMFile.h 

Log message:
	       * native/jni/gtk-peer/cairographics2d.h (cp_gtk_get_cairo_t):
	       Removed.
	       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
	       Mark all unused parameters.
	       (cp_gtk_get_cairo_t): Removed.
	       (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix):
	       Don't mix declerations and statements.
	       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c:
	       Mark all unused parameters.
	       (Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface):
	       Get cairographics2d pointer directly.
	       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
	       (Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout):
	       Use jlong to pass pointer.
	       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
	       Mark all unused parameters.
	       * include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Regenerated.
	       * include/gnu_java_awt_peer_gtk_CairoSurface.h: Regenerated.
	       * include/gnu_java_awt_peer_gtk_ComponentGraphics.h: Regenerated.
	       * include/gnu_java_awt_peer_gtk_GdkTextLayout.h: Regenerated.
	       * include/gnu_java_awt_peer_gtk_GtkVolatileImage.h: Regenerated.
	       * include/java_io_VMFile.h: Regenerated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7761&r2=1.7762
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/cairographics2d.h?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c?cvsroot=classpath&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c?cvsroot=classpath&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c?cvsroot=classpath&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/include/java_io_VMFile.h?cvsroot=classpath&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7761
retrieving revision 1.7762
diff -u -b -r1.7761 -r1.7762
--- ChangeLog	10 Jun 2006 14:06:23 -0000	1.7761
+++ ChangeLog	10 Jun 2006 14:16:08 -0000	1.7762
@@ -1,3 +1,28 @@
+2006-06-10  Mark Wielaard  <mark@klomp.org>
+
+	* native/jni/gtk-peer/cairographics2d.h (cp_gtk_get_cairo_t):
+	Removed.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
+	Mark all unused parameters.
+	(cp_gtk_get_cairo_t): Removed.
+	(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix):
+	Don't mix declerations and statements.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c:
+	Mark all unused parameters.
+	(Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface):
+	Get cairographics2d pointer directly.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
+	(Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout):
+	Use jlong to pass pointer.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
+	Mark all unused parameters.
+	* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Regenerated.
+	* include/gnu_java_awt_peer_gtk_CairoSurface.h: Regenerated.
+	* include/gnu_java_awt_peer_gtk_ComponentGraphics.h: Regenerated.
+	* include/gnu_java_awt_peer_gtk_GdkTextLayout.h: Regenerated.
+	* include/gnu_java_awt_peer_gtk_GtkVolatileImage.h: Regenerated.
+	* include/java_io_VMFile.h: Regenerated.
+
 2006-06-10  Roman Kennke  <kennke@aicas.com>
 
 	* gnu/java/awt/peer/gtk/VolatileImageGraphics.java

Index: native/jni/gtk-peer/cairographics2d.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/cairographics2d.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- native/jni/gtk-peer/cairographics2d.h	10 Jun 2006 10:33:16 -0000	1.3
+++ native/jni/gtk-peer/cairographics2d.h	10 Jun 2006 14:16:09 -0000	1.4
@@ -113,6 +113,4 @@
   char *pattern_pixels;
 };
 
-cairo_t *cp_gtk_get_cairo_t(JNIEnv *env, jlong pointer);
-
 #endif

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	10 Jun 2006 10:33:17 -0000	1.8
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	10 Jun 2006 14:16:09 -0000	1.9
@@ -53,18 +53,6 @@
 static void update_pattern_transform (struct cairographics2d *gr);
 
 /**
- * Returns the cairo_t * associated with a CairoGraphics2D object,
- * This is used by GdkTextLayout.
- */
-cairo_t *cp_gtk_get_cairo_t(JNIEnv *env,
-			    jlong pointer)
-{
-  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
-  g_assert(gr != NULL);
-  return gr->cr;
-}
-
-/**
  * Allocates the cairographics2d structure.
  */
 JNIEXPORT jlong JNICALL
@@ -91,7 +79,8 @@
  */
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative
-  (JNIEnv *env, jobject obj, jlong pointer)
+  (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+  jlong pointer)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
 
@@ -121,7 +110,8 @@
  */
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient
-(JNIEnv *env, jobject obj, jlong pointer,
+  (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+   jlong pointer,
    jdouble x1, jdouble y1, 
    jdouble x2, jdouble y2,
    jint r1, jint g1, jint b1, jint a1,
@@ -154,8 +144,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels
-(JNIEnv *env, jobject obj, jlong pointer, jintArray jarr, jint w, jint h,
- jint stride)
+ (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+  jlong pointer, jintArray jarr, jint w, jint h, jint stride)
 {
   struct cairographics2d *gr = NULL;
   jint *jpixels = NULL;
@@ -196,7 +186,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels 
-(JNIEnv *env, jobject obj, jlong pointer, jintArray java_pixels, 
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jintArray java_pixels, 
  jint w, jint h, jint stride, jdoubleArray java_matrix)
 {
   jint *native_pixels = NULL;
@@ -239,11 +230,12 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix
-   (JNIEnv *env, jobject obj, jlong pointer, jdoubleArray java_matrix)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jdoubleArray java_matrix)
 {
   jdouble *native_matrix = NULL;
-  g_assert (obj != NULL);
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
+  g_assert (obj != NULL);
   g_assert (gr != NULL);
 
   native_matrix = (*env)->GetDoubleArrayElements (env, java_matrix, NULL);  
@@ -318,7 +310,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetOperator 
-   (JNIEnv *env, jobject obj, jlong pointer, jint op)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jint op)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -377,8 +370,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetRGBAColor
-(JNIEnv *env, jobject obj, jlong pointer, jdouble r, jdouble g, jdouble b,
- jdouble a)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jdouble r, jdouble g, jdouble b, jdouble a)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -388,7 +381,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFillRule 
-   (JNIEnv *env, jobject obj, jlong pointer, jint rule)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jint rule)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -409,8 +403,8 @@
  */
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine
-(JNIEnv *env, jobject obj, jlong pointer, jdouble width, int cap, int join,
- double miterLimit)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jdouble width, int cap, int join, double miterLimit)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -459,8 +453,8 @@
  */ 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash
-(JNIEnv *env, jobject obj, jlong pointer, jdoubleArray dashes, jint ndash,
- jdouble offset)
+(JNIEnv *env, jobject obj __attribute__((unused)),
+ jlong pointer, jdoubleArray dashes, jint ndash, jdouble offset)
 {
   jdouble *dasharr = NULL;
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
@@ -476,7 +470,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoNewPath 
-   (JNIEnv *env, jobject obj, jlong pointer)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -486,7 +481,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoMoveTo 
-   (JNIEnv *env, jobject obj, jlong pointer, jdouble x, jdouble y)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jdouble x, jdouble y)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -496,7 +492,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoLineTo 
-(JNIEnv *env, jobject obj, jlong pointer, jdouble x, jdouble y)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jdouble x, jdouble y)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -506,7 +503,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo 
-(JNIEnv *env, jobject obj, jlong pointer, jdouble x1, jdouble y1,
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jdouble x1, jdouble y1,
  jdouble x2, jdouble y2, jdouble x3, jdouble y3)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
@@ -516,7 +514,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo 
-   (JNIEnv *env, jobject obj, jlong pointer, jdouble dx, jdouble dy)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jdouble dx, jdouble dy)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -526,7 +525,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo 
-   (JNIEnv *env, jobject obj, jlong pointer, jdouble dx, jdouble dy)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jdouble dx, jdouble dy)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -536,7 +536,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo 
-(JNIEnv *env, jobject obj, jlong pointer, jdouble dx1, jdouble dy1,
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jdouble dx1, jdouble dy1,
  jdouble dx2, jdouble dy2, jdouble dx3, jdouble dy3)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
@@ -547,8 +548,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle 
-(JNIEnv *env, jobject obj, jlong pointer, jdouble x, jdouble y,
- jdouble width, jdouble height)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jdouble x, jdouble y, jdouble width, jdouble height)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
 
@@ -557,7 +558,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClosePath 
-   (JNIEnv *env, jobject obj, jlong pointer)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -567,7 +569,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke 
-   (JNIEnv *env, jobject obj, jlong pointer)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -577,7 +580,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill 
-(JNIEnv *env, jobject obj, jlong pointer)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -587,7 +591,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip 
-(JNIEnv *env, jobject obj, jlong pointer)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert( gr != NULL );
@@ -597,7 +602,8 @@
 
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip 
-(JNIEnv *env, jobject obj, jlong pointer)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -607,7 +613,8 @@
 
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip 
-(JNIEnv *env, jobject obj, jlong pointer)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
@@ -617,7 +624,8 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter
-   (JNIEnv *env, jobject obj, jlong pointer, jint filter)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong pointer, jint filter)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c	10 Jun 2006 10:33:17 -0000	1.17
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c	10 Jun 2006 14:16:09 -0000	1.18
@@ -74,7 +74,8 @@
  */
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_CairoSurface_destroy
-(JNIEnv *env, jobject obj, jlong surfacePointer, jlong bufferPointer)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong surfacePointer, jlong bufferPointer)
 {
   void *buffer;
   cairo_surface_t* surface = JLONG_TO_PTR(void, surfacePointer);
@@ -91,7 +92,8 @@
  */
 JNIEXPORT jint JNICALL 
 Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem
-(JNIEnv *env, jobject obj, jlong bufferPointer, jint i)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong bufferPointer, jint i)
 {
   jint *pixeldata = JLONG_TO_PTR(void, bufferPointer);
 
@@ -106,7 +108,8 @@
  */
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetElem 
-(JNIEnv *env, jobject obj, jlong bufferPointer, jint i, jint val)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong bufferPointer, jint i, jint val)
 {
   jint *pixeldata = JLONG_TO_PTR(void, bufferPointer);
 
@@ -121,7 +124,8 @@
  */
 JNIEXPORT jintArray JNICALL 
 Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetPixels
-(JNIEnv *env, jobject obj, jlong bufferPointer, int size)
+(JNIEnv *env __attribute((unused)), jobject obj __attribute((unused)),
+ jlong bufferPointer, int size)
 {
   jint *pixeldata, *jpixdata;
   jintArray jpixels;
@@ -176,15 +180,14 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface 
-(JNIEnv *env, jobject obj, jlong surfacePointer, jlong context,
- jdoubleArray java_matrix)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong surfacePointer, jlong context, jdoubleArray java_matrix)
 {
-  cairo_t *cr;
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, context);
+  cairo_t *cr = gr->cr;
   jdouble *native_matrix = NULL;
   cairo_surface_t* surface = JLONG_TO_PTR(void, surfacePointer);
   g_assert(surface != NULL);
-
-  cr = cp_gtk_get_cairo_t(env, context);
   g_assert(cr != NULL);
 
   native_matrix = (*env)->GetDoubleArrayElements (env, java_matrix, NULL);
@@ -213,7 +216,8 @@
 
 JNIEXPORT jlong JNICALL 
 Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer 
-(JNIEnv *env, jobject obj, jlong bufferPointer, jint size)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong bufferPointer, jint size)
 {
   jint *dst;
   jint *src = JLONG_TO_PTR(void, bufferPointer);
@@ -239,7 +243,8 @@
  */
 JNIEXPORT jlong JNICALL 
 Java_gnu_java_awt_peer_gtk_CairoSurface_nativeNewCairoContext
-(JNIEnv *env, jobject obj, jlong surfacePointer)
+(JNIEnv *env __attribute((unused)), jobject obj __attribute((unused)),
+ jlong surfacePointer)
 {
   cairo_surface_t* surface = JLONG_TO_PTR(cairo_surface_t, surfacePointer);
   cairo_t *ptr;
@@ -255,7 +260,8 @@
  */
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative2
-(JNIEnv *env, jobject obj, jlong bufferPointer,
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jlong bufferPointer,
  jint x, jint y, jint w, jint h, jint dx, jint dy, jint stride)
 {
   int row;

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c	4 Jun 2006 17:52:05 -0000	1.15
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c	10 Jun 2006 14:16:09 -0000	1.16
@@ -44,6 +44,7 @@
 #include <pango/pangofc-font.h>
 #include <freetype/ftglyph.h>
 #include <freetype/ftoutln.h>
+#include "jcl.h"
 #include "native_state.h"
 #include "gdkfont.h"
 #include "gnu_java_awt_peer_gtk_GdkTextLayout.h"
@@ -239,23 +240,21 @@
  */
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout
-   (JNIEnv *env, jobject obj, jobject cairographics, jfloat x, jfloat y)
+   (JNIEnv *env, jobject obj, jlong cg2d, jfloat x, jfloat y)
 {
   /* 
    * FIXME: Some day we expect either cairo or pango will know how to make
    * a pango layout paint to a cairo surface. that day is not yet here.
    */
 
-  cairo_t *cr;
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, cg2d);
+  cairo_t *cr = gr->cr;
   struct textlayout *tl = NULL;
   PangoLayoutIter *i = NULL;
   PangoLayoutRun *run = NULL;
   cairo_glyph_t *glyphs = NULL;
   gint n_glyphs = 0;
 
-  g_assert (cairographics != NULL);
-
-  cr = cp_gtk_get_cairo_t(env, cairographics);
   tl = (struct textlayout *)NSA_GET_TEXT_LAYOUT_PTR (env, obj);
 
   g_assert (cr != NULL);

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c	10 Jun 2006 10:33:17 -0000	1.4
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c	10 Jun 2006 14:16:09 -0000	1.5
@@ -87,7 +87,8 @@
  */
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy
-(JNIEnv *env, jobject obj, jlong pointer)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute((unused)),
+ jlong pointer)
 {
   GdkPixmap* pixmap = JLONG_TO_PTR(GdkPixmap, pointer);
   if( pixmap != NULL )
@@ -146,8 +147,8 @@
  */
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea
-(JNIEnv *env, jobject obj, jlong pointer, jint x, jint y, jint w, jint h,
- jint dx, jint dy)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute((unused)),
+ jlong pointer, jint x, jint y, jint w, jint h, jint dx, jint dy)
 {
   GdkPixbuf *pixbuf;
   GdkPixmap* pixmap = JLONG_TO_PTR(GdkPixmap, pointer);
@@ -167,8 +168,8 @@
 
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile
-(JNIEnv *env, jobject obj, jlong pointer, jlong srcptr, jint x, jint y, jint w,
- jint h)
+(JNIEnv *env __attribute__((unused)), jobject obj __attribute((unused)),
+ jlong pointer, jlong srcptr, jint x, jint y, jint w, jint h)
 {
   GdkPixmap *dst, *src;
   GdkGC *gc;

Index: include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	10 Jun 2006 10:33:15 -0000	1.4
+++ include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	10 Jun 2006 14:16:10 -0000	1.5
@@ -1,229 +1,45 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_CairoGraphics2D__
+#define __gnu_java_awt_peer_gtk_CairoGraphics2D__
+
 #include <jni.h>
-/* Header for class gnu_java_awt_peer_gtk_CairoGraphics2D */
 
-#ifndef _Included_gnu_java_awt_peer_gtk_CairoGraphics2D
-#define _Included_gnu_java_awt_peer_gtk_CairoGraphics2D
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    init
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_init
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    disposeNative
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    drawPixels
- * Signature: (J[IIII[D)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels
-  (JNIEnv *, jobject, jlong, jintArray, jint, jint, jint, jdoubleArray);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    setGradient
- * Signature: (JDDDDIIIIIIIIZ)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient
-  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    setTexturePixels
- * Signature: (J[IIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels
-  (JNIEnv *, jobject, jlong, jintArray, jint, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSetMatrix
- * Signature: (J[D)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix
-  (JNIEnv *, jobject, jlong, jdoubleArray);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSetOperator
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetOperator
-  (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSetRGBAColor
- * Signature: (JDDDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetRGBAColor
-  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSetFillRule
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFillRule
-  (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSetLine
- * Signature: (JDIID)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine
-  (JNIEnv *, jobject, jlong, jdouble, jint, jint, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSetDash
- * Signature: (J[DID)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash
-  (JNIEnv *, jobject, jlong, jdoubleArray, jint, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoDrawGlyphVector
- * Signature: (JLgnu/java/awt/peer/gtk/GdkFontPeer;FFI[I[F)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector
-  (JNIEnv *, jobject, jlong, jobject, jfloat, jfloat, jint, jintArray, jfloatArray);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoRelCurveTo
- * Signature: (JDDDDDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo
-  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoRectangle
- * Signature: (JDDDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle
-  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoNewPath
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoNewPath
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoClosePath
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClosePath
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoMoveTo
- * Signature: (JDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoMoveTo
-  (JNIEnv *, jobject, jlong, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoRelMoveTo
- * Signature: (JDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo
-  (JNIEnv *, jobject, jlong, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoLineTo
- * Signature: (JDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoLineTo
-  (JNIEnv *, jobject, jlong, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoRelLineTo
- * Signature: (JDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo
-  (JNIEnv *, jobject, jlong, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoCurveTo
- * Signature: (JDDDDDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo
-  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoStroke
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoFill
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoClip
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoPreserveClip
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoResetClip
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSurfaceSetFilter
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter
-  (JNIEnv *, jobject, jlong, jint);
+
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_init (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels (JNIEnv *env, jobject, jlong, jintArray, jint, jint, jint, jdoubleArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels (JNIEnv *env, jobject, jlong, jintArray, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix (JNIEnv *env, jobject, jlong, jdoubleArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetOperator (JNIEnv *env, jobject, jlong, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetRGBAColor (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFillRule (JNIEnv *env, jobject, jlong, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine (JNIEnv *env, jobject, jlong, jdouble, jint, jint, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash (JNIEnv *env, jobject, jlong, jdoubleArray, jint, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector (JNIEnv *env, jobject, jlong, jobject, jfloat, jfloat, jint, jintArray, jfloatArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoNewPath (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClosePath (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoMoveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoLineTo (JNIEnv *env, jobject, jlong, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo (JNIEnv *env, jobject, jlong, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter (JNIEnv *env, jobject, jlong, jint);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_awt_peer_gtk_CairoGraphics2D__ */

Index: include/gnu_java_awt_peer_gtk_CairoSurface.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- include/gnu_java_awt_peer_gtk_CairoSurface.h	10 Jun 2006 10:33:15 -0000	1.4
+++ include/gnu_java_awt_peer_gtk_CairoSurface.h	10 Jun 2006 14:16:10 -0000	1.5
@@ -1,107 +1,28 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_CairoSurface__
+#define __gnu_java_awt_peer_gtk_CairoSurface__
+
 #include <jni.h>
-/* Header for class gnu_java_awt_peer_gtk_CairoSurface */
 
-#ifndef _Included_gnu_java_awt_peer_gtk_CairoSurface
-#define _Included_gnu_java_awt_peer_gtk_CairoSurface
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_BYTE
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_BYTE 0L
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_USHORT
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_USHORT 1L
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_SHORT
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_SHORT 2L
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_INT
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_INT 3L
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_FLOAT
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_FLOAT 4L
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_DOUBLE
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_DOUBLE 5L
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_UNDEFINED
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_UNDEFINED 32L
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    create
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_create
-  (JNIEnv *, jobject, jint, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    destroy
- * Signature: (JJ)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_destroy
-  (JNIEnv *, jobject, jlong, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    nativeGetElem
- * Signature: (JI)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem
-  (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    nativeSetElem
- * Signature: (JII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetElem
-  (JNIEnv *, jobject, jlong, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    nativeDrawSurface
- * Signature: (JJ[D)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface
-  (JNIEnv *, jobject, jlong, jlong, jdoubleArray);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    nativeGetPixels
- * Signature: (JI)[I
- */
-JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetPixels
-  (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    nativeSetPixels
- * Signature: (J[I)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetPixels
-  (JNIEnv *, jobject, jlong, jintArray);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    getFlippedBuffer
- * Signature: (JI)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer
-  (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    nativeNewCairoContext
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeNewCairoContext
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    copyAreaNative2
- * Signature: (JIIIIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative2
-  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jint);
+
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_create (JNIEnv *env, jobject, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_destroy (JNIEnv *env, jobject, jlong, jlong);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem (JNIEnv *env, jobject, jlong, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetElem (JNIEnv *env, jobject, jlong, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface (JNIEnv *env, jobject, jlong, jlong, jdoubleArray);
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetPixels (JNIEnv *env, jobject, jlong, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetPixels (JNIEnv *env, jobject, jlong, jintArray);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer (JNIEnv *env, jobject, jlong, jint);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeNewCairoContext (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative2 (JNIEnv *env, jobject, jlong, jint, jint, jint, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_awt_peer_gtk_CairoSurface__ */

Index: include/gnu_java_awt_peer_gtk_ComponentGraphics.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- include/gnu_java_awt_peer_gtk_ComponentGraphics.h	10 Jun 2006 10:33:15 -0000	1.6
+++ include/gnu_java_awt_peer_gtk_ComponentGraphics.h	10 Jun 2006 14:16:10 -0000	1.7
@@ -1,77 +1,26 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_ComponentGraphics__
+#define __gnu_java_awt_peer_gtk_ComponentGraphics__
+
 #include <jni.h>
-/* Header for class gnu_java_awt_peer_gtk_ComponentGraphics */
 
-#ifndef _Included_gnu_java_awt_peer_gtk_ComponentGraphics
-#define _Included_gnu_java_awt_peer_gtk_ComponentGraphics
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    initState
- * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    disposeSurface
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    initFromVolatile
- * Signature: (JII)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile
-  (JNIEnv *, jobject, jlong, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    start_gdk_drawing
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing
-  (JNIEnv *, jobject);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    end_gdk_drawing
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing
-  (JNIEnv *, jobject);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    hasXRender
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender
-  (JNIEnv *, jclass);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    copyAreaNative
- * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;IIIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative
-  (JNIEnv *, jobject, jobject, jint, jint, jint, jint, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    drawVolatile
- * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;JIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile
-  (JNIEnv *, jobject, jobject, jlong, jint, jint, jint, jint);
+
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface (JNIEnv *env, jobject, jlong);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile (JNIEnv *env, jobject, jlong, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing (JNIEnv *env, jobject);
+JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative (JNIEnv *env, jobject, jobject, jint, jint, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile (JNIEnv *env, jobject, jobject, jlong, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_awt_peer_gtk_ComponentGraphics__ */

Index: include/gnu_java_awt_peer_gtk_GdkTextLayout.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- include/gnu_java_awt_peer_gtk_GdkTextLayout.h	1 Jun 2006 10:51:17 -0000	1.6
+++ include/gnu_java_awt_peer_gtk_GdkTextLayout.h	10 Jun 2006 14:16:10 -0000	1.7
@@ -16,7 +16,7 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_indexToPos (JNIEnv *env, jobject, jint, jdoubleArray);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_initState (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_dispose (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout (JNIEnv *env, jobject, jobject, jfloat, jfloat);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout (JNIEnv *env, jobject, jlong, jfloat, jfloat);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_initStaticState (JNIEnv *env, jclass);
 JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_getOutline (JNIEnv *env, jobject, jobject);
 

Index: include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- include/gnu_java_awt_peer_gtk_GtkVolatileImage.h	10 Jun 2006 10:33:15 -0000	1.3
+++ include/gnu_java_awt_peer_gtk_GtkVolatileImage.h	10 Jun 2006 14:16:10 -0000	1.4
@@ -1,69 +1,23 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_GtkVolatileImage__
+#define __gnu_java_awt_peer_gtk_GtkVolatileImage__
+
 #include <jni.h>
-/* Header for class gnu_java_awt_peer_gtk_GtkVolatileImage */
 
-#ifndef _Included_gnu_java_awt_peer_gtk_GtkVolatileImage
-#define _Included_gnu_java_awt_peer_gtk_GtkVolatileImage
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_DEFAULT
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_DEFAULT 1L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_FAST
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_FAST 2L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_SMOOTH
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_SMOOTH 4L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_REPLICATE
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_REPLICATE 8L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_AREA_AVERAGING
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_AREA_AVERAGING 16L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_OK
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_OK 0L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_RESTORED
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_RESTORED 1L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_INCOMPATIBLE
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_INCOMPATIBLE 2L
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    init
- * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;II)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init
-  (JNIEnv *, jobject, jobject, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    destroy
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    nativeGetPixels
- * Signature: (J)[I
- */
-JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    nativeCopyArea
- * Signature: (JIIIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea
-  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    nativeDrawVolatile
- * Signature: (JJIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile
-  (JNIEnv *, jobject, jlong, jlong, jint, jint, jint, jint);
+
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, jobject, jobject, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy (JNIEnv *env, jobject, jlong);
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea (JNIEnv *env, jobject, jlong, jint, jint, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile (JNIEnv *env, jobject, jlong, jlong, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_awt_peer_gtk_GtkVolatileImage__ */

Index: include/java_io_VMFile.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_io_VMFile.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- include/java_io_VMFile.h	7 Jun 2006 15:09:40 -0000	1.4
+++ include/java_io_VMFile.h	10 Jun 2006 14:16:10 -0000	1.5
@@ -24,7 +24,7 @@
 JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canWrite (JNIEnv *env, jclass, jstring);
 JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canRead (JNIEnv *env, jclass, jstring);
 JNIEXPORT jboolean JNICALL Java_java_io_VMFile_isDirectory (JNIEnv *env, jclass, jstring);
-JNIEXPORT jstring JNICALL Java_java_io_VMFile_toCanonicalForm (JNIEnv *env,jclass, jstring);
+JNIEXPORT jstring JNICALL Java_java_io_VMFile_toCanonicalForm (JNIEnv *env, jclass, jstring);
 #undef java_io_VMFile_IS_CASE_SENSITIVE
 #define java_io_VMFile_IS_CASE_SENSITIVE 1L
 #undef java_io_VMFile_IS_DOS_8_3



From MAILER-DAEMON Sat Jun 10 16:02:13 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fp9ev-00084s-8K
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 16:02:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fp9et-000845-On
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 16:02:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fp9es-00083r-3b
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 16:02:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fp9er-00083k-VH
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 16:02:09 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fp9nC-000705-Ux
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 16:10:47 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fp9er-0006u8-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 16:02:09 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1Fp9er-0006u5-6T
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 20:02:09 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fp9er-0006u5-6T@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Sat, 10 Jun 2006 20:02:09 +0000
Subject: [commit-cp] classpath/gnu/java/awt/peer/gtk GdkTextLayout.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 20:02:12 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/10 20:02:09

Modified files:
	gnu/java/awt/peer/gtk: GdkTextLayout.java 

Log message:
	        * native/jni/gtk-peer/cairographics2d.h (cp_gtk_get_cairo_t):
	        Removed.
	        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
	        Mark all unused parameters.
	        (cp_gtk_get_cairo_t): Removed.
	        (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix):
	        Don't mix declerations and statements.
	        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c:
	        Mark all unused parameters.
	        (Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface):
	        Get cairographics2d pointer directly.
	        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
	        (Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout):
	        Use jlong to pass pointer.
	        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
	        Mark all unused parameters.
	        * include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Regenerated.
	        * include/gnu_java_awt_peer_gtk_CairoSurface.h: Regenerated.
	        * include/gnu_java_awt_peer_gtk_ComponentGraphics.h: Regenerated.
	        * include/gnu_java_awt_peer_gtk_GdkTextLayout.h: Regenerated.
	        * include/gnu_java_awt_peer_gtk_GtkVolatileImage.h: Regenerated.
	        * include/java_io_VMFile.h: Regenerated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java?cvsroot=classpath&r1=1.9&r2=1.10

Patches:
Index: GdkTextLayout.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- GdkTextLayout.java	1 Jun 2006 10:51:17 -0000	1.9
+++ GdkTextLayout.java	10 Jun 2006 20:02:09 -0000	1.10
@@ -1,5 +1,5 @@
 /* GdkTextLayout.java
-   Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -84,7 +84,7 @@
 
   private native void dispose ();
 
-  private native void cairoDrawGdkTextLayout(CairoGraphics2D g, float x, float y);
+  private native void cairoDrawGdkTextLayout(long cg2d, float x, float y);
 
   static native void initStaticState();
 
@@ -216,7 +216,7 @@
 
   public void draw (Graphics2D g2, float x, float y)
   {
-    cairoDrawGdkTextLayout((CairoGraphics2D)g2, x, y);
+    cairoDrawGdkTextLayout(((CairoGraphics2D) g2).nativePointer, x, y);
   }
 
   public TextHitInfo getStrongCaret (TextHitInfo hit1, 



From MAILER-DAEMON Sat Jun 10 16:26:40 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpA2a-0007e4-IN
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 16:26:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpA2Y-0007dt-PE
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 16:26:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpA2X-0007dh-9F
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 16:26:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpA2X-0007de-2u
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 16:26:37 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpAAs-0000Ac-Cd
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 16:35:14 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpA2W-0007CU-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 16:26:36 -0400
Received: from glavaux by savannah.gnu.org with local (Exim 4.50)
	id 1FpA2W-0007CR-A2
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 20:26:36 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpA2W-0007CR-A2@savannah.gnu.org>
From: Guilhem Lavaux <guilhem@kaffe.org>
Date: Sat, 10 Jun 2006 20:26:36 +0000
Subject: [commit-cp] classpath ChangeLog.native native/jni/native-li...
	[NATIVE-LAYER]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 20:26:38 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		NATIVE-LAYER
Changes by:	Guilhem Lavaux <glavaux>	06/06/10 20:26:36

Modified files:
	.              : ChangeLog.native 
	native/jni/native-lib: cpio.c cpnet.c cpnet.h 

Log message:
	2006-06-10  Guilhem Lavaux  <guilhem@kaffe.org>
	
	        * native/jni/native-lib/cpio.c
	        (cpio_openDir, cpio_closeDir, cpio_readDir): Implemented.
	
	        * native/jni/native-lib/cpnet.h:
	        (cpnet_bytesToIPV4Address): Fixed type casting to avoid being
	        messed by signs in jbyte.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog.native?cvsroot=classpath&only_with_tag=NATIVE-LAYER&r1=1.1.2.11&r2=1.1.2.12
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/native-lib/cpio.c?cvsroot=classpath&only_with_tag=NATIVE-LAYER&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/native-lib/cpnet.c?cvsroot=classpath&only_with_tag=NATIVE-LAYER&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/native-lib/cpnet.h?cvsroot=classpath&only_with_tag=NATIVE-LAYER&r1=1.1.2.5&r2=1.1.2.6

Patches:
Index: ChangeLog.native
===================================================================
RCS file: /cvsroot/classpath/classpath/Attic/ChangeLog.native,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -b -r1.1.2.11 -r1.1.2.12
--- ChangeLog.native	8 Jun 2006 20:19:55 -0000	1.1.2.11
+++ ChangeLog.native	10 Jun 2006 20:26:36 -0000	1.1.2.12
@@ -1,3 +1,12 @@
+2006-06-10  Guilhem Lavaux  <guilhem@kaffe.org>
+
+	* native/jni/native-lib/cpio.c
+	(cpio_openDir, cpio_closeDir, cpio_readDir): Implemented.
+
+	* native/jni/native-lib/cpnet.h:
+	(cpnet_bytesToIPV4Address): Fixed type casting to avoid being
+	messed by signs in jbyte.
+	
 2006-06-07  Guilhem Lavaux  <guilhem@kaffe.org>
 
 	* Merged HEAD as of 2006-06-06.

Index: native/jni/native-lib/cpio.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/native-lib/Attic/cpio.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- native/jni/native-lib/cpio.c	25 Mar 2006 17:08:50 -0000	1.1.2.3
+++ native/jni/native-lib/cpio.c	10 Jun 2006 20:26:36 -0000	1.1.2.4
@@ -43,6 +43,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
+#include <dirent.h>
 
 #include <jni.h>
 
@@ -419,3 +420,30 @@
   return 0;
 }
 
+int cpio_openDir (const char *dirname, void **handle)
+{
+  *handle = (void *)opendir(dirname);
+  if (*handle == NULL)
+    return errno;
+  
+  return 0;
+}
+
+int cpio_closeDir (void *handle)
+{
+  closedir((DIR *)handle);
+  return 0;
+}
+
+
+int cpio_readDir (void *handle, const char **filename)
+{
+  struct dirent *dBuf;
+
+  dBuf = readdir((DIR *)handle);
+  if (dBuf == NULL)
+    return errno;
+
+  *filename = dBuf->d_name;
+  return 0;
+}

Index: native/jni/native-lib/cpnet.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/native-lib/Attic/cpnet.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- native/jni/native-lib/cpnet.c	10 May 2006 07:08:25 -0000	1.1.2.4
+++ native/jni/native-lib/cpnet.c	10 Jun 2006 20:26:36 -0000	1.1.2.5
@@ -180,6 +180,8 @@
   int ret;
 
   /* TODO: implement socket time out */
+  struct sockaddr_in *theaddr = (struct sockaddr_in *)addr->data;
+
   ret = connect(fd, (struct sockaddr *)addr->data, addr->len);
   if (ret != 0)
     return errno;

Index: native/jni/native-lib/cpnet.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/native-lib/Attic/cpnet.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- native/jni/native-lib/cpnet.h	19 Feb 2006 17:10:27 -0000	1.1.2.5
+++ native/jni/native-lib/cpnet.h	10 Jun 2006 20:26:36 -0000	1.1.2.6
@@ -189,10 +189,10 @@
   jint sysaddr;
   struct sockaddr_in *ipaddr = (struct sockaddr_in *)&(netaddr->data[0]);
 
-  sysaddr = ((jint)octets[0]) << 24;
-  sysaddr |= ((jint)octets[1]) << 16;
-  sysaddr |= ((jint)octets[2]) << 8;
-  sysaddr |= ((jint)octets[3]);
+  sysaddr = ((jint)(unsigned char)octets[0]) << 24;
+  sysaddr |= ((jint)(unsigned char)octets[1]) << 16;
+  sysaddr |= ((jint)(unsigned char)octets[2]) << 8;
+  sysaddr |= ((jint)(unsigned char)octets[3]);
 
   ipaddr->sin_addr.s_addr = htonl(sysaddr);
 }



From MAILER-DAEMON Sat Jun 10 17:39:54 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpBBS-0006o1-6U
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 17:39:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpBBP-0006mP-Pj
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 17:39:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpBBO-0006ke-5T
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 17:39:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpBBN-0006kR-W1
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 17:39:50 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpBJk-0001vq-0j
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 17:48:28 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpBBN-00023H-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 17:39:49 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FpBBM-00023E-KB
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 21:39:49 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpBBM-00023E-KB@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Sat, 10 Jun 2006 21:39:48 +0000
Subject: [commit-cp] classpath/java/io File.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 21:39:52 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/10 21:39:48

Modified files:
	java/io        : File.java 
	.              : ChangeLog 

Log message:
		* java/io/File.java (pathSeparator): Typo fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/io/File.java?cvsroot=classpath&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7762&r2=1.7763

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7762
retrieving revision 1.7763
diff -u -b -r1.7762 -r1.7763
--- ChangeLog	10 Jun 2006 14:16:08 -0000	1.7762
+++ ChangeLog	10 Jun 2006 21:39:47 -0000	1.7763
@@ -1,3 +1,7 @@
+2006-06-10  Tom Tromey  <tromey@redhat.com>
+
+	* java/io/File.java (pathSeparator): Typo fix.
+
 2006-06-10  Mark Wielaard  <mark@klomp.org>
 
 	* native/jni/gtk-peer/cairographics2d.h (cp_gtk_get_cairo_t):



From MAILER-DAEMON Sat Jun 10 20:05:23 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpDSF-0002ih-P9
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 20:05:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpDSE-0002ic-Ga
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 20:05:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpDSA-0002iA-Hh
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 20:05:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpDSA-0002i7-Bt
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 20:05:18 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpDaX-0001bV-Ml
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 20:13:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpDS4-00063Y-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 20:05:12 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FpDS2-00063V-W4
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 00:05:12 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpDS2-00063V-W4@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sun, 11 Jun 2006 00:05:10 +0000
Subject: [commit-cp] classpath ChangeLog gnu/javax/security/auth/log...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jun 2006 00:05:22 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/11 00:05:10

Modified files:
	.              : ChangeLog 
	gnu/javax/security/auth/login: ConfigFileParser.java 

Log message:
	2006-06-11  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/javax/security/auth/login/ConfigFileParser.java (validateClassName):
		Check that every component of 'cn' starts with a valid Java identifier char.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7763&r2=1.7764
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/login/ConfigFileParser.java?cvsroot=classpath&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7763
retrieving revision 1.7764
diff -u -b -r1.7763 -r1.7764
--- ChangeLog	10 Jun 2006 21:39:47 -0000	1.7763
+++ ChangeLog	11 Jun 2006 00:05:10 -0000	1.7764
@@ -1,3 +1,8 @@
+2006-06-11  Raif S. Naffah  <raif@swiftdsl.com.au>
+
+	* gnu/javax/security/auth/login/ConfigFileParser.java (validateClassName):
+	Check that every component of 'cn' starts with a valid Java identifier char.
+
 2006-06-10  Tom Tromey  <tromey@redhat.com>
 
 	* java/io/File.java (pathSeparator): Typo fix.

Index: gnu/javax/security/auth/login/ConfigFileParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/security/auth/login/ConfigFileParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/security/auth/login/ConfigFileParser.java	9 Jun 2006 16:41:14 -0000	1.2
+++ gnu/javax/security/auth/login/ConfigFileParser.java	11 Jun 2006 00:05:10 -0000	1.3
@@ -268,8 +268,9 @@
     for (int i = 0; i < tokens.length; i++)
       {
         String t = tokens[i];
-        if (Character.isJavaIdentifierStart(cn.toCharArray()[0]))
-          abort("");
+        if (! Character.isJavaIdentifierStart(t.toCharArray()[0]))
+          abort("Class name [" + cn
+                + "] contains an invalid sub-package identifier: " + t);
 
         // we dont check the rest of the characters for isJavaIdentifierPart()
         // because that's what the tokenizer does.



From MAILER-DAEMON Sat Jun 10 23:09:09 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpGK5-00007v-0x
	for mharc-commit-classpath@gnu.org; Sat, 10 Jun 2006 23:09:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpGK3-00005A-8v
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 23:09:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpGK1-0008Ug-Gw
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 23:09:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpGK1-0008Ud-B5
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 23:09:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpGSQ-0003kx-Hv
	for commit-classpath@gnu.org; Sat, 10 Jun 2006 23:17:46 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpGK0-0002sz-00
	for <commit-classpath@gnu.org>; Sat, 10 Jun 2006 23:09:04 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FpGJz-0002sw-LA
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 03:09:04 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpGJz-0002sw-LA@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Sun, 11 Jun 2006 03:09:03 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Freet...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jun 2006 03:09:08 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/11 03:09:03

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: FreetypeGlyphVector.java 
	java/awt/font  : TextLayout.java 

Log message:
	2006-06-11  Sven de Marothy  <sven@physto.se>
	
		* java/awt/font/TextLayout.java
		(getLogicalHighlightShape): Add check.
		* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
		(getLogicalBounds, getGlyphPositions): Cache bounds, positions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7764&r2=1.7765
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/TextLayout.java?cvsroot=classpath&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7764
retrieving revision 1.7765
diff -u -b -r1.7764 -r1.7765
--- ChangeLog	11 Jun 2006 00:05:10 -0000	1.7764
+++ ChangeLog	11 Jun 2006 03:09:02 -0000	1.7765
@@ -1,3 +1,10 @@
+2006-06-11  Sven de Marothy  <sven@physto.se>
+
+	* java/awt/font/TextLayout.java
+	(getLogicalHighlightShape): Add check.
+	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
+	(getLogicalBounds, getGlyphPositions): Cache bounds, positions.
+
 2006-06-11  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	* gnu/javax/security/auth/login/ConfigFileParser.java (validateClassName):

Index: gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	9 Jun 2006 20:23:55 -0000	1.4
+++ gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	11 Jun 2006 03:09:03 -0000	1.5
@@ -56,6 +56,9 @@
   private Font font;
   private GdkFontPeer peer; // ATTN: Accessed from native code.
 
+  private Rectangle2D logicalBounds;
+
+  private float[] glyphPositions;
   /**
    * The string represented by this GlyphVector.
    */
@@ -203,6 +206,9 @@
    */
   public void performDefaultLayout()
   {
+    logicalBounds = null; // invalidate caches.
+    glyphPositions = null;
+
     whiteSpace = new boolean[ nGlyphs ]; 
     glyphTransforms = new AffineTransform[ nGlyphs ]; 
     double x = 0;
@@ -303,6 +309,9 @@
   public float[] getGlyphPositions(int beginGlyphIndex, int numEntries, 
 				   float[] positionReturn)
   {
+    if( glyphPositions != null )
+      return glyphPositions;
+
     float[] rval;
 
     if( positionReturn == null )
@@ -317,6 +326,7 @@
 	rval[i * 2 + 1] = (float)p.getY();
       }
 
+    glyphPositions = rval;
     return rval;
   }
 
@@ -344,6 +354,8 @@
   {
     if( nGlyphs == 0 )
       return new Rectangle2D.Double(0, 0, 0, 0);
+    if( logicalBounds != null )
+      return logicalBounds;
 
     Rectangle2D rect = (Rectangle2D)getGlyphLogicalBounds( 0 );
     for( int i = 1; i < nGlyphs; i++ )
@@ -354,6 +366,7 @@
 	rect = rect.createUnion( r2 );
       }
 
+    logicalBounds = rect;
     return rect;
   }
 
@@ -413,6 +426,8 @@
     // FIXME: Scaling, etc.?
     glyphTransforms[ glyphIndex ].setToTranslation( newPos.getX(), 
 						    newPos.getY() );
+    logicalBounds = null;
+    glyphPositions = null;
   }
 
   /**
@@ -421,5 +436,7 @@
   public void setGlyphTransform(int glyphIndex, AffineTransform newTX)
   {
     glyphTransforms[ glyphIndex ].setTransform( newTX );
+    logicalBounds = null;
+    glyphPositions = null;
   }
 }

Index: java/awt/font/TextLayout.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/font/TextLayout.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- java/awt/font/TextLayout.java	9 Jun 2006 20:48:02 -0000	1.9
+++ java/awt/font/TextLayout.java	11 Jun 2006 03:09:03 -0000	1.10
@@ -391,6 +391,7 @@
     double advance = 0;
 
     // go to first run
+    if( i > 0 )
     while( runIndices[i + 1][1] < firstEndpoint ) 
       {
 	advance += runs[i].getLogicalBounds().getWidth();



From MAILER-DAEMON Sun Jun 11 03:05:35 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpK0t-0003g2-Fc
	for mharc-commit-classpath@gnu.org; Sun, 11 Jun 2006 03:05:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpK0r-0003fP-1g
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 03:05:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpK0o-0003eq-Ce
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 03:05:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpK0o-0003en-3a
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 03:05:30 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpK9E-0007sW-VA
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 03:14:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpK0m-00035D-00
	for <commit-classpath@gnu.org>; Sun, 11 Jun 2006 03:05:28 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FpK0m-00035A-GF
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 07:05:28 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpK0m-00035A-GF@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Sun, 11 Jun 2006 07:05:28 +0000
Subject: [commit-cp] classpath/gnu/javax/net/ssl/provider ServerHell...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jun 2006 07:05:33 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl-nio-branch
Changes by:	Casey Marshall <rsdio>	06/06/11 07:05:28

Modified files:
	gnu/javax/net/ssl/provider: ServerHello.java Extension.java 
	                            ClientHello.java 
	                            ServerHandshake.java 
	                            ExtensionList.java 
Added files:
	gnu/javax/net/ssl/provider: MaxFragmentLength.java 
	                            CertificateURL.java 
	                            UnresolvedExtensionValue.java 
	                            TruncatedHMAC.java 
	                            ServerNameList.java 
	                            TrustedAuthorities.java 
	                            CertificateStatusType.java 
	                            CertificateStatusRequest.java 

Log message:
	2006-06-10  Casey Marshall  <csm@gnu.org>
	
		* gnu/javax/net/ssl/provider/ServerHello.java (extensions): return
		an ExtensionList.
		(setExtensionsLength): set the length in the buffer.
		(toString): print out individual extensions.
		* gnu/javax/net/ssl/provider/Extension.java (valueBytes): new
		method.
		(valueBuffer): new method.
		(value): return an Extenion.Value.
		(toString): print out extension value.
		(Value): new abstract inner class.
		* gnu/javax/net/ssl/provider/ClientHello.java (extensions): return
		an ExtensionList.
		(setExtensionListLength): set the length in the buffer.
		(toString): print out extensions.
		* gnu/javax/net/ssl/provider/ServerHandshake.java
		(chooseSuite, chooseCompression): use generics and foreach loops.
		* gnu/javax/net/ssl/provider/ExtensionList.java: new class.
		* gnu/javax/net/ssl/provider/MaxFragmentLength.java: new class.
		* gnu/javax/net/ssl/provider/CertificateURL.java: new class.
		* gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java: new
		class. 
		* gnu/javax/net/ssl/provider/TruncatedHMAC.java: new class.
		* gnu/javax/net/ssl/provider/ServerNameList.java: new class.
		* gnu/javax/net/ssl/provider/TrustedAuthorities.java: new class.
		* gnu/javax/net/ssl/provider/CertificateStatusType.java: new
		class. 
		* gnu/javax/net/ssl/provider/CertificateStatusRequest.java: new
		class.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerHello.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/Extension.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.2&r2=1.1.4.1.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ClientHello.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerHandshake.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ExtensionList.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/MaxFragmentLength.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/CertificateURL.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/TruncatedHMAC.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerNameList.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/TrustedAuthorities.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/CertificateStatusType.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/CertificateStatusRequest.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1

Patches:
Index: ServerHello.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/ServerHello.java,v
retrieving revision 1.1.4.1.2.1
retrieving revision 1.1.4.1.2.2
diff -u -b -r1.1.4.1.2.1 -r1.1.4.1.2.2
--- ServerHello.java	3 Jun 2006 07:49:53 -0000	1.1.4.1.2.1
+++ ServerHello.java	11 Jun 2006 07:05:28 -0000	1.1.4.1.2.2
@@ -67,6 +67,7 @@
   SessionID session_id;
   CipherSuite cipher_suite;
   CompressionMethod compression_method;
+  Extensions server_hello_extension_list&lt;0..2^16-1&gt;
 } ServerHello;
 </pre>
  *
@@ -171,11 +172,19 @@
     return CompressionMethod.getInstance (buffer.get (offset) & 0xFF);
   }
 
-  public ByteBuffer extensions ()
+  public ExtensionList extensions ()
   {
     int offset = SESSID_OFFSET + (buffer.get (SESSID_OFFSET) & 0xFF) + 4;
-    return ((ByteBuffer) buffer.duplicate ().position (offset)
-            .limit (totalLength)).slice ();
+    if (offset == totalLength)
+      return null;
+    if (buffer.limit() <= offset)
+      return null;
+    int len = buffer.getShort(offset) & 0xFFFF;
+    if (len == 0)
+      len = buffer.limit() - offset - 2;
+    ByteBuffer ebuf = ((ByteBuffer) buffer.duplicate ().position (offset)
+                       .limit (offset + len + 2)).slice ();
+    return new ExtensionList (ebuf);
   }
 
   public void setVersion (final ProtocolVersion version)
@@ -213,7 +222,9 @@
   public void setExtensionsLength (final int length)
   {
     totalLength = (SESSID_OFFSET + (buffer.get (SESSID_OFFSET) & 0xFF)
-                   + 4 + length);
+                   + 4 + length + 4);
+    buffer.putShort (SESSID_OFFSET + (buffer.get (SESSID_OFFSET) & 0xFF) + 4,
+                     (short) length);
   }
 
   public String toString ()
@@ -250,13 +261,11 @@
     out.print ("compressionMethod: ");
     out.print (compressionMethod ());
     out.println (";");
-    ByteBuffer extbuf = extensions ();
-    if (extbuf.limit () > 0)
-      {
+    ExtensionList exts = extensions ();
         out.print (subprefix);
         out.println ("extensions:");
-        out.print (Util.hexDump (extbuf, subprefix));
-      }
+    out.println (exts != null ? exts.toString (subprefix+"  ")
+                                : subprefix + "  (nil)");
     if (prefix != null)
       out.print (prefix);
     out.print ("} ServerHello;");

Index: Extension.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/Extension.java,v
retrieving revision 1.1.4.1.2.2
retrieving revision 1.1.4.1.2.3
diff -u -b -r1.1.4.1.2.2 -r1.1.4.1.2.3
--- Extension.java	6 Jun 2006 01:01:19 -0000	1.1.4.1.2.2
+++ Extension.java	11 Jun 2006 07:05:28 -0000	1.1.4.1.2.3
@@ -83,7 +83,7 @@
     return Type.forValue (buffer.getShort (0) & 0xFFFF);
   }
 
-  public byte[] value()
+  public byte[] valueBytes()
   {
     int len = buffer.getShort (2) & 0xFFFF;
     byte[] value = new byte[len];
@@ -91,6 +91,48 @@
     return value;
   }
   
+  public ByteBuffer valueBuffer()
+  {
+    int len = buffer.getShort(2) & 0xFFFF;
+    return ((ByteBuffer) buffer.duplicate().position(4).limit(len+4)).slice();
+  }
+  
+  public Value value()
+  {
+    switch (type ())
+      {
+        case SERVER_NAME:
+          return new ServerNameList(valueBuffer());
+          
+        case MAX_FRAGMENT_LENGTH:
+          switch (valueBuffer().get() & 0xFF)
+            {
+              case 1: return MaxFragmentLength.LEN_2_9;
+              case 2: return MaxFragmentLength.LEN_2_10;
+              case 3: return MaxFragmentLength.LEN_2_11;
+              case 4: return MaxFragmentLength.LEN_2_12;
+              default:
+                throw new IllegalArgumentException("invalid max_fragment_len");
+            }
+          
+        case TRUNCATED_HMAC:
+          return new TruncatedHMAC();
+
+        case CLIENT_CERTIFICATE_URL:
+          return new CertificateURL(valueBuffer());
+          
+        case TRUSTED_CA_KEYS:
+          return new TrustedAuthorities(valueBuffer());
+          
+        case STATUS_REQUEST:
+          return new CertificateStatusRequest(valueBuffer());
+          
+        case SRP:
+        case CERT_TYPE:
+      }
+    return new UnresolvedExtensionValue(valueBuffer());
+  }
+  
   public void setLength (final int newLength)
   {
     if (newLength < 0 || newLength > 65535)
@@ -130,13 +172,14 @@
     out.println("  type = " + type () + ";");
     if (prefix != null) out.print (prefix);
     out.println("  value =");
-    out.println(Util.hexDump(value (), (prefix != null) ? prefix + "    " : "    "));
+//    out.println(Util.hexDump(value (), (prefix != null) ? prefix + "    " : "    "));
+    out.println(value());
     if (prefix != null) out.print (prefix);
     out.print("} Extension;");
     return str.toString();
   }
 
-  // Inner class.
+  // Inner classes.
   // -------------------------------------------------------------------------
 
   public static enum Type
@@ -178,4 +221,8 @@
       return value;
     }
   }
+  
+  public static abstract class Value implements Constructed
+  {
+  }
 }

Index: ClientHello.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/ClientHello.java,v
retrieving revision 1.1.4.1.2.1
retrieving revision 1.1.4.1.2.2
diff -u -b -r1.1.4.1.2.1 -r1.1.4.1.2.2
--- ClientHello.java	3 Jun 2006 07:49:53 -0000	1.1.4.1.2.1
+++ ClientHello.java	11 Jun 2006 07:05:28 -0000	1.1.4.1.2.2
@@ -67,6 +67,7 @@
   SessionID         session_id;                    // 1 + 0..32
   CipherSuite       cipher_suites&lt;2..2^16-1&gt;
   CompressionMethod compression_methods&lt;1..2^8-1&gt;
+  Extension         client_hello_extension_list&lt;0..2^16-1&gt;
 } ClientHello;
 </pre>
  */
@@ -156,11 +157,17 @@
     return new CompressionMethodList (listBuf);
   }
 
-  public ByteBuffer extensions()
+  public ExtensionList extensions()
   {
     int offset = getExtensionsOffset ();
-    return ((ByteBuffer) buffer.duplicate ().position (offset)
-            .limit (totalLength)).slice ();
+    if (offset >= buffer.limit())
+      return null;
+    int len = buffer.getShort(offset) & 0xFFFF;
+    if (len == 0)
+      len = buffer.limit() - offset - 2;
+    ByteBuffer ebuf = ((ByteBuffer) buffer.duplicate ().position (offset)
+                       .limit (offset + len + 2)).slice ();
+    return new ExtensionList (ebuf);
   }
 
   public void setVersion (final ProtocolVersion version)
@@ -183,7 +190,9 @@
 
   public void setExtensionsLength (final int length)
   {
-    this.totalLength = getExtensionsOffset () + length;
+    int offset = getExtensionsOffset();
+    this.totalLength = offset + length + 4;
+    buffer.putShort(offset, (short) length);
   }
 
   private int getCipherSuitesOffset ()
@@ -238,13 +247,10 @@
     out.print (subprefix);
     out.println ("compression_methods:");
     out.println (compressionMethods ().toString (subprefix));
-    ByteBuffer extbuf = extensions ();
-    if (extbuf.limit () > 0)
-      {
         out.print (subprefix);
-        out.println ("extensions:");
-        out.print (Util.hexDump (extbuf, subprefix));
-      }
+    out.print ("extensions: ");
+    ExtensionList el = extensions();
+    out.println (el != null ? el.toString(subprefix+"  ") : "(nil)");
     if (prefix != null)
       out.print (prefix);
     out.print ("} ClientHello;");

Index: ServerHandshake.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/Attic/ServerHandshake.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- ServerHandshake.java	3 Jun 2006 07:49:53 -0000	1.1.2.1
+++ ServerHandshake.java	11 Jun 2006 07:05:28 -0000	1.1.2.2
@@ -127,19 +127,18 @@
                                           final ProtocolVersion version)
     throws SSLException
   {
-    HashSet suites = new HashSet (enabledSuites.length);
-    for (int i = 0; i < enabledSuites.length; i++)
+    HashSet<CipherSuite> suites = new HashSet<CipherSuite> (enabledSuites.length);
+    for (String s : enabledSuites)
       {
-        CipherSuite suite = CipherSuite.forName (enabledSuites[i]);
+        CipherSuite suite = CipherSuite.forName (s);
         if (suite != null)
           {
             suite = suite.resolve (version);
             suites.add (suite);
           }
       }
-    for (int i = 0; i < clientSuites.size (); i++)
+    for (CipherSuite suite : clientSuites)
       {
-        CipherSuite suite = clientSuites.get (i);
         if (suites.contains (suite))
           return suite.resolve (version);
       }
@@ -159,14 +158,14 @@
     throws SSLException
   {
     // Scan for ZLIB first.
-    for (int i = 0; i < comps.size (); i++)
+    for (CompressionMethod cm : comps)
       {
-        if (comps.get (i).equals (CompressionMethod.ZLIB))
+        if (cm.equals (CompressionMethod.ZLIB))
           return CompressionMethod.ZLIB;
       }
-    for (int i = 0; i < comps.size (); i++)
+    for (CompressionMethod cm : comps)
       {
-        if (comps.get (i).equals (CompressionMethod.NULL))
+        if (cm.equals (CompressionMethod.NULL))
           return CompressionMethod.NULL;
       }
 

Index: ExtensionList.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/Attic/ExtensionList.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- ExtensionList.java	6 Jun 2006 01:01:19 -0000	1.1.2.1
+++ ExtensionList.java	11 Jun 2006 07:05:28 -0000	1.1.2.2
@@ -113,7 +113,7 @@
                                          + "list length");
     buffer.putShort(i, (short) e.type().getValue());
     buffer.putShort(i+2, (short) e.length());
-    ((ByteBuffer) buffer.duplicate().position(i+4)).put (e.value());
+    ((ByteBuffer) buffer.duplicate().position(i+4)).put (e.valueBuffer());
     modCount++;
   }
   

Index: MaxFragmentLength.java
===================================================================
RCS file: MaxFragmentLength.java
diff -N MaxFragmentLength.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ MaxFragmentLength.java	11 Jun 2006 07:05:28 -0000	1.1.2.1
@@ -0,0 +1,52 @@
+package gnu.javax.net.ssl.provider;
+
+import gnu.javax.net.ssl.provider.Extension.Value;
+
+/**
+ * Extension value 
+ * @author csm
+ */
+public class MaxFragmentLength extends Value
+{
+  public static final MaxFragmentLength LEN_2_9 = new MaxFragmentLength(1, 1 << 9);
+  public static final MaxFragmentLength LEN_2_10 = new MaxFragmentLength(2, 1 << 10);
+  public static final MaxFragmentLength LEN_2_11 = new MaxFragmentLength(3, 1 << 11);
+  public static final MaxFragmentLength LEN_2_12 = new MaxFragmentLength(4, 1 << 12);
+  
+  private final int value;
+  private final int length;
+  
+  private MaxFragmentLength(int value, int length)
+  {
+    this.value = value;
+    this.length = length;
+  }
+  
+  public int length()
+  {
+    return 1;
+  }
+
+  public int getValue ()
+  {
+    return value;
+  }
+  
+  public int maxLength()
+  {
+    return length;
+  }
+  
+  public String toString()
+  {
+    return toString(null);
+  }
+  
+  public String toString(String prefix)
+  {
+    String s = "max_fragment_length = ";
+    if (prefix != null)
+      s = prefix + s;
+    return s + maxLength() + ";";
+  }
+}

Index: CertificateURL.java
===================================================================
RCS file: CertificateURL.java
diff -N CertificateURL.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ CertificateURL.java	11 Jun 2006 07:05:28 -0000	1.1.2.1
@@ -0,0 +1,300 @@
+package gnu.javax.net.ssl.provider;
+
+import gnu.javax.net.ssl.provider.Extension.Value;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.NoSuchElementException;
+
+/**
+ * The CertificateURL extension value.
+ * 
+ * <pre>
+enum {
+  individual_certs(0), pkipath(1), (255)
+} CertChainType;
+
+enum {
+  false(0), true(1)
+} Boolean;
+
+struct {
+  CertChainType type;
+  URLAndOptionalHash url_and_hash_list&lt;1..2^16-1&gt;;
+} CertificateURL;
+
+struct {
+  opaque url&lt;1..2^16-1&gt;;
+  Boolean hash_present;
+  select (hash_present) {
+    case false: struct {};
+    case true: SHA1Hash;
+  } hash;
+} URLAndOptionalHash;
+
+opaque SHA1Hash[20];</pre>
+ *
+ * @author csm
+ *
+ */
+public class CertificateURL extends Value implements Iterable<CertificateURL.URLAndOptionalHash>
+{
+  private final ByteBuffer buffer;
+  
+  public CertificateURL(final ByteBuffer buffer)
+  {
+    this.buffer = buffer;
+  }
+  
+  public int length()
+  {
+    return 3 + (buffer.getShort(1) & 0xFFFF);
+  }
+
+  public CertChainType type()
+  {
+    switch (buffer.get(0))
+      {
+        case 0: return CertChainType.INDIVIDUAL_CERTS;
+        case 1: return CertChainType.PKIPATH;
+      }
+    throw new IllegalArgumentException("unknown certificate URL type");
+  }
+  
+  public int size()
+  {
+    int len = buffer.getShort(1) & 0xFFFF;
+    int n = 0;
+    for (int i = 3; i < len; )
+      {
+        URLAndOptionalHash u
+          = new URLAndOptionalHash((ByteBuffer) buffer.duplicate().position(i));
+        int l = u.length();
+        i += l;
+        n++;
+      }
+    return n;
+  }
+  
+  public URLAndOptionalHash get(int index)
+  {
+    int len = buffer.getShort(1) & 0xFFFF;
+    int n = 0;
+    int l = 0;
+    int i;
+    for (i = 3; i < len && n < index; )
+      {
+        URLAndOptionalHash u
+          = new URLAndOptionalHash((ByteBuffer) buffer.duplicate().position(i));
+        l = u.length();
+        i += l;
+        n++;
+      }
+    if (n < index)
+      throw new IndexOutOfBoundsException();
+    return new URLAndOptionalHash(((ByteBuffer) buffer.duplicate().position(i).limit(i+l)).slice());
+  }
+  
+  public void set(int index, URLAndOptionalHash url)
+  {
+    int len = buffer.getShort(1) & 0xFFFF;
+    int n = 0;
+    int i;
+    for (i = 3; i < len && n < index-1; )
+      {
+        URLAndOptionalHash u
+          = new URLAndOptionalHash((ByteBuffer) buffer.duplicate().position(i));
+        int l = u.length();
+        i += l;
+        n++;
+      }
+    if (n < index - 1)
+      throw new IndexOutOfBoundsException();
+    int l = url.urlLength();
+    buffer.putShort(i, (short) l);
+    ((ByteBuffer) buffer.duplicate().position(i+2)).put(url.urlBuffer());
+    buffer.put(i+l+2, (byte) (url.hashPresent() ? 1 : 0));
+    if (url.hashPresent())
+      ((ByteBuffer) buffer.duplicate().position(i+l+3)).put (url.sha1Hash());
+  }
+  
+  public void setLength(final int length)
+  {
+    if (length < 0 || length > 65535)
+      throw new IllegalArgumentException("length must be between 0 and 65535");
+    buffer.putShort(1, (short) length);
+  }
+  
+  public String toString()
+  {
+    return toString(null);
+  }
+  
+  public String toString(String prefix)
+  {
+    StringWriter str = new StringWriter();
+    PrintWriter out = new PrintWriter(str);
+    if (prefix != null) out.print(prefix);
+    out.println ("struct {");
+    if (prefix != null) out.print(prefix);
+    out.print("  type = ");
+    out.print(type());
+    out.println(";");
+    if (prefix != null) out.print(prefix);
+    out.println("  url_and_hash_list = {");
+    String subprefix = "  ";
+    if (prefix != null) subprefix = prefix + subprefix;
+    for (URLAndOptionalHash url : this)
+      {
+        out.println(url.toString(subprefix));
+      }
+    if (prefix != null) out.print(prefix);
+    out.println("  };");
+    if (prefix != null) out.print(prefix);
+    out.print("} CertificateURL;");
+    return str.toString();
+  }
+
+  public java.util.Iterator<URLAndOptionalHash> iterator()
+  {
+    return new Iterator();
+  }
+  
+  public class Iterator implements java.util.Iterator<URLAndOptionalHash>
+  {
+    private int index;
+    
+    public Iterator()
+    {
+      index = 0;
+    }
+    
+    public URLAndOptionalHash next() throws NoSuchElementException
+    {
+      try
+        {
+          return get(index++);
+        }
+      catch (IndexOutOfBoundsException ioobe)
+        {
+          throw new NoSuchElementException();
+        }
+    }
+    
+    public boolean hasNext()
+    {
+      return index < size();
+    }
+    
+    public void remove()
+    {
+      throw new UnsupportedOperationException();
+    }
+  }
+  
+  public static enum CertChainType
+  {
+    INDIVIDUAL_CERTS (0), PKIPATH (1);
+    
+    private final int value;
+    
+    private CertChainType (final int value)
+    {
+      this.value = value;
+    }
+    
+    public int getValue()
+    {
+      return value;
+    }
+  }
+  
+  public static class URLAndOptionalHash implements Constructed
+  {
+    private final ByteBuffer buffer;
+    
+    public URLAndOptionalHash (final ByteBuffer buffer)
+    {
+      this.buffer = buffer;
+    }
+    
+    public int length()
+    {
+      return ((buffer.getShort(0) & 0xFFFF)
+              + (hashPresent() ? 23 : 3));
+    }
+    
+    public String url()
+    {
+      Charset cs = Charset.forName("ASCII");
+      return cs.decode(urlBuffer()).toString();
+    }
+    
+    public int urlLength()
+    {
+      return buffer.getShort(0) & 0xFFFF;
+    }
+    
+    public ByteBuffer urlBuffer()
+    {
+      int len = urlLength();
+      return ((ByteBuffer) buffer.duplicate().position(2).limit(2+len)).slice();
+    }
+    
+    public boolean hashPresent()
+    {
+      int i = (buffer.getShort(0) & 0xFFFF) + 2;
+      byte b = buffer.get(i);
+      if (b == 0)
+        return false;
+      if (b == 1)
+        return true;
+      throw new IllegalArgumentException("expecting 0 or 1: " + (b & 0xFF));
+    }
+    
+    public byte[] sha1Hash()
+    {
+      int i = (buffer.getShort(0) & 0xFFFF) + 2;
+      byte b = buffer.get(i);
+      if (b == 0)
+        return null;
+      byte[] buf = new byte[20];
+      ((ByteBuffer) buffer.duplicate().position(i+1)).get(buf);
+      return buf;
+    }
+    
+    public String toString()
+    {
+      return toString(null);
+    }
+    
+    public String toString(final String prefix)
+    {
+      StringWriter str = new StringWriter();
+      PrintWriter out = new PrintWriter(str);
+      if (prefix != null) out.print(prefix);
+      out.println("struct {");
+      if (prefix != null) out.print(prefix);
+      out.print("  url = ");
+      out.print(url());
+      out.println(";");
+      boolean has_hash = hashPresent();
+      if (prefix != null) out.print(prefix);
+      out.print("  hash_present = ");
+      out.print(has_hash);
+      out.println(";");
+      if (has_hash)
+        {
+          if (prefix != null) out.print(prefix);
+          out.print("  sha1Hash = ");
+          out.print(Util.toHexString(sha1Hash(), ':'));
+          out.println(";");
+        }
+      if (prefix != null) out.print(prefix);
+      out.print("} URLAndOptionalHash;");
+      return str.toString();
+    }
+  }
+}

Index: UnresolvedExtensionValue.java
===================================================================
RCS file: UnresolvedExtensionValue.java
diff -N UnresolvedExtensionValue.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ UnresolvedExtensionValue.java	11 Jun 2006 07:05:28 -0000	1.1.2.1
@@ -0,0 +1,40 @@
+package gnu.javax.net.ssl.provider;
+
+import gnu.javax.net.ssl.provider.Extension.Value;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.ByteBuffer;
+
+public class UnresolvedExtensionValue extends Value
+{
+  private final ByteBuffer buffer;
+  
+  public UnresolvedExtensionValue (final ByteBuffer buffer)
+  {
+    this.buffer = buffer;
+  }
+  
+  public int length()
+  {
+    return buffer.limit();
+  }
+  
+  public ByteBuffer value()
+  {
+    return buffer.slice();
+  }
+  
+  public String toString()
+  {
+    return toString(null);
+  }
+  
+  public String toString(final String prefix)
+  {
+    String s = Util.hexDump(buffer);
+    if (prefix != null)
+      s = prefix + s;
+    return s;
+  }
+}

Index: TruncatedHMAC.java
===================================================================
RCS file: TruncatedHMAC.java
diff -N TruncatedHMAC.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ TruncatedHMAC.java	11 Jun 2006 07:05:28 -0000	1.1.2.1
@@ -0,0 +1,31 @@
+package gnu.javax.net.ssl.provider;
+
+import gnu.javax.net.ssl.provider.Extension.Value;
+
+/**
+ * The value type for the {@link Extension.Type#TRUNCATED_HMAC} extension.
+ * This extension has an empty value; this class is thusly empty.
+ * 
+ * @author csm
+ */
+public class TruncatedHMAC extends Value
+{
+
+  public int length()
+  {
+    return 0;
+  }
+  
+  public String toString()
+  {
+    return toString(null);
+  }
+
+  public String toString(String prefix)
+  {
+    String s = "TruncatedHMAC;";
+    if (prefix != null)
+      s = prefix + s;
+    return s;
+  }
+}

Index: ServerNameList.java
===================================================================
RCS file: ServerNameList.java
diff -N ServerNameList.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ServerNameList.java	11 Jun 2006 07:05:28 -0000	1.1.2.1
@@ -0,0 +1,225 @@
+package gnu.javax.net.ssl.provider;
+
+import gnu.javax.net.ssl.provider.Extension.Value;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.NoSuchElementException;
+
+/**
+ * The ServerName extension.
+ * 
+ * <pre>
+ struct {
+   NameType name_type;
+   select (name_type) {
+     case host_name: HostName;
+   } name;
+} ServerName;
+
+enum {
+  host_name(0), (255)
+} NameType;
+
+opaque HostName<1..2^16-1>;
+
+struct {
+  ServerName server_name_list<1..2^16-1>
+} ServerNameList;</pre>
+ *
+ * <p><b>Implementation note: this class does not currently contain a
+ * <code>set</code> method. If you are modifying this list, then use the
+ * {@link #get(int)} method, and modify the returned {@link ServerName}.
+ *
+ * @author csm
+ */
+public class ServerNameList extends Value implements Iterable<ServerNameList.ServerName>
+{
+  private final ByteBuffer buffer;
+  
+  public ServerNameList (final ByteBuffer buffer)
+  {
+    this.buffer = buffer;
+  }
+
+  public int length()
+  {
+    return buffer.getShort(0) & 0xFFFF;
+  }
+  
+  public int size()
+  {
+    int n = 0;
+    final int len = length();
+    for (int i = 2; i < len; )
+      {
+        int l = buffer.getShort(i+1);
+        i += l + 3;
+        n++;
+      }
+    return n;
+  }
+  
+  public ServerName get (int index)
+  {
+    final int len = length();
+    if (len == 0)
+      throw new IndexOutOfBoundsException("0; " + index);
+    int n = 0;
+    int i;
+    int l = 0;
+    for (i = 2; i < len && n < index; )
+      {
+        l = buffer.getShort(i+1);
+        i += l + 3;
+        n++;
+      }
+    if (n < index)
+      throw new IndexOutOfBoundsException(n + "; " + index);
+    ByteBuffer buf = ((ByteBuffer) buffer.duplicate().position(i).limit(i+l+3)).slice();
+    return new ServerName (buf);
+  }
+  
+  public void setLength(final int newLength)
+  {
+    if (newLength < 0 || newLength > 65535)
+      throw new IllegalArgumentException("length must be between 0 and 65535");
+    buffer.putShort(0, (short) newLength);
+  }
+  
+  public String toString()
+  {
+    return toString(null);
+  }
+
+  public String toString(String prefix)
+  {
+    StringWriter str = new StringWriter();
+    PrintWriter out = new PrintWriter(str);
+    if (prefix != null) out.print(prefix);
+    out.println ("ServerNameList {");
+    String subprefix = "  ";
+    if (prefix != null)
+      subprefix = prefix + subprefix;
+    for (ServerName name : this)
+      {
+        out.println (name.toString(subprefix));
+      }
+    if (prefix != null) out.print(prefix);
+    out.print ("};");
+    return str.toString();
+  }
+  
+  public java.util.Iterator<ServerName> iterator()
+  {
+    return new Iterator();
+  }
+
+  public class Iterator implements java.util.Iterator<ServerName>
+  {
+    private int index;
+    
+    public Iterator()
+    {
+      index = 0;
+    }
+    
+    public boolean hasNext()
+    {
+      return index < size();
+    }
+    
+    public ServerName next() throws NoSuchElementException
+    {
+      try
+        {
+          return get (index++);
+        }
+      catch (IndexOutOfBoundsException ioobe)
+        {
+          throw new NoSuchElementException();
+        }
+    }
+    
+    public void remove()
+    {
+      throw new UnsupportedOperationException();
+    }
+  }
+
+  public static class ServerName implements Constructed
+  {
+    private final ByteBuffer buffer;
+    
+    public ServerName(final ByteBuffer buffer)
+    {
+      this.buffer = buffer;
+    }
+    
+    public int length()
+    {
+      return buffer.getShort(1) & 0xFFFF;
+    }
+
+    public NameType type()
+    {
+      int v = (buffer.get(0) & 0xFF);
+      if (v == 0)
+        {
+          return NameType.HOST_NAME;
+        }
+      throw new IllegalArgumentException ("illegal name type: " + v);
+    }
+    
+    public String name()
+    {
+      int len = length();
+      Charset cs = Charset.forName ("UTF-8");
+      return cs.decode(((ByteBuffer) buffer.duplicate().position(3).limit(len))).toString();
+    }
+    
+    public String toString()
+    {
+      return toString (null);
+    }
+    
+    public String toString(String prefix)
+    {
+      StringWriter str = new StringWriter();
+      PrintWriter out = new PrintWriter(str);
+      if (prefix != null) out.print (prefix);
+      out.println ("struct {");
+      if (prefix != null) out.print (prefix);
+      out.print ("  name_type = ");
+      out.print (type());
+      out.println (";");
+      if (prefix != null) out.print (prefix);
+      out.print ("  server_name = ");
+      out.print (name());
+      out.println (";");
+      if (prefix != null) out.print (prefix);
+      out.print ("} ServerName;");
+      return str.toString();
+    }
+  }
+
+  public static enum NameType
+  {
+    HOST_NAME (0);
+    
+    private final int value;
+    
+    private NameType (int value)
+    {
+      this.value = value;
+    }
+    
+    public int getValue()
+    {
+      return value;
+    }
+  }
+}

Index: TrustedAuthorities.java
===================================================================
RCS file: TrustedAuthorities.java
diff -N TrustedAuthorities.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ TrustedAuthorities.java	11 Jun 2006 07:05:28 -0000	1.1.2.1
@@ -0,0 +1,252 @@
+package gnu.javax.net.ssl.provider;
+
+import gnu.java.security.x509.X500DistinguishedName;
+import gnu.javax.net.ssl.provider.Extension.Value;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.ByteBuffer;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+import javax.security.auth.x500.X500Principal;
+
+/**
+ * The trusted authorities hello extension.
+ * 
+ * <pre>
+struct {
+  TrustedAuthority trusted_authorities_list&lt;0..2^16-1&gt;;
+} TrustedAuthorities;
+
+struct {
+  IdentifierType identifier_type;
+  select (identifier_type) {
+    case pre_agreed: struct {};
+    case key_sha1_hash: SHA1Hash;
+    case x509_name: DistinguishedName;
+    case cert_sha1_hash: SHA1Hash;
+  } identifier;
+} TrustedAuthority;
+
+enum {
+  pre_agreed(0), key_sha1_hash(1), x509_name(2),
+  cert_sha1_hash(3), (255)
+} IdentifierType;
+
+opaque DistinguishedName&lt;1..2^16-1&gt;;</pre>
+ * 
+ * @author csm
+ */
+public class TrustedAuthorities extends Value
+  implements Iterable<TrustedAuthorities.TrustedAuthority>
+{
+  private final ByteBuffer buffer;
+
+  public TrustedAuthorities(final ByteBuffer buffer)
+  {
+    this.buffer = buffer;
+  }
+  
+  public int length()
+  {
+    return 2 + (buffer.getShort(0) & 0xFFFF);
+  }
+  
+  public int size()
+  {
+    int len = buffer.getShort(0) & 0xFFFF;
+    int n = 0;
+    for (int i = 2; i < len; i++)
+      {
+        TrustedAuthority auth =
+          new TrustedAuthority((ByteBuffer) buffer.duplicate().position(i));
+        i += auth.length();
+        n++;
+      }
+    return n;
+  }
+
+  public TrustedAuthority get(final int index)
+  {
+    int len = buffer.getShort(0) & 0xFFFF;
+    int n = 0;
+    int i = 2;
+    while (i < len && n <= index)
+      {
+        TrustedAuthority auth =
+          new TrustedAuthority((ByteBuffer) buffer.duplicate().position(i));
+        if (n == index)
+          return auth;
+        i += auth.length();
+        n++;
+      }
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public String toString()
+  {
+    return toString(null);
+  }
+  
+  public String toString(String prefix)
+  {
+    StringWriter str = new StringWriter();
+    PrintWriter out = new PrintWriter(str);
+    if (prefix != null) out.print(prefix);
+    out.println("struct {");
+    String subprefix = "  ";
+    if (prefix != null)
+      subprefix = prefix + subprefix;
+    for(TrustedAuthority ta : this)
+      out.println(ta);
+    if (prefix != null) out.print(prefix);
+    out.print("} TrustedAuthorities;");
+    return str.toString();
+  }
+  
+  public Iterator<TrustedAuthority> iterator()
+  {
+    return new AuthoritiesIterator();
+  }
+  
+  public class AuthoritiesIterator implements Iterator<TrustedAuthority>
+  {
+    private int index;
+    
+    public AuthoritiesIterator()
+    {
+      index = 0;
+    }
+    
+    public TrustedAuthority next() throws NoSuchElementException
+    {
+      try
+        {
+          return get(index++);
+        }
+      catch (IndexOutOfBoundsException ioobe)
+        {
+          throw new NoSuchElementException();
+        }
+    }
+    
+    public boolean hasNext()
+    {
+      return index < size();
+    }
+    
+    public void remove()
+    {
+      throw new UnsupportedOperationException();
+    }
+  }
+
+  public static class TrustedAuthority implements Constructed
+  {
+    private final ByteBuffer buffer;
+    
+    public TrustedAuthority(final ByteBuffer buffer)
+    {
+      this.buffer = buffer;
+    }
+    
+    public int length()
+    {
+      switch (type().getValue())
+      {
+        case 0: return 1;
+        case 1:
+        case 3: return 21;
+        case 2: return 3 + (buffer.getShort(1) & 0xFFFF);
+      }
+      throw new IllegalArgumentException("unknown authority type");
+    }
+    
+    public byte[] sha1Hash()
+    {
+      IdentifierType t = type();
+      if (t != IdentifierType.CERT_SHA1_HASH
+          && t != IdentifierType.KEY_SHA1_HASH)
+        throw new IllegalArgumentException(t + " does not have a hash value");
+      byte[] b = new byte[20];
+      ((ByteBuffer) buffer.duplicate().position(1)).get(b);
+      return b;
+    }
+    
+    public X500Principal name()
+    {
+      int len = buffer.getShort(1) & 0xFFFF;
+      byte[] b = new byte[len];
+      ((ByteBuffer) buffer.duplicate().position(3)).get(b);
+      return new X500Principal(b);
+    }
+    
+    public IdentifierType type()
+    {
+      switch (buffer.get(0))
+      {
+        case 0: return IdentifierType.PRE_AGREED;
+        case 1: return IdentifierType.KEY_SHA1_HASH;
+        case 2: return IdentifierType.X509_NAME;
+        case 3: return IdentifierType.CERT_SHA1_HASH;
+      }
+      
+      throw new IllegalArgumentException("invalid IdentifierType");
+    }
+    
+    public String toString()
+    {
+      return toString(null);
+    }
+    
+    public String toString(String prefix)
+    {
+      StringWriter str = new StringWriter();
+      PrintWriter out = new PrintWriter(str);
+      if (prefix != null) out.print(prefix);
+      out.println("struct {");
+      if (prefix != null) out.print(prefix);
+      out.print("  identifier_type = ");
+      out.print(type());
+      out.println(";");
+      switch (type().getValue())
+      {
+        case 0: break;
+        case 1:
+        case 3:
+          if (prefix != null) out.print(prefix);
+          out.print("  sha1_hash = ");
+          out.print(Util.toHexString(sha1Hash(), ':'));
+          out.println(";");
+          break;
+          
+        case 2:
+          if (prefix != null) out.print(prefix);
+          out.print("  name = ");
+          out.print(name());
+          out.println(";");
+      }
+      if (prefix != null) out.print(prefix);
+      out.print("} TrustedAuthority;");
+      return str.toString();
+    }
+  }
+  
+  public static enum IdentifierType
+  {
+    PRE_AGREED (0), KEY_SHA1_HASH (1), X509_NAME (2), CERT_SHA1_HASH (3);
+    
+    private final int value;
+    
+    private IdentifierType(final int value)
+    {
+      this.value = value;
+    }
+    
+    public int getValue()
+    {
+      return value;
+    }
+  }
+}

Index: CertificateStatusType.java
===================================================================
RCS file: CertificateStatusType.java
diff -N CertificateStatusType.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ CertificateStatusType.java	11 Jun 2006 07:05:28 -0000	1.1.2.1
@@ -0,0 +1,13 @@
+package gnu.javax.net.ssl.provider;
+
+public enum CertificateStatusType
+{
+  OCSP (1);
+  
+  public final int value;
+  
+  private CertificateStatusType (final int value)
+  {
+    this.value = value;
+  }
+}

Index: CertificateStatusRequest.java
===================================================================
RCS file: CertificateStatusRequest.java
diff -N CertificateStatusRequest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ CertificateStatusRequest.java	11 Jun 2006 07:05:28 -0000	1.1.2.1
@@ -0,0 +1,204 @@
+package gnu.javax.net.ssl.provider;
+
+import gnu.javax.net.ssl.provider.Extension.Value;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.ByteBuffer;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * <pre>
+struct {
+  CertificateStatusType status_type;
+  select (status_type) {
+    case ocsp: OCSPStatusRequest;
+  } request;
+} CertificateStatusRequest;
+
+enum { ocsp(1), (255) } CertificateStatusType;
+
+struct {
+  ResponderID responder_id_list&lt;0..2^16-1&gt;;
+  Extensions  request_extensions;
+} OCSPStatusRequest;
+
+opaque ResponderID&lt;1..2^16-1&gt;;
+opaque Extensions&lt;0..2^16-1&gt;;</pre>
+ *
+ * @author csm
+ */
+public class CertificateStatusRequest extends Value implements Iterable<byte[]>
+{
+  private final ByteBuffer buffer;
+  
+  public CertificateStatusRequest(final ByteBuffer buffer)
+  {
+    this.buffer = buffer;
+  }
+
+  public int length()
+  {
+    int l = 3 + (buffer.getShort(1) & 0xFFFF);
+    return l + (buffer.getShort(l) & 0xFFFF) + 2;
+  }
+  
+  public CertificateStatusType statusType()
+  {
+    int x = buffer.get(0) & 0xFF;
+    if (x == 1)
+      return CertificateStatusType.OCSP;
+    throw new IllegalArgumentException ("invalid type: " + x);
+  }
+
+  public int size()
+  {
+    int len = buffer.getShort(1) & 0xFFFF;
+    int n = 0;
+    for (int i = 3; i < len; )
+      {
+        int l = buffer.getShort(i);
+        i += l + 2;
+        n++;
+      }
+    return n;
+  }
+  
+  public byte[] responderId(int index)
+  {
+    int len = buffer.getShort(1) & 0xFFFF;
+    int n = 0;
+    int i = 3;
+    while (i < len && n <= index)
+      {
+        int l = buffer.getShort(i) & 0xFFFF;
+        if (n == index)
+          {
+            byte[] b = new byte[l];
+            ((ByteBuffer) buffer.duplicate().position(i+2)).get(b);
+            return b;
+          }
+        i += l + 2;
+        n++;
+      }
+    throw new IndexOutOfBoundsException();
+  }
+  
+  public byte[] requestExtensions()
+  {
+    int l = 2 + (buffer.getShort(0) & 0xFFFF);
+    int ll = buffer.getShort(l) & 0xFFFF;
+    byte[] b = new byte[ll];
+    ((ByteBuffer) buffer.duplicate().position(ll+2)).get(b);
+    return b;
+  }
+  
+  public void setStatusType(CertificateStatusType type)
+  {
+    buffer.put(0, (byte) type.value);
+  }
+  
+  public void setRequestIdListLength(int newLength)
+  {
+    if (newLength < 0 || newLength > 0xFFFF)
+      throw new IllegalArgumentException("length out of range");
+    buffer.putShort(1, (short) newLength);
+  }
+  
+  public void putRequestId(int index, byte[] id)
+  {
+    if (id.length > 0xFFFF)
+      throw new IllegalArgumentException("request ID too large");
+    int len = buffer.getShort(1) & 0xFFFF;
+    int n = 0;
+    int i = 3;
+    while (i < len && n < index)
+      {
+        int l = buffer.getShort(i) & 0xFFFF;
+        i += l + 2;
+        n++;
+      }
+    if (n < index)
+      throw new IndexOutOfBoundsException();
+    buffer.putShort(i, (short) id.length);
+    ((ByteBuffer) buffer.duplicate().position(i)).put(id);
+  }
+  
+  public void setRequestExtensions(int index, byte[] ext)
+  {
+    if (ext.length > 0xFFFF)
+      throw new IllegalArgumentException("exceptions too large");
+    int off = 3 + (buffer.getShort(1) & 0xFFFF);
+    buffer.putShort(off, (short) ext.length);
+    ((ByteBuffer) buffer.duplicate().position(off+2)).put(ext);
+  }
+  
+  public Iterator<byte[]> iterator()
+  {
+    return new ResponderIdIterator();
+  }
+  
+  public String toString()
+  {
+    return toString(null);
+  }
+  
+  public String toString(String prefix)
+  {
+    StringWriter str = new StringWriter();
+    PrintWriter out = new PrintWriter(str);
+    if (prefix != null) out.print(prefix);
+    out.println("struct {");
+    if (prefix != null) out.print(prefix);
+    out.print("  status_type = ");
+    out.print(statusType());
+    out.println(";");
+    String subprefix = "    ";
+    if (prefix != null) subprefix = prefix + subprefix;
+    if (prefix != null) out.print(prefix);
+    out.println("  responder_id_list = {");
+    for (byte[] b : this)
+      out.print(Util.hexDump(b, subprefix));
+    if (prefix != null) out.print(prefix);
+    out.println("  };");
+    if (prefix != null) out.print(prefix);
+    out.println("  request_extensions =");
+    out.print(Util.hexDump(requestExtensions(), subprefix));
+    if (prefix != null) out.print(prefix);
+    out.print("} CertificateStatus;");
+    return str.toString();
+  }
+  
+  public class ResponderIdIterator implements Iterator<byte[]>
+  {
+    private int index;
+    
+    public ResponderIdIterator()
+    {
+      index = 0;
+    }
+    
+    public byte[] next() throws NoSuchElementException
+    {
+      try
+        {
+          return responderId(index++);
+        }
+      catch (IndexOutOfBoundsException ioobe)
+        {
+          throw new NoSuchElementException();
+        }
+    }
+    
+    public boolean hasNext()
+    {
+      return index < size();
+    }
+    
+    public void remove()
+    {
+      throw new UnsupportedOperationException();
+    }
+  }
+}



From MAILER-DAEMON Sun Jun 11 03:20:49 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpKFd-0000VS-LJ
	for mharc-commit-classpath@gnu.org; Sun, 11 Jun 2006 03:20:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpKFb-0000Uu-Fu
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 03:20:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpKFa-0000Ti-1B
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 03:20:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpKFZ-0000Tf-Uh
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 03:20:45 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpKO1-0000Nn-OP
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 03:29:29 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpKFX-0003DY-00
	for <commit-classpath@gnu.org>; Sun, 11 Jun 2006 03:20:43 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FpKFW-0003DT-7N
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 07:20:43 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpKFW-0003DT-7N@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sun, 11 Jun 2006 07:20:42 +0000
Subject: [commit-cp] classpath/gnu/javax/crypto RSACipherImpl.java C...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jun 2006 07:20:47 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/11 07:20:41

Modified files:
	gnu/javax/crypto: RSACipherImpl.java 
	.              : ChangeLog 

Log message:
	2006-06-11  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		PR Classpath/27853
		* gnu/javax/crypto/RSACipherImpl.java (engineDoFinal): Was short by 1 byte.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/RSACipherImpl.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7765&r2=1.7766

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7765
retrieving revision 1.7766
diff -u -b -r1.7765 -r1.7766
--- ChangeLog	11 Jun 2006 03:09:02 -0000	1.7765
+++ ChangeLog	11 Jun 2006 07:20:41 -0000	1.7766
@@ -1,3 +1,8 @@
+2006-06-11  Raif S. Naffah  <raif@swiftdsl.com.au>
+
+	PR Classpath/27853
+	* gnu/javax/crypto/RSACipherImpl.java (engineDoFinal): Was short by 1 byte.
+
 2006-06-11  Sven de Marothy  <sven@physto.se>
 
 	* java/awt/font/TextLayout.java



From MAILER-DAEMON Sun Jun 11 03:23:29 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpKID-0000eA-4z
	for mharc-commit-classpath@gnu.org; Sun, 11 Jun 2006 03:23:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpKIB-0000e4-Jk
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 03:23:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpKIA-0000dr-2e
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 03:23:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpKI9-0000do-TS
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 03:23:25 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpKQb-0000cs-FO
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 03:32:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpKI9-0003F4-00
	for <commit-classpath@gnu.org>; Sun, 11 Jun 2006 03:23:25 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FpKI8-0003F1-UK
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 07:23:25 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpKI8-0003F1-UK@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Sun, 11 Jun 2006 07:23:24 +0000
Subject: [commit-cp] classpath ChangeLog-ssl-nio jessie-tests/testEx...
	[generics-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jun 2006 07:23:27 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics-branch
Changes by:	Casey Marshall <rsdio>	06/06/11 07:23:24

Modified files:
	.              : ChangeLog-ssl-nio 
	jessie-tests   : testExtensionsList.java testServerHello.java 
	                 testClientHello.java 

Log message:
	2006-06-10  Casey Marshall  <csm@gnu.org>
	
		* jessie-tests/testClientHello.java: update for extensions
		changes.
		* jessie-tests/testExtensionList.java: likewise.
		* jessie-tests/testServerHello.java: likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/jessie-tests/testExtensionsList.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/jessie-tests/testServerHello.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/jessie-tests/testClientHello.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.1&r2=1.1.2.2

Patches:
Index: ChangeLog-ssl-nio
===================================================================
RCS file: /cvsroot/classpath/classpath/Attic/ChangeLog-ssl-nio,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- ChangeLog-ssl-nio	6 Jun 2006 01:01:19 -0000	1.1.2.4
+++ ChangeLog-ssl-nio	11 Jun 2006 07:23:24 -0000	1.1.2.5
@@ -1,3 +1,41 @@
+2006-06-10  Casey Marshall  <csm@gnu.org>
+
+	* jessie-tests/testClientHello.java: update for extensions
+	changes.
+	* jessie-tests/testExtensionList.java: likewise.
+	* jessie-tests/testServerHello.java: likewise.
+
+2006-06-10  Casey Marshall  <csm@gnu.org>
+
+	* gnu/javax/net/ssl/provider/ServerHello.java (extensions): return
+	an ExtensionList.
+	(setExtensionsLength): set the length in the buffer.
+	(toString): print out individual extensions.
+	* gnu/javax/net/ssl/provider/Extension.java (valueBytes): new
+	method.
+	(valueBuffer): new method.
+	(value): return an Extenion.Value.
+	(toString): print out extension value.
+	(Value): new abstract inner class.
+	* gnu/javax/net/ssl/provider/ClientHello.java (extensions): return
+	an ExtensionList.
+	(setExtensionListLength): set the length in the buffer.
+	(toString): print out extensions.
+	* gnu/javax/net/ssl/provider/ServerHandshake.java
+	(chooseSuite, chooseCompression): use generics and foreach loops.
+	* gnu/javax/net/ssl/provider/ExtensionList.java: new class.
+	* gnu/javax/net/ssl/provider/MaxFragmentLength.java: new class.
+	* gnu/javax/net/ssl/provider/CertificateURL.java: new class.
+	* gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java: new
+	class. 
+	* gnu/javax/net/ssl/provider/TruncatedHMAC.java: new class.
+	* gnu/javax/net/ssl/provider/ServerNameList.java: new class.
+	* gnu/javax/net/ssl/provider/TrustedAuthorities.java: new class.
+	* gnu/javax/net/ssl/provider/CertificateStatusType.java: new
+	class. 
+	* gnu/javax/net/ssl/provider/CertificateStatusRequest.java: new
+	class.
+
 2006-06-05  Casey Marshall  <csm@gnu.org>
 
 	* gnu/javax/net/ssl/provider/Extension.java: add Javadoc.

Index: jessie-tests/testExtensionsList.java
===================================================================
RCS file: /cvsroot/classpath/classpath/jessie-tests/Attic/testExtensionsList.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- jessie-tests/testExtensionsList.java	6 Jun 2006 01:01:20 -0000	1.1.2.1
+++ jessie-tests/testExtensionsList.java	11 Jun 2006 07:23:24 -0000	1.1.2.2
@@ -44,7 +44,7 @@
       System.out.println ("PASS: get(0).type()");
     else
       System.out.println ("FAIL: get(0).type()");
-    if (Arrays.equals (e.value(), new byte[] { 1 }))
+    if (Arrays.equals (e.valueBytes(), new byte[] { 1 }))
       System.out.println ("PASS: get(0).value()");
     else
       System.out.println ("FAIL: get(0).value()");
@@ -54,7 +54,7 @@
       System.out.println ("PASS: get(1).type()");
     else
       System.out.println ("FAIL: get(1).type()");
-    if (Arrays.equals(e.value(), new byte[3]))
+    if (Arrays.equals(e.valueBytes(), new byte[3]))
       System.out.println ("PASS: get(1).value()");
     else
       System.out.println ("FAIL: get(1).value()");

Index: jessie-tests/testServerHello.java
===================================================================
RCS file: /cvsroot/classpath/classpath/jessie-tests/Attic/testServerHello.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- jessie-tests/testServerHello.java	3 Jun 2006 07:44:41 -0000	1.1.2.1
+++ jessie-tests/testServerHello.java	11 Jun 2006 07:23:24 -0000	1.1.2.2
@@ -1,6 +1,8 @@
 
 import gnu.javax.net.ssl.provider.CipherSuite;
 import gnu.javax.net.ssl.provider.CompressionMethod;
+import gnu.javax.net.ssl.provider.Extension;
+import gnu.javax.net.ssl.provider.ExtensionList;
 import gnu.javax.net.ssl.provider.Handshake;
 import gnu.javax.net.ssl.provider.ProtocolVersion;
 import gnu.javax.net.ssl.provider.Random;
@@ -48,7 +50,14 @@
     hello.setSessionId (sessionId);
     hello.setCipherSuite (CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA);
     hello.setCompressionMethod (CompressionMethod.ZLIB);
-    hello.setExtensionsLength (0);
+    hello.setExtensionsLength (12);
+    ExtensionList exts = hello.extensions();
+    // Max fragment length of 2^9-1
+    exts.set (0, Extension.Type.MAX_FRAGMENT_LENGTH, 1); // 2 + 2 + 1
+    exts.get (0).setValue (new byte[] { 1 });
+    // Zero-length server name.
+    exts.set (1, Extension.Type.SERVER_NAME, 3); // 2 + 2 + 3
+    exts.get(1).setValue(new byte[3]);
 
     handshake.setLength (hello.length ());
     System.err.println (handshake);
@@ -69,5 +78,58 @@
       System.out.println ("PASS: compressionMethod");
     else
       System.out.println ("FAIL: compressionMethod");
+    
+    exts = hello.extensions();
+    Extension e = exts.get(0);
+    if (e.type() == Extension.Type.MAX_FRAGMENT_LENGTH)
+      System.out.println ("PASS: extensions().get(0).type");
+    else
+      System.out.println ("FAIL: extensions().get(0).type");
+    if (Arrays.equals(e.valueBytes(), new byte[] { 1 }))
+      System.out.println ("PASS: extensions().get(0).value");
+    else
+      System.out.println ("FAIL: extensions().get(0).value");
+
+    e = exts.get(1);
+    if (e.type() == Extension.Type.SERVER_NAME)
+      System.out.println ("PASS: extensions().get(1).type");
+    else
+      System.out.println ("FAIL: extensions().get(1).type");
+    if (Arrays.equals(e.valueBytes(), new byte[3]))
+      System.out.println ("PASS: extensions().get(1).value");
+    else
+      System.out.println ("FAIL: extensions().get(1).value");
+ 
+    // Part 2: with no extensions.
+    buffer = ByteBuffer.allocate (74);
+    handshake = new Handshake (buffer);
+
+    handshake.setType (Handshake.Type.SERVER_HELLO);
+    handshake.setLength (70);
+
+    hello = (ServerHello) handshake.body ();
+
+    hello.setVersion (ProtocolVersion.TLS_1); // 2
+    random = hello.random ();
+    random.setGmtUnixTime (123456);
+    nonce = new byte[28];
+    for (int i = 0; i < nonce.length; i++)
+      nonce[i] = (byte) i;
+    random.setRandomBytes (nonce);            // + 32
+    sessionId = new byte[32];
+    for (int i = 0; i < sessionId.length; i++)
+      sessionId[i] = (byte) i;
+    hello.setSessionId (sessionId);           // + 33
+    hello.setCipherSuite (CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA); // + 2
+    hello.setCompressionMethod (CompressionMethod.ZLIB); // + 1
+    
+    handshake = new Handshake (buffer);
+    hello = (ServerHello) handshake.body();
+    if (hello.extensions() == null)
+      System.out.println ("PASS: hello.extensions() == null");
+    else
+      System.out.println ("FAIL: hello.extensions() != null");
+    
+    System.err.println (handshake);
   }
 }

Index: jessie-tests/testClientHello.java
===================================================================
RCS file: /cvsroot/classpath/classpath/jessie-tests/Attic/testClientHello.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- jessie-tests/testClientHello.java	3 Jun 2006 07:44:41 -0000	1.1.2.1
+++ jessie-tests/testClientHello.java	11 Jun 2006 07:23:24 -0000	1.1.2.2
@@ -5,6 +5,8 @@
 import gnu.javax.net.ssl.provider.ClientHello;
 import gnu.javax.net.ssl.provider.CompressionMethod;
 import gnu.javax.net.ssl.provider.CompressionMethodList;
+import gnu.javax.net.ssl.provider.Extension;
+import gnu.javax.net.ssl.provider.ExtensionList;
 import gnu.javax.net.ssl.provider.ProtocolVersion;
 import gnu.javax.net.ssl.provider.Handshake;
 import gnu.javax.net.ssl.provider.Random;
@@ -71,7 +73,15 @@
     comps.put (0, CompressionMethod.NULL);
     comps.put (1, CompressionMethod.ZLIB);
 
-    hello.setExtensionsLength (0);
+    hello.setExtensionsLength (12);
+    ExtensionList exts = hello.extensions();
+    // Max fragment length of 2^9-1
+    exts.set (0, Extension.Type.MAX_FRAGMENT_LENGTH, 1); // 2 + 2 + 1
+    exts.get (0).setValue (new byte[] { 1 });
+    // Zero-length server name.
+    exts.set (1, Extension.Type.SERVER_NAME, 3); // 2 + 2 + 3
+    exts.get(1).setValue(new byte[3]);
+
     handshake.setLength (hello.length ());
 
     handshake = new Handshake (buffer);
@@ -102,6 +112,87 @@
     else
       System.out.println ("FAIL: compressionMethods()");
 
+    exts = hello.extensions();
+    if (exts.size() == 2)
+      System.out.println ("PASS: extensions().size");
+    else
+      System.out.println ("FAIL: extensions().size");
+    if (exts.length () == 12)
+      System.out.println ("PASS: extensions().length");
+    else
+      System.out.println ("FAIL: extensions().length");
+      
+    Extension e = exts.get(0);
+    if (e.type() == Extension.Type.MAX_FRAGMENT_LENGTH)
+      System.out.println ("PASS: get(0).type()");
+    else
+      System.out.println ("FAIL: get(0).type()");
+    if (Arrays.equals (e.valueBytes(), new byte[] { 1 }))
+      System.out.println ("PASS: get(0).value()");
+    else
+      System.out.println ("FAIL: get(0).value()");
+    
+    e = exts.get(1);
+    if (e.type () == Extension.Type.SERVER_NAME)
+      System.out.println ("PASS: get(1).type()");
+    else
+      System.out.println ("FAIL: get(1).type()");
+    if (Arrays.equals(e.valueBytes(), new byte[3]))
+      System.out.println ("PASS: get(1).value()");
+    else
+      System.out.println ("FAIL: get(1).value()");
+
     System.err.println (handshake);
+    
+    // Part 2: no extensions.
+    buffer = ByteBuffer.allocate(96);
+    handshake = new Handshake (buffer);
+
+    handshake.setType (Handshake.Type.CLIENT_HELLO);
+    handshake.setLength (92);
+
+    hello = null;
+    hello = (ClientHello) handshake.body ();
+
+    sessionId = new byte[32];
+    for (int i = 0; i < 32; i++)
+      sessionId[i] = (byte) i;
+
+    hello.setVersion (ProtocolVersion.TLS_1); // 2
+    hello.setSessionId (sessionId);           // +33    (1 + 32)
+
+    random = hello.random ();                 // +32
+    random.setGmtUnixTime (123456);
+    nonce = new byte [28];
+    for (int i = 0; i < nonce.length; i++)
+      nonce[i] = (byte) i;
+    random.setRandomBytes (nonce);
+
+    suites = hello.cipherSuites ();
+    suites.setSize (10);                      // + 22   (2 + 2*10)
+    suites.put (0, CipherSuite.TLS_NULL_WITH_NULL_NULL);
+    suites.put (1, CipherSuite.TLS_RSA_WITH_NULL_MD5);
+    suites.put (2, CipherSuite.TLS_RSA_WITH_NULL_SHA);
+    suites.put (3, CipherSuite.TLS_RSA_EXPORT_WITH_RC4_40_MD5);
+    suites.put (4, CipherSuite.TLS_RSA_WITH_RC4_128_MD5);
+    suites.put (5, CipherSuite.TLS_RSA_WITH_RC4_128_SHA);
+    suites.put (6, CipherSuite.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA);
+    suites.put (7, CipherSuite.TLS_RSA_WITH_DES_CBC_SHA);
+    suites.put (8, CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA);
+    suites.put (9, CipherSuite.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA);
+
+    comps = hello.compressionMethods ();      // + 3    (1 + 2*1)
+    comps.setSize (2);
+    comps.put (0, CompressionMethod.NULL);
+    comps.put (1, CompressionMethod.ZLIB);
+    
+    handshake = new Handshake(buffer);
+    hello = (ClientHello) handshake.body();
+    if (hello.extensions() == null)
+      System.out.println("PASS: extensions() == null");
+    else
+      System.out.println("FAIL: extensions() != null");
+    
+    System.err.println(handshake);
   }
 }



From MAILER-DAEMON Sun Jun 11 04:30:04 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpLKe-0004er-KI
	for mharc-commit-classpath@gnu.org; Sun, 11 Jun 2006 04:30:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpLKc-0004eU-12
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 04:30:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpLKa-0004eF-KB
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 04:30:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpLKa-0004eC-EO
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 04:30:00 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpLT2-00049e-MZ
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 04:38:44 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpLKY-00052C-00
	for <commit-classpath@gnu.org>; Sun, 11 Jun 2006 04:29:58 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FpLKX-000529-Kt
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 08:29:58 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpLKX-000529-Kt@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Sun, 11 Jun 2006 08:29:57 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Freet...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jun 2006 08:30:02 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/11 08:29:57

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: FreetypeGlyphVector.java GdkFontPeer.java 
	include        : gnu_java_awt_peer_gtk_FreetypeGlyphVector.h 
	java/awt/geom  : AffineTransform.java 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 

Log message:
	2006-06-11  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
		(setupGlyphMetrics): New method. Add glyphmetrics caching.
		(getOutline): Operate on the shape directly.
		* gnu/java/awt/peer/gtk/GdkFontPeer.java
		(getGlyphMetrics,putGlyphMetrics): Add GlyphMetrics caching.
		* include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
		(getGlyph renamed getGlyphs)
		* java/awt/geom/AffineTransform.java
		(getTranslateInstance): Set fields directly.
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
		(getGlyphs): Get all glyph codes at once.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7766&r2=1.7767
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java?cvsroot=classpath&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/geom/AffineTransform.java?cvsroot=classpath&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c?cvsroot=classpath&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7766
retrieving revision 1.7767
diff -u -b -r1.7766 -r1.7767
--- ChangeLog	11 Jun 2006 07:20:41 -0000	1.7766
+++ ChangeLog	11 Jun 2006 08:29:56 -0000	1.7767
@@ -1,3 +1,17 @@
+2006-06-11  Sven de Marothy  <sven@physto.se>
+
+	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
+	(setupGlyphMetrics): New method. Add glyphmetrics caching.
+	(getOutline): Operate on the shape directly.
+	* gnu/java/awt/peer/gtk/GdkFontPeer.java
+	(getGlyphMetrics,putGlyphMetrics): Add GlyphMetrics caching.
+	* include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
+	(getGlyph renamed getGlyphs)
+	* java/awt/geom/AffineTransform.java
+	(getTranslateInstance): Set fields directly.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
+	(getGlyphs): Get all glyph codes at once.
+	
 2006-06-11  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	PR Classpath/27853

Index: gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	11 Jun 2006 03:09:03 -0000	1.5
+++ gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	11 Jun 2006 08:29:57 -0000	1.6
@@ -84,11 +84,7 @@
    */
   private AffineTransform[] glyphTransforms;
 
-  /**
-   * Keep track of which glyphs are whitespace, since we don't have
-   * reporting from the peers yet. TextLayout needs this for justification.
-   */
-  private boolean[] whiteSpace;
+  private GlyphMetrics[] metricsCache;
 
   /**
    * Create a glyphvector from a given (Freetype) font and a String.
@@ -147,21 +143,25 @@
   {
     nGlyphs = s.codePointCount( 0, s.length() );
     glyphCodes = new int[ nGlyphs ];
+    int[] codePoints = new int[ nGlyphs ];
     int stringIndex = 0;
+
     for(int i = 0; i < nGlyphs; i++)
       {
-	glyphCodes[i] = getGlyph( s.codePointAt(stringIndex) );
+	codePoints[i] = s.codePointAt( stringIndex );
 	// UTF32 surrogate handling
-	if( s.codePointAt( stringIndex ) != (int)s.charAt( stringIndex ) )
+	if( codePoints[i] != (int)s.charAt( stringIndex ) )
 	  stringIndex ++;
 	stringIndex ++;
       }
+
+   glyphCodes = getGlyphs( codePoints );
   }
 
   /**
    * Returns the glyph code within the font for a given character
    */
-  public native int getGlyph(int codepoint);
+  public native int[] getGlyphs(int[] codepoints);
 
   /**
    * Returns the kerning of a glyph pair
@@ -209,14 +209,12 @@
     logicalBounds = null; // invalidate caches.
     glyphPositions = null;
 
-    whiteSpace = new boolean[ nGlyphs ]; 
     glyphTransforms = new AffineTransform[ nGlyphs ]; 
     double x = 0;
+
     for(int i = 0; i < nGlyphs; i++)
       {
-	whiteSpace[i] = Character.isWhitespace( glyphCodes[ i ] );
 	GlyphMetrics gm = getGlyphMetrics( i );
-	Rectangle2D r = gm.getBounds2D();
 	glyphTransforms[ i ] = AffineTransform.getTranslateInstance(x, 0);
 	x += gm.getAdvanceX();
 	if( i > 0 )
@@ -266,22 +264,48 @@
 				   gm.getAdvanceX(), r.getHeight() );
   }
 
+  /*
+   * FIXME: Not all glyph types are supported.
+   * (The JDK doesn't really seem to do so either)
+   */
+  public void setupGlyphMetrics()
+  {
+    metricsCache = new GlyphMetrics[ nGlyphs ];
+
+    for(int i = 0; i < nGlyphs; i++)
+      {
+	GlyphMetrics gm = (GlyphMetrics)
+	  peer.getGlyphMetrics( glyphCodes[ i ] );
+	if( gm == null )
+	  {
+	    double[] val = getMetricsNative( glyphCodes[ i ] );
+	    if( val == null )
+	      gm = null;
+	    else
+	      {
+		gm = new GlyphMetrics( true, 
+				       (float)val[1], 
+				       (float)val[2], 
+				       new Rectangle2D.Double
+				       ( val[3], val[4], 
+					 val[5], val[6] ),
+				       GlyphMetrics.STANDARD );
+		peer.putGlyphMetrics( glyphCodes[ i ], gm );
+	      }
+	  }
+	metricsCache[ i ] = gm;
+      }
+  }
+
   /**
    * Returns the metrics of a single glyph.
-   * FIXME: Not all glyph types are supported.
    */
   public GlyphMetrics getGlyphMetrics(int glyphIndex)
   {
-    double[] val = getMetricsNative( glyphCodes[ glyphIndex ] );
-    if( val == null )
-      return null;
-    byte type = whiteSpace[ glyphIndex ] ? 
-      GlyphMetrics.WHITESPACE : GlyphMetrics.STANDARD;
+    if( metricsCache == null )
+      setupGlyphMetrics();
     
-    return new GlyphMetrics( true, (float)val[1], (float)val[2], 
-			     new Rectangle2D.Double( val[3], val[4], 
-						     val[5], val[6] ),
-			     type );
+    return metricsCache[ glyphIndex ];
   }
 
   /**
@@ -406,7 +430,9 @@
   public Shape getOutline(float x, float y)
   {
     AffineTransform tx = AffineTransform.getTranslateInstance( x, y );
-    return tx.createTransformedShape( getOutline() );
+    GeneralPath gp = (GeneralPath)getOutline();
+    gp.transform( tx );
+    return gp;
   }
 
   /**

Index: gnu/java/awt/peer/gtk/GdkFontPeer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gnu/java/awt/peer/gtk/GdkFontPeer.java	10 Jun 2006 12:25:17 -0000	1.17
+++ gnu/java/awt/peer/gtk/GdkFontPeer.java	11 Jun 2006 08:29:57 -0000	1.18
@@ -57,6 +57,7 @@
 import java.util.Map;
 import java.util.ResourceBundle;
 import java.nio.ByteBuffer;
+import java.util.HashMap;
 
 public class GdkFontPeer extends ClasspathFontPeer
 {
@@ -64,6 +65,11 @@
   private final int native_state = GtkGenericPeer.getUniqueInteger ();
   private static ResourceBundle bundle;
   
+  /**
+   * Cache GlyphMetrics objects.
+   */
+  private HashMap metricsCache;
+  
   static 
   {
     System.loadLibrary("gtkpeer");
@@ -145,6 +151,7 @@
     super(name, style, size);    
     initState ();
     setFont (this.familyName, this.style, (int)this.size);
+    metricsCache = new HashMap();
   }
 
   public GdkFontPeer (String name, Map attributes)
@@ -152,6 +159,7 @@
     super(name, attributes);
     initState ();
     setFont (this.familyName, this.style, (int)this.size);
+    metricsCache = new HashMap();
   }
 
   /**
@@ -375,4 +383,21 @@
     // the metrics cache.
     return Toolkit.getDefaultToolkit().getFontMetrics (font);
   }
+
+  /**
+   * Returns a cached GlyphMetrics object for a given glyphcode,
+   * or null if it doesn't exist in the cache.
+   */
+  GlyphMetrics getGlyphMetrics( int glyphCode )
+  {
+    return (GlyphMetrics)metricsCache.get( new Integer( glyphCode ) );
+  }
+
+  /**
+   * Put a GlyphMetrics object in the cache.
+   */ 
+  void putGlyphMetrics( int glyphCode, Object metrics )
+  {
+    metricsCache.put( new Integer( glyphCode ), metrics );
+  }
 }

Index: include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
===================================================================
RCS file: /sources/classpath/classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h	7 Jun 2006 13:54:32 -0000	1.1
+++ include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h	11 Jun 2006 08:29:57 -0000	1.2
@@ -10,7 +10,7 @@
 {
 #endif
 
-JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyph (JNIEnv *env, jobject, jint);
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphs (JNIEnv *env, jobject, jintArray);
 JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getKerning (JNIEnv *env, jobject, jint, jint);
 JNIEXPORT jdoubleArray JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getMetricsNative (JNIEnv *env, jobject, jint);
 JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphOutlineNative (JNIEnv *env, jobject, jint);

Index: java/awt/geom/AffineTransform.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/geom/AffineTransform.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- java/awt/geom/AffineTransform.java	2 Jul 2005 20:32:29 -0000	1.9
+++ java/awt/geom/AffineTransform.java	11 Jun 2006 08:29:57 -0000	1.10
@@ -414,7 +414,9 @@
   public static AffineTransform getTranslateInstance(double tx, double ty)
   {
     AffineTransform t = new AffineTransform();
-    t.setToTranslation(tx, ty);
+    t.m02 = tx;
+    t.m12 = ty;
+    t.type = (tx == 0 && ty == 0) ? TYPE_UNIFORM_SCALE : TYPE_TRANSLATION;
     return t;
   }
 

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	7 Jun 2006 23:48:05 -0000	1.2
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	11 Jun 2006 08:29:57 -0000	1.3
@@ -81,24 +81,38 @@
   return (PangoFcFont *)pfont->font;
 }
 
-JNIEXPORT jint JNICALL 
-Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyph
-  (JNIEnv *env, jobject obj, jint codepoint)
+JNIEXPORT jintArray JNICALL 
+Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphs
+  (JNIEnv *env, jobject obj, jintArray codepoints)
 {
   FT_Face ft_face;
   jint glyph_index;
+  jintArray retArray;
   PangoFcFont *font;
+  jint *values, *cpvals;
+  jint length;
+  int i;
 
   font = getFont(env, obj);
 
   ft_face = pango_fc_font_lock_face( font );
   g_assert (ft_face != NULL);
 
-  glyph_index = FT_Get_Char_Index( ft_face, codepoint );
+  length = (*env)->GetArrayLength (env, codepoints);
+  cpvals = (*env)->GetIntArrayElements (env, codepoints, NULL);
+
+  retArray = (*env)->NewIntArray (env, length);
+  values = (*env)->GetIntArrayElements (env, retArray, NULL);
+
+  for( i = 0; i < length; i++ )
+    values[i] = FT_Get_Char_Index( ft_face, cpvals[i] );
+
+  (*env)->ReleaseIntArrayElements (env, retArray, values, 0);
+  (*env)->ReleaseIntArrayElements (env, codepoints, cpvals, 0);
 
   pango_fc_font_unlock_face (font);
 
-  return glyph_index;
+  return retArray;
 }
 
 JNIEXPORT jobject JNICALL 
@@ -143,7 +157,7 @@
 
   FT_Set_Transform( ft_face, NULL, NULL );
 
-  if( FT_Load_Glyph( ft_face, glyphIndex, FT_LOAD_DEFAULT ) != 0 )
+  if( FT_Load_Glyph( ft_face, glyphIndex, FT_LOAD_NO_BITMAP ) != 0 )
     {
       pango_fc_font_unlock_face( font );
       printf("Couldn't load glyph %i\n", glyphIndex);



From MAILER-DAEMON Sun Jun 11 06:41:02 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpNNO-0002Bp-E9
	for mharc-commit-classpath@gnu.org; Sun, 11 Jun 2006 06:41:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpNNM-0002BG-9W
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 06:41:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpNNK-0002AI-BM
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 06:40:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpNNJ-0002AD-Vn
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 06:40:58 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpNVm-0004z5-RV
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 06:49:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpNNG-0001ZF-00
	for <commit-classpath@gnu.org>; Sun, 11 Jun 2006 06:40:54 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FpNNF-0001Z7-OF
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 10:40:54 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpNNF-0001Z7-OF@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sun, 11 Jun 2006 10:40:53 +0000
Subject: [commit-cp] classpath doctools.texinfo tools/gnu/classpath/...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jun 2006 10:41:00 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/11 10:40:53

Modified files:
	doc            : tools.texinfo 
	tools/gnu/classpath/tools/keytool: Main.java 
	.              : ChangeLog 
	resource/gnu/classpath/tools/keytool: messages.properties 
Added files:
	tools/gnu/classpath/tools/keytool: CACertCmd.java 

Log message:
	2006-06-11  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* doc/tools.texinfo: Added text for new -cacert command.
		Re-structured sections.
		* resource/gnu/classpath/tools/keytool/messages.properties: Added messages
		for -cacert command.
		* tools/gnu/classpath/tools/keytool/Main.java (CACERT_CMD): New constant.
		(_CACERT): Likewise.
		(shutdownThread): New field.
		(Main): Install shutdown thread.
		(main): Uninstall shutdown thread.
		(start): Handle new -cacert command.
		(getParser): Likewise.
		(teardown): Increased visibility.
		(ShutdownHook): New inner class.
		* tools/gnu/classpath/tools/keytool/CACertCmd.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/doc/tools.texinfo?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/Main.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/CACertCmd.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7767&r2=1.7768
http://cvs.savannah.gnu.org/viewcvs/classpath/resource/gnu/classpath/tools/keytool/messages.properties?cvsroot=classpath&r1=1.2&r2=1.3

Patches:
Index: doc/tools.texinfo
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/tools.texinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/tools.texinfo	21 May 2006 01:49:04 -0000	1.2
+++ doc/tools.texinfo	11 Jun 2006 10:40:51 -0000	1.3
@@ -5,7 +5,7 @@
 @settitle GNU Classpath Tools Guide
 @c %**end of header
 
-@setchapternewpage off
+@setchapternewpage on
 
 @ifinfo
 This file documents the Tools included in a standard distribution of the GNU
@@ -37,6 +37,8 @@
 
 @end titlepage
 
+@contents
+
 @ifinfo
 @node Top, Security Tools, (dir), (dir)
 @top GNU Classpath Tools Guide
@@ -62,6 +64,47 @@
 * jarsigner Tool::             Sign and verify .JAR files
 * keytool Tool::               Manage private keys and public certificates
 
+jarsigner Tool
+
+* Common jarsigner Options::   Options used when signing or verifying a file
+* Signing Options::            Options only used when signing a .JAR file
+* Verification Options::       Options only used when verifying a .JAR file
+
+keytool Tool
+
+* Getting Help::               How to get help with keytool commands
+* Common keytool Options::     Options used in more than one command
+* Distinguished Names::        X.500 Distinguished Names used in certificates
+* Add/Update Commands::        Commands for adding data to a Key Store
+* Export Commands::            Commands for exporting data from a Key Store
+* Display Commands::           Commands for displaying data in a Key Store
+* Management Commands::        Commands for managing a Key Store
+
+Add/Update Commands
+
+* Command -genkey::            Generate private key and self-signed certificate
+* Command -import::            Import certificates and certificate replies
+* Command -selfcert::          Generate self-signed certificate
+* Command -cacert::            Import a CA Trusted Certificate
+* Command -identitydb::        Import JDK-1 style identities
+
+Export Commands
+
+* Command -certreq::           Generate Certificate Signing Requests (CSR)
+* Command -export::            Export a certificate in a Key Store
+
+Display Commands
+
+* Command -list::              Display information about one or all Aliases
+* Command -printcert::         Print a certificate or a certificate fingerprint
+
+Management Commands
+
+* Command -keyclone::          Clone a Key Entry in a Key Store
+* Command -storepasswd::       Change the password protecting a Key Store
+* Command -keypasswd::         Change the password protecting a Key Entry
+* Command -delete::            Remove an entry in a Key Store
+
 I18N Issues
 
 * Language Resources::         Where resources are located
@@ -76,7 +119,7 @@
 @comment node-name, next, previous, up
 @chapter Security Tools
 
-Two Security Tools are available with GNU Classpath: @b{jarsugner} and @b{keytool}.
+Two Security Tools are available with GNU Classpath: @b{jarsigner} and @b{keytool}.
 
 @menu
 * jarsigner Tool::             Sign and verify .JAR files
@@ -91,22 +134,59 @@
 @comment node-name, next, previous, up
 @section The @code{jarsigner} Tool
 
-@table @b
+The @b{jarsigner} tool is invoked from the command line, in one of two forms, as follows:
 
-@item SYNOPSIS
-@code{jarsigner [OPTION]... FILE ALIAS}@*
+@example
+@code{jarsigner [OPTION]... FILE ALIAS}
 @code{jarsigner -verify [OPTION]... FILE}
+@end example
 
-@item DESCRIPTION
-When the first form is used, the tool signs the designated JAR file.
-
-The second form, on the other hand, is used to verify a previously signed JAR file.
+When the first form is used, the tool signs the designated JAR file. The second form, on the other hand, is used to verify a previously signed JAR file.
 
 @code{FILE} is the .JAR file to process; i.e. to sign if the first syntax form is used, or to verify if the second syntax form is used instead.
 
-@code{ALIAS} must be a known @i{Alias} of a @i{Key Entry} in the designated key store. The private key material associated with this @i{Alias} is then used for signing the designated .JAR file.
+@code{ALIAS} must be a known @i{Alias} of a @i{Key Entry} in the designated @i{Key Store}. The private key material associated with this @i{Alias} is then used for signing the designated .JAR file.
+
+@menu
+* Common jarsigner Options::   Options used when signing or verifying a file
+* Signing Options::            Options only used when signing a .JAR file
+* Verification Options::       Options only used when verifying a .JAR file
+@end menu
+
+@comment ----------------------------------------------------------------------
+
+@node Common jarsigner Options, Signing Options, jarsigner Tool, jarsigner Tool
+@comment node-name, next, previous, up
+@subsection Common options
+
+The following options may be used when the tool is used for either signing, or verifying, a .JAR file.
+
+@table @b
+@item -verbose
+Use this option to force the tool to generate more verbose messages, during its processing.
+
+@item -internalsf
+When present, the tool will include --which otherwise it does not-- the @code{.SF} file in the @code{.DSA} generated file.
+
+@item -sectionsonly
+When present, the tool will include in the @code{.SF} generated file --which otherwise it does not-- a header containing a hash of the whole manifest file.  When that header is included, the tool can quickly check, during verification, if the hash (in the header) matches or not the manifest file.
+
+@item -provider PROVIDER_CLASS_NAME
+A fully qualified class name of a @i{Security Provider} to add to the current list of @i{Security Providers} already installed in the JVM in-use. If a provider class is specified with this option, and was successfully added to the runtime --i.e. it was not already installed-- then the tool will attempt to remove this @i{Security Provider} before exiting.
+
+@item -help
+Prints a help text similar to this one.
+
+@end table
+
+@comment ----------------------------------------------------------------------
+
+@node Signing Options, Verification Options, Common jarsigner Options, jarsigner Tool
+@comment node-name, next, previous, up
+@subsection Signing options
+
+The following options may be specified when using the tool for signing purposes.
 
-@item SIGNING OPTIONS
 @table @b
 @item -keystore URL
 Use this option to specify the location of the key store to use. The default value is a file URL referencing the file named @file{.keystore} located in the path returned by the call to @code{java.lang.System#getProperty(String)} using @code{user.home} as argument.
@@ -129,12 +209,19 @@
 
 If this option is missing, the first eight characters of the @code{ALIAS} argument will be used. When this is the case, any character in @code{ALIAS} that is outside the permissible range of characters will be replaced by an underscore.
 
-@item -signedjar FILE_NAME
+@item -signedjar FILE
 Use this option to specify the file name of the signed JAR. If this option is omitted, then the signed JAR will be named the same as @code{FILE}; i.e. the input JAR file will be replaced with the signed copy.
 
 @end table
 
-@item VERIFICATION OPTIONS
+@comment ----------------------------------------------------------------------
+
+@node Verification Options, , Signing Options, jarsigner Tool
+@comment node-name, next, previous, up
+@subsection Verification options
+
+The following options may be specified when using the tool for verification purposes.
+
 @table @b
 @item -verify
 Use this option to indicate that the tool is to be used for verification purposes.
@@ -144,44 +231,37 @@
 
 @end table
 
-@item COMMON OPTIONS
-@table @b
-@item -verbose
-Use this option to force the tool to generate more verbose messages, during its processing.
-
-@item -internalsf
-When present, the tool will include --which otherwise it does not-- the @code{.SF} file in the @code{.DSA} generated file.
+@comment ----------------------------------------------------------------------
 
-@item -sectionsonly
-When present, the tool will include in the @code{.SF} generated file --which otherwise it does not-- a header containing a hash of the whole manifest file.  When that header is included, the tool can quickly check, during verification, if the hash (in the header) matches or not the manifest file.
+@node keytool Tool, , jarsigner Tool, Security Tools
+@comment node-name, next, previous, up
+@section The @code{keytool} Tool
 
-@item -provider PROVIDER_CLASS_NAME
-A fully qualified class name of a @i{Security Provider} to add to the current list of @i{Security Providers} already installed in the JVM in-use. If a provider class is specified with this option, and was successfully added to the runtime --i.e. it was not already installed-- then the tool will attempt to remove this @i{Security Provider} before exiting.
+Cryptographic credentials, in a Java environment, are usually stored in a @i{Key Store}. The Java SDK specifies a @i{Key Store} as a persistent container of two types of objects: @i{Key Entries} and @i{Trusted Certificates}. The security tool @b{keytool} is a Java-based application for managing those types of objects.
 
-@item -help
-Prints a help text similar to this one.
+A @i{Key Entry} represents the private key part of a key-pair used in Public-Key Cryptography, and a signed X.509 certificate which authenticates the public key part for a known entity; i.e. the owner of the key-pair. The X.509 certificate itself contains the public key part of the key-pair.
 
-@end table
-@end table
+A @i{Trusted Certificate} is a signed X.509 certificate issued by a trusted entity. The @i{Trust} in this context is relative to the User of the @b{keytool}. In other words, the existence of a @i{Trusted Certificate} in the @i{Key Store} processed by a @b{keytool} command implies that the User trusts the @i{Issuer} of that @i{Trusted Certificate} to also sign, and hence authenticates, other @i{Subjects} the tool may process.
 
-@comment ----------------------------------------------------------------------
+@i{Trusted Certificates} are important because they allow the tool to mechanically construct @i{Chains of Trust} starting from one of the @i{Trusted Certificates} in a @i{Key Store} and ending with a certificate whose @i{Issuer} is potentially unknown. A valid chain is an ordered list, starting with a @i{Trusted Certificate} (also called the @i{anchor}), ending with the target certificate, and satisfying the condition that the @i{Subject} of certificate @code{#i} is the @i{Issuer} of certificate @code{#i + 1}.
 
-@node keytool Tool, , jarsigner Tool, Security Tools
-@comment node-name, next, previous, up
-@section The @code{keytool} Tool
+The @b{keytool} is invoked from the command line as follows:
 
-@table @b
-@item SYNOPSIS
+@example
 @code{keytool [COMMAND]...}
+@end example
 
-@item DESCRIPTION
-A Java-based tool for managing both @i{Key Entries} as well as @i{Trusted Certificates}.
+Multiple @code{COMMAND}s may be specified at once, each complete with its own options. @b{keytool} will parse all the arguments, before processing, and executing, each @code{COMMAND}. If an exception occurs while executing one @code{COMMAND} @b{keytool} will abort. Note however that because the implementation of the tool uses code to parse command line options that also supports GNU-style options, you have to separate each command group with a double-hyphen; e.g
 
-Multiple @code{COMMAND}s may be specified at once, each complete with its own options. @b{keytool} will parse all the arguments, before processing, and executing, each @code{COMMAND}. If an exception occurs while executing one @code{COMMAND} @b{keytool} will abort.
+@example
+@code{keytool -list -- -printcert -alias mykey}
+@end example
 
-A @code{COMMAND} can be one of the followings:
+Here is a summary of the commands supported by the tool:
 
-@table @b
+@enumerate
+@item Add/Update commands
+@itemize @bullet
 @item -genkey [OPTION]@dots{}
 Generate a new @i{Key Entry}, eventually creating a new key store.
 
@@ -191,22 +271,34 @@
 @item -selfcert [OPTION]@dots{}
 Generate a new self-signed @i{Trusted Certificate}.
 
+@item -cacert [OPTION]@dots{}
+Import a CA @i{Trusted Certificate}.
+
 @item -identitydb [OPTION]@dots{}
 @b{NOT IMPLEMENTED YET}.@*
 Import a JDK 1.1 style Identity Database.
+@end itemize
 
+@item Export commands
+@itemize @bullet
 @item -certreq [OPTION]@dots{}
 Issue a @i{Certificate Signing Request} (CSR) which can be then sent to a @i{Certification Authority} (CA) to issue a certificate signed (by the CA) and authenticating the @i{Subject} of the request.
 
 @item -export [OPTION]@dots{}
 Export a certificate from a key store.
+@end itemize
 
+@item Display commands
+@itemize @bullet
 @item -list [OPTION]@dots{}
 Print one or all certificates in a key store to @code{STDOUT}.
 
 @item -printcert [OPTION]@dots{}
 Print a human-readable form of a certificate, in a designated file, to @code{STDOUT}.
+@end itemize
 
+@item Management commands
+@itemize @bullet
 @item -keyclone [OPTION]@dots{}
 Clone a @i{Key Entry} in a key store.
 
@@ -218,13 +310,48 @@
 
 @item -delete [OPTION]@dots{}
 Delete a @i{Key Entry} or a @i{Trusted Certificate} from a key store.
+@end itemize
 
-@item -help
-Prints a help text similar to this one.
+@end enumerate
 
-@end table
+@menu
+* Getting Help::               How to get help with keytool commands
+* Common keytool Options::     Options used in more than one command
+* Distinguished Names::        X.500 Distinguished Names used in certificates
+* Add/Update Commands::        Commands for adding data to a Key Store
+* Export Commands::            Commands for exporting data from a Key Store
+* Display Commands::           Commands for displaying data in a Key Store
+* Management Commands::        Commands for managing a Key Store
+@end menu
+
+@comment ----------------------------------------------------------------------
+
+@node Getting Help, Common keytool Options, keytool Tool, keytool Tool
+@comment node-name, next, previous, up
+@subsection Getting help
+
+To get a general help text about the tool, use the @code{-help} option; e.g.
+
+@example
+@code{keytool -help}
+@end example
+
+To get more specific help text about one of the tool's command use the @code{-help} option for that command; e.g.
+
+@example
+@code{keytool -genkey -help}
+@end example
+
+In both instances, the tool will print a help text and then will exit the running JVM.
+
+It is worth noting here that the help messages printed by the tool are I18N-ready. This means that if/when the contents of the tool's @i{Message Bundle} properties file are available in languages other than English, you may see those messages in that language.
+
+@comment ----------------------------------------------------------------------
+
+@node Common keytool Options, Distinguished Names, Getting Help, keytool Tool
+@comment node-name, next, previous, up
+@subsection Common options
 
-@item OPTIONS COMMON TO MORE THAN ONE COMMAND
 The following @code{OPTION}s are used in more than one @code{COMMAND}. They are described here to reduce redundancy.
 
 @table @b
@@ -263,7 +390,7 @@
 A fully qualified class name of a @i{Security Provider} to add to the current list of @i{Security Providers} already installed in the JVM in-use. If a provider class is specified with this option, and was successfully added to the runtime --i.e. it was not already installed-- then the tool will attempt to removed this @i{Security Provider} before exiting.
 
 @anchor{file}
-@item -file FILE_NAME
+@item -file FILE
 Use this option to designate a file to use with a command. When specified with this option, the value is expected to be the fully qualified path of a file accessible by the File System. Depending on the command, the file may be used as input or as output. When this option is omitted from the command line, @code{STDIN} will be used instead, as the source of input, and @code{STDOUT} will be used instead as the output destination.
 
 @anchor{verbose}
@@ -272,8 +399,13 @@
 
 @end table
 
+@comment ----------------------------------------------------------------------
+
+@node Distinguished Names, Add/Update Commands, Common keytool Options, keytool Tool
+@comment node-name, next, previous, up
+@subsection X.500 Distinguished Names
+
 @anchor{dn}
-@item X.500 DISTINGUISHED NAME
 A @i{Distinguished Name} (or DN) MUST be supplied with some of the @code{COMMAND}s using a @code{-dname} option. The syntax of a valid value for this option MUST follow RFC-2253 specifications. Namely the following components (with their accepted meaning) will be recognized. Note that the component name is case-insensitive:
 
 @ftable @var
@@ -299,8 +431,27 @@
 @*
 If the @i{Distinguished Name} is required, and no valid default value can be used, the tool will prompt you to enter the information through the console.
 
-@item -genkey COMMAND
-Generate a new key-pair (both private and public keys), and save these credentials in the key store as a @i{Key Entry}, associated with the designated (if was specified in the @code{-alias} option) or default (if the @code{-alias} option is omitted) @i{Alias}.
+@comment ----------------------------------------------------------------------
+
+@node Add/Update Commands, Export Commands, Distinguished Names, keytool Tool
+@comment node-name, next, previous, up
+@subsection Add/Update commands
+
+@menu
+* Command -genkey::            Generate private key and self-signed certificate
+* Command -import::            Import certificates and certificate replies
+* Command -selfcert::          Generate self-signed certificate
+* Command -cacert::            Import a CA Trusted Certificate
+* Command -identitydb::        Import JDK-1 style identities
+@end menu
+
+@comment ----------------------------------------------------------------------
+
+@node Command -genkey, Command -import, Add/Update Commands, Add/Update Commands
+@comment node-name, next, previous, up
+@subsubsection @code{-genkey} command
+
+Use this command to generate a new key-pair (both private and public keys), and save these credentials in the key store as a @i{Key Entry}, associated with the designated (if was specified with the @code{-alias} option) or default (if the @code{-alias} option is omitted) @i{Alias}.
 
 The private key material will be protected with a user-defined password (see @code{-keypass} option). The public key on the other hand will be part of a self-signed X.509 certificate, which will form a 1-element chain and will be saved in the key store.
 
@@ -347,8 +498,13 @@
 
 @end table
 
-@item -import COMMAND
-Read an X.509 certificate, or a PKCS#7 @i{Certificate Reply} from a designated input source and incorporate the certificates into the key store.
+@comment ----------------------------------------------------------------------
+
+@node Command -import, Command -selfcert, Command -genkey, Add/Update Commands
+@comment node-name, next, previous, up
+@subsubsection @code{-import} command
+
+Use this command to read an X.509 certificate, or a PKCS#7 @i{Certificate Reply} from a designated input source and incorporate the certificates into the key store.
 
 If the @i{Alias} does not already exist in the key store, the tool treats the certificate read from the input source as a new @i{Trusted Certificate}. It then attempts to discover a chain-of-trust, starting from that certificate and ending at another @i{Trusted Certificate}, already stored in the key store. If the @code{-trustcacerts} option is present, an additional key store, of type @code{JKS} named @file{cacerts}, and assumed to be present in @file{$@{JAVA_HOME@}/lib/security} will also be consulted if found --@code{$@{JAVA_HOME@}} refers to the location of an installed @i{Java Runtime Environment} (JRE). If no chain-of-trust can be established, and unless the @code{-noprompt} option has been specified, the certificate is printed to @code{STDOUT} and the user is prompted for a confirmation.
 
@@ -358,8 +514,8 @@
 @item -alias ALIAS
 For more details @pxref{alias,, ALIAS}.
 
-@item -file FILE_NAME
-For more details @pxref{file,, FILE_NAME}.
+@item -file FILE
+For more details @pxref{file,, FILE}.
 
 @item -keypass PASSWORD
 Use this option to specify the password which the tool will use to protect the @i{Key Entry} associated with the designated @i{Alias}, when replacing this @i{Alias}' chain of certificates with that found in the certificate reply.
@@ -389,8 +545,13 @@
 
 @end table
 
-@item -selfcert COMMAND
-Generate a self-signed X.509 version 1 certificate. The newly generated certificate will form a chain of one element which will replace the previous chain associated with the designated @i{Alias} (if @code{-alias} option was specified), or the default @i{Alias} (if @code{-alias} option was omitted).
+@comment ----------------------------------------------------------------------
+
+@node Command -selfcert, Command -cacert, Command -import, Add/Update Commands
+@comment node-name, next, previous, up
+@subsubsection @code{-selfcert} command
+
+Use this command to generate a self-signed X.509 version 1 certificate. The newly generated certificate will form a chain of one element which will replace the previous chain associated with the designated @i{Alias} (if @code{-alias} option was specified), or the default @i{Alias} (if @code{-alias} option was omitted).
 
 @table @b
 @item -alias ALIAS
@@ -429,14 +590,50 @@
 
 @end table
 
-@item -identitydb COMMAND
+@comment ----------------------------------------------------------------------
+
+@node Command -cacert, Command -identitydb, Command -selfcert, Add/Update Commands
+@comment node-name, next, previous, up
+@subsubsection @code{-cacert} command
+
+Use this command to import, a CA certificate and add it to the key store as a @i{Trusted Certificate}. The @i{Alias} for this new entry will be constructed from the FILE's base-name after replacing hyphens and dots with underscores.
+
+This command is useful when used in a script that recursively visits a directory of CA certificates to populate a @code{cacerts.gkr} @i{Key Store} of trusted certificates which can then be used commands that specify the @code{-trustcacerts} option.
+
+@table @b
+@item -file FILE
+For more details @pxref{file,, FILE}.
+
+@item -storetype STORE_TYPE
+For more details @pxref{storetype,, STORE_TYPE}.
+
+@item -keystore URL
+For more details @pxref{keystore,, URL}.
+
+@item -storepass PASSWORD
+For more details @pxref{storepass,, PASSWORD}.
+
+@item -provider PROVIDER_CLASS_NAME
+For more details @pxref{provider,, PROVIDER_CLASS_NAME}.
+
+@item -v
+For more details @pxref{verbose}.
+
+@end table
+
+@comment ----------------------------------------------------------------------
+
+@node Command -identitydb, , Command -cacert, Add/Update Commands
+@comment node-name, next, previous, up
+@subsubsection @code{-identitydb} command
+
 @b{NOT IMPLEMENTED YET}.
 
-Import a JDK 1.1 style Identity Database.
+Use this command to import a JDK 1.1 style Identity Database.
 
 @table @b
-@item -file FILE_NAME
-For more details @pxref{file,, FILE_NAME}.
+@item -file FILE
+For more details @pxref{file,, FILE}.
 
 @item -storetype STORE_TYPE
 For more details @pxref{storetype,, STORE_TYPE}.
@@ -455,8 +652,24 @@
 
 @end table
 
-@item -certreq COMMAND
-Generate a PKCS#10 @i{Certificate Signing Request} (CSR) and writes it to a designated output destination. The contents of the destination should look something like the following:
+@comment ----------------------------------------------------------------------
+
+@node Export Commands, Display Commands, Add/Update Commands, keytool Tool
+@comment node-name, next, previous, up
+@subsection Export commands
+
+@menu
+* Command -certreq::           Generate Certificate Signing Requests (CSR)
+* Command -export::            Export a certificate in a Key Store
+@end menu
+
+@comment ----------------------------------------------------------------------
+
+@node Command -certreq, Command -export, Export Commands, Export Commands
+@comment node-name, next, previous, up
+@subsubsection @code{-certreq} command
+
+Use this command to generate a PKCS#10 @i{Certificate Signing Request} (CSR) and write it to a designated output destination. The contents of the destination should look something like the following:
 
 @example
 -----BEGIN NEW CERTIFICATE REQUEST-----
@@ -476,8 +689,8 @@
 @item -sigalg ALGORITHM
 The canonical name of the digital signature algorithm to use for signing the certificate. If this option is omitted, a default value will be chosen based on the type of the private key associated with the designated @i{Alias}. If the private key is a @code{DSA} one, the value for the signature algorithm will be @code{SHA1withDSA}. If on the other hand the private key is an @code{RSA} one, then the tool will use @code{MD5withRSA} as the signature algorithm.
 
-@item -file FILE_NAME
-For more details @pxref{file,, FILE_NAME}.
+@item -file FILE
+For more details @pxref{file,, FILE}.
 
 @item -keypass PASSWORD
 Use this option to specify the password which the tool will use to unlock the @i{Key Entry} associated with the designated @i{Alias}.
@@ -504,16 +717,20 @@
 
 @end table
 
-@item -export COMMAND
-Export a certificate stored in the key store to a designated output destination, either in binary format (if the @code{-v} option is specified), or in RFC-1421 compliant encoding (if the @code{-rfc} option is specified
-instead).
+@comment ----------------------------------------------------------------------
+
+@node Command -export, , Command -certreq, Export Commands
+@comment node-name, next, previous, up
+@subsubsection @code{-export} command
+
+Use this command to export a certificate stored in a key store to a designated output destination, either in binary format (if the @code{-v} option is specified), or in RFC-1421 compliant encoding (if the @code{-rfc} option is specified instead).
 
 @table @b
 @item -alias ALIAS
 For more details @pxref{alias,, ALIAS}.
 
-@item -file FILE_NAME
-For more details @pxref{file,, FILE_NAME}.
+@item -file FILE
+For more details @pxref{file,, FILE}.
 
 @item -storetype STORE_TYPE
 For more details @pxref{storetype,, STORE_TYPE}.
@@ -535,8 +752,24 @@
 
 @end table
 
-@item -list COMMAND
-Print one or all of the key store entries to @code{STDOUT}. Usually this command will only print a @i{fingerprint} of the certificate, unless either the @code{-rfc} or the @code{-v} option is specified.
+@comment ----------------------------------------------------------------------
+
+@node Display Commands, Management Commands, Export Commands, keytool Tool
+@comment node-name, next, previous, up
+@subsection Display commands
+
+@menu
+* Command -list::              Display information about one or all Aliases
+* Command -printcert::         Print a certificate or a certificate fingerprint
+@end menu
+
+@comment ----------------------------------------------------------------------
+
+@node Command -list, Command -printcert, Display Commands, Display Commands
+@comment node-name, next, previous, up
+@subsubsection @code{-list} command
+
+Use this command to print one or all of a key store entries to @code{STDOUT}. Usually this command will only print a @i{fingerprint} of the certificate, unless either the @code{-rfc} or the @code{-v} option is specified.
 
 @table @b
 @item -alias ALIAS
@@ -564,20 +797,43 @@
 
 @end table
 
-@item -printcert COMMAND
-Read a certificate from a designated input source and print it to @code{STDOUT} in a human-readable form.
+@comment ----------------------------------------------------------------------
+
+@node Command -printcert, , Command -list, Display Commands
+@comment node-name, next, previous, up
+@subsubsection @code{-printcert} command
+
+Use this command to read a certificate from a designated input source and print it to @code{STDOUT} in a human-readable form.
 
 @table @b
-@item -file FILE_NAME
-For more details @pxref{file,, FILE_NAME}.
+@item -file FILE
+For more details @pxref{file,, FILE}.
 
 @item -v
 For more details @pxref{verbose}.
 
 @end table
 
-@item -keyclone COMMAND
-Clone an existing @i{Key Entry} and store it under a new (different) @i{Alias} protecting, its private key material with possibly a new password.
+@comment ----------------------------------------------------------------------
+
+@node Management Commands, , Display Commands, keytool Tool
+@comment node-name, next, previous, up
+@subsection Management commands
+
+@menu
+* Command -keyclone::          Clone a Key Entry in a Key Store
+* Command -storepasswd::       Change the password protecting a Key Store
+* Command -keypasswd::         Change the password protecting a Key Entry
+* Command -delete::            Remove an entry in a Key Store
+@end menu
+
+@comment ----------------------------------------------------------------------
+
+@node Command -keyclone, Command -storepasswd, Management Commands, Management Commands
+@comment node-name, next, previous, up
+@subsubsection @code{-keyclone} command
+
+Use this command to clone an existing @i{Key Entry} and store it under a new (different) @i{Alias} protecting, its private key material with possibly a new password.
 
 @table @b
 @item -alias ALIAS
@@ -611,8 +867,13 @@
 
 @end table
 
-@item -storepasswd COMMAND
-Change the password protecting a key store.
+@comment ----------------------------------------------------------------------
+
+@node Command -storepasswd, Command -keypasswd, Command -keyclone, Management Commands
+@comment node-name, next, previous, up
+@subsubsection @code{-storepasswd} command
+
+Use this command to change the password protecting a key store.
 
 @table @b
 @item -new PASSWORD
@@ -635,14 +896,18 @@
 
 @end table
 
-@item -keypasswd COMMAND
-Change the password protecting the private key material of a designated @i{Key Entry}.
+@comment ----------------------------------------------------------------------
+
+@node Command -keypasswd, Command -delete, Command -storepasswd, Management Commands
+@comment node-name, next, previous, up
+@subsubsection @code{-keypasswd} command
+
+Use this command to change the password protecting the private key material of a designated @i{Key Entry}.
 
 @table @b
 @item -alias ALIAS
 For more details @pxref{alias,, ALIAS}.
 
-@item -keypass PASSWORD
 Use this option to specify the password which the tool will use to unlock the @i{Key Entry} associated with the designated @i{Alias}.
 
 If this option is omitted, the tool will first attempt to unlock the @i{Key Entry} using the same password protecting the key store. If this fails, you will then be prompted to provide a password.
@@ -667,8 +932,13 @@
 
 @end table
 
-@item -delete COMMAND
-Delete a designated key store entry.
+@comment ----------------------------------------------------------------------
+
+@node Command -delete, , Command -keypasswd, Management Commands
+@comment node-name, next, previous, up
+@subsubsection @code{-delete} command
+
+Use this command to delete a designated key store entry.
 
 @table @b
 @item -alias ALIAS
@@ -690,7 +960,6 @@
 For more details @pxref{verbose}.
 
 @end table
-@end table
 
 @comment ----------------------------------------------------------------------
 
@@ -709,7 +978,7 @@
 
 @node Language Resources, Message Formats, I18N Issues, I18N Issues
 @comment node-name, next, previous, up
-@section Language-Specific Resources
+@section Language-specific resources
 
 The Tools use Java @code{ResourceBundle}s to store messages, and message templates they use at runtime to generate the message text itself, depending on the locale in use at the time.
 
@@ -761,7 +1030,7 @@
 
 @node Message Formats, , Language Resources, I18N Issues
 @comment node-name, next, previous, up
-@section Message Formats
+@section Message formats
 
 If you open any of the @file{messages.properties} described in the previous section, you may see properties that look like so:
 

Index: tools/gnu/classpath/tools/keytool/Main.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/Main.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tools/gnu/classpath/tools/keytool/Main.java	14 May 2006 08:20:18 -0000	1.2
+++ tools/gnu/classpath/tools/keytool/Main.java	11 Jun 2006 10:40:51 -0000	1.3
@@ -74,6 +74,7 @@
   static final String STOREPASSWD_CMD = "storepasswd"; //$NON-NLS-1$
   static final String KEYPASSWD_CMD = "keypasswd"; //$NON-NLS-1$
   static final String DELETE_CMD = "delete"; //$NON-NLS-1$
+  static final String CACERT_CMD = "cacert"; //$NON-NLS-1$
 
   static final String _GENKEY = "-" + GENKEY_CMD; //$NON-NLS-1$
   static final String _IMPORT = "-" + IMPORT_CMD; //$NON-NLS-1$
@@ -88,6 +89,7 @@
   static final String _KEYPASSWD = "-" + KEYPASSWD_CMD; //$NON-NLS-1$
   static final String _DELETE = "-" + DELETE_CMD; //$NON-NLS-1$
   static final String _HELP = "-help"; //$NON-NLS-1$
+  static final String _CACERT = "-" + CACERT_CMD; //$NON-NLS-1$
 
   static final String ALIAS_OPT = "alias"; //$NON-NLS-1$
   static final String SIGALG_OPT = "sigalg"; //$NON-NLS-1$
@@ -119,10 +121,14 @@
   private int gnuCallbacksNdx = -2;
   /** The command line parser. */
   private Parser cmdLineParser;
+  /** The shutdown hook. */
+  private ShutdownHook shutdownThread;
 
   private Main()
   {
     super();
+    shutdownThread = new ShutdownHook();
+    Runtime.getRuntime().addShutdownHook(shutdownThread);
   }
 
   public static final void main(String[] args)
@@ -157,6 +163,8 @@
     finally
       {
         tool.teardown();
+        if (tool.shutdownThread != null)
+          Runtime.getRuntime().removeShutdownHook(tool.shutdownThread);
       }
 
     log.exiting(Main.class.getName(), "main", Integer.valueOf(result)); //$NON-NLS-1$
@@ -213,6 +221,8 @@
           cmd = new KeyPasswdCmd();
         else if (_DELETE.equals(opt))
           cmd = new DeleteCmd();
+        else if (_CACERT.equals(opt))
+          cmd = new CACertCmd();
         else if (_HELP.equals(opt))
           throw new OptionException(""); //$NON-NLS-1$
         else
@@ -260,13 +270,15 @@
                                    Messages.getString("Main.32"))); //$NON-NLS-1$
     cmdGroup.add(new NoParseOption(DELETE_CMD,
                                    Messages.getString("Main.33"))); //$NON-NLS-1$
+    cmdGroup.add(new NoParseOption(CACERT_CMD,
+                                   Messages.getString("Main.5"))); //$NON-NLS-1$
     result.add(cmdGroup);
 
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }
 
-  private void teardown()
+  void teardown()
   {
     log.entering(this.getClass().getName(), "teardown"); //$NON-NLS-1$
 
@@ -309,4 +321,13 @@
       // do nothing
     }
   }
+
+  private class ShutdownHook
+      extends Thread
+  {
+    public void run()
+    {
+      teardown();
+    }
+  }
 }

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7767
retrieving revision 1.7768
diff -u -b -r1.7767 -r1.7768
--- ChangeLog	11 Jun 2006 08:29:56 -0000	1.7767
+++ ChangeLog	11 Jun 2006 10:40:52 -0000	1.7768
@@ -1,3 +1,20 @@
+2006-06-11  Raif S. Naffah  <raif@swiftdsl.com.au>
+
+	* doc/tools.texinfo: Added text for new -cacert command.
+	Re-structured sections.
+	* resource/gnu/classpath/tools/keytool/messages.properties: Added messages
+	for -cacert command.
+	* tools/gnu/classpath/tools/keytool/Main.java (CACERT_CMD): New constant.
+	(_CACERT): Likewise.
+	(shutdownThread): New field.
+	(Main): Install shutdown thread.
+	(main): Uninstall shutdown thread.
+	(start): Handle new -cacert command.
+	(getParser): Likewise.
+	(teardown): Increased visibility.
+	(ShutdownHook): New inner class.
+	* tools/gnu/classpath/tools/keytool/CACertCmd.java: New file.
+
 2006-06-11  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java

Index: resource/gnu/classpath/tools/keytool/messages.properties
===================================================================
RCS file: /cvsroot/classpath/classpath/resource/gnu/classpath/tools/keytool/messages.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- resource/gnu/classpath/tools/keytool/messages.properties	28 May 2006 10:35:48 -0000	1.2
+++ resource/gnu/classpath/tools/keytool/messages.properties	11 Jun 2006 10:40:52 -0000	1.3
@@ -40,6 +40,9 @@
 
 Main.6=keytool: {0}
 Main.8=keytool error: {0}
+Main.5=Import a CA's Trusted Certificate.\n\
+[-file FILE] [-storetype STORE_TYPE] [-keystore URL]\n\
+[-storepass PASSWORD] [-provider PROVIDER_CLASS_NAME] [-v].
 Main.18=Unrecognized command: {0}
 Main.19=Usage:  keytool [COMMAND] [-- COMMAND]...\n\
 Manage private keys and public certificates.
@@ -540,3 +543,28 @@
 JVM in-use.
 SelfCertCmd.34=PROVIDER_CLASS_NAME
 SelfCertCmd.35=Emit more verbose messages.
+
+CACertCmd.0=Alias [{0}] is already present in key store
+CACertCmd.1=Certificate in file "{0}" was added to the key store under the alias "{1}"
+CACertCmd.2=Usage:  keytool -cacert [OPTION]...\n\
+Import a trusted CA certificate.
+CACertCmd.3=Please report bugs at http://www.gnu.org/software/classpath/bugs.html
+CACertCmd.4=Command options
+CACertCmd.5=Location of the trusted CA certificate to import.
+CACertCmd.6=FILE
+CACertCmd.7=Type of the key store to use.  If omitted, the default value is \
+that of the property "keystore.type" in the security properties file.
+CACertCmd.8=STORE_TYPE
+CACertCmd.9=Location of the key store to use.  The default value is a \
+file-based scheme whose path is the file named ".keystore" in your home \
+directory.\n\
+If URL is malformed, the tool will use URL as a file-name of a key store; \
+i.e. as if the protocol was "file:".
+CACertCmd.10=URL
+CACertCmd.11=Password to unlock the key store.  If omitted, you will be \
+prompted for one.
+CACertCmd.12=PASSWORD
+CACertCmd.13=Fully qualified class name of a Security Provider to add to the \
+JVM in-use.
+CACertCmd.14=PROVIDER_CLASS_NAME
+CACertCmd.15=Emit more verbose messages.

Index: tools/gnu/classpath/tools/keytool/CACertCmd.java
===================================================================
RCS file: tools/gnu/classpath/tools/keytool/CACertCmd.java
diff -N tools/gnu/classpath/tools/keytool/CACertCmd.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tools/gnu/classpath/tools/keytool/CACertCmd.java	11 Jun 2006 10:40:51 -0000	1.1
@@ -0,0 +1,302 @@
+/* CACertCmd.java -- GNU specific cacert handler
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.tools.keytool;
+
+import gnu.classpath.tools.getopt.ClasspathToolParser;
+import gnu.classpath.tools.getopt.Option;
+import gnu.classpath.tools.getopt.OptionException;
+import gnu.classpath.tools.getopt.OptionGroup;
+import gnu.classpath.tools.getopt.Parser;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.util.logging.Logger;
+
+/**
+ * The <code>-cacert</code> keytol command handler is used to import a CA
+ * trusted X.509 certificate into a key store.
+ * <p>
+ * Possible options for this command are:
+ * <p>
+ * <dl>
+ *      <dt>-file FILE_NAME</dt>
+ *      <dd>The fully qualified path of the file containing the trusted CA
+ *      certificate to import. If omitted, the tool will process STDIN.
+ *      <p></dd>
+ *      
+ *      <dt>-storetype STORE_TYPE</dt>
+ *      <dd>Use this option to specify the type of the key store to use. The
+ *      default value, if this option is omitted, is that of the property
+ *      <code>keystore.type</code> in the security properties file, which is
+ *      obtained by invoking the {@link java.security.KeyStore#getDefaultType()}
+ *      static method.
+ *      <p></dd>
+ *      
+ *      <dt>-keystore URL</dt>
+ *      <dd>Use this option to specify the location of the key store to use.
+ *      The default value is a file {@link java.net.URL} referencing the file
+ *      named <code>.keystore</code> located in the path returned by the call to
+ *      {@link java.lang.System#getProperty(String)} using <code>user.home</code>
+ *      as argument.
+ *      <p>
+ *      If a URL was specified, but was found to be malformed --e.g. missing
+ *      protocol element-- the tool will attempt to use the URL value as a file-
+ *      name (with absolute or relative path-name) of a key store --as if the
+ *      protocol was <code>file:</code>.
+ *      <p></dd>
+ *      
+ *      <dt>-storepass PASSWORD</dt>
+ *      <dd>Use this option to specify the password protecting the key store. If
+ *      this option is omitted from the command line, you will be prompted to
+ *      provide a password.
+ *      <p></dd>
+ *      
+ *      <dt>-provider PROVIDER_CLASS_NAME</dt>
+ *      <dd>A fully qualified class name of a Security Provider to add to the
+ *      current list of Security Providers already installed in the JVM in-use.
+ *      If a provider class is specified with this option, and was successfully
+ *      added to the runtime --i.e. it was not already installed-- then the tool
+ *      will attempt to removed this Security Provider before exiting.
+ *      <p></dd>
+ *      
+ *      <dt>-v</dt>
+ *      <dd>Use this option to enable more verbose output.</dd>
+ * </dl>
+ */
+public class CACertCmd
+    extends Command
+{
+  private static final Logger log = Logger.getLogger(CACertCmd.class.getName());
+  /** Pathname of the file containing the CA certificate to import. */
+  protected String _certFileName;
+  /** Type of the key store to use. */
+  protected String _ksType;
+  /** The URL to the keystore where the trusted certificates will be added. */
+  protected String _ksURL;
+  /** The password protecting the keystore. */
+  protected String _ksPassword;
+  /** Class name of a security provider to use. */
+  protected String _providerClassName;
+  /** Reference to the X.509 factory. */
+  private CertificateFactory x509Factory;
+
+  // default 0-arguments constructor
+
+  // public setters -----------------------------------------------------------
+
+  /** @param pathName the fully qualified path name of the file to process. */
+  public void setFile(String pathName)
+  {
+    this._certFileName = pathName;
+  }
+
+  /** @param type the key-store type to use. */
+  public void setStoretype(String type)
+  {
+    this._ksType = type;
+  }
+
+  /** @param url the key-store URL to use. */
+  public void setKeystore(String url)
+  {
+    this._ksURL = url;
+  }
+
+  /** @param password the key-store password to use. */
+  public void setStorepass(String password)
+  {
+    this._ksPassword = password;
+  }
+
+  /** @param className a security provider fully qualified class name to use. */
+  public void setProvider(String className)
+  {
+    this._providerClassName = className;
+  }
+
+  // life-cycle methods -------------------------------------------------------
+
+  /* (non-Javadoc)
+   * @see gnu.classpath.tools.keytool.Command#setup()
+   */
+  void setup() throws Exception
+  {
+    setInputStreamParam(_certFileName);
+    setKeyStoreParams(_providerClassName, _ksType, _ksPassword, _ksURL);
+    log.finer("-cacert handler will use the following options:"); //$NON-NLS-1$
+    log.finer("  -file=" + _certFileName); //$NON-NLS-1$
+    log.finer("  -storetype=" + storeType); //$NON-NLS-1$
+    log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
+    log.finer("  -provider=" + provider); //$NON-NLS-1$
+    log.finer("  -v=" + verbose); //$NON-NLS-1$
+  }
+
+  void start() throws CertificateException, KeyStoreException,
+      NoSuchAlgorithmException, IOException
+  {
+    log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
+    alias = getAliasFromFileName(_certFileName);
+    if (store.containsAlias(alias))
+      throw new IllegalArgumentException(Messages.getFormattedString("CACertCmd.0", //$NON-NLS-1$
+                                                                     alias));
+    x509Factory = CertificateFactory.getInstance("X.509"); //$NON-NLS-1$
+    Certificate certificate = x509Factory.generateCertificate(inStream);
+    log.finest("certificate = " + certificate); //$NON-NLS-1$
+    store.setCertificateEntry(alias, certificate);
+    saveKeyStore();
+    if (verbose)
+      System.out.println(Messages.getFormattedString("CACertCmd.1", //$NON-NLS-1$
+                                                     new Object[] { _certFileName,
+                                                                    alias }));
+    log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
+  }
+
+  // own methods --------------------------------------------------------------
+
+  /* (non-Javadoc)
+   * @see gnu.classpath.tools.keytool.Command#getParser()
+   */
+  Parser getParser()
+  {
+    log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
+    Parser result = new ClasspathToolParser(Main.CACERT_CMD, true);
+    result.setHeader(Messages.getString("CACertCmd.2")); //$NON-NLS-1$
+    result.setFooter(Messages.getString("CACertCmd.3")); //$NON-NLS-1$
+    OptionGroup options = new OptionGroup(Messages.getString("CACertCmd.4")); //$NON-NLS-1$
+    options.add(new Option(Main.FILE_OPT,
+                           Messages.getString("CACertCmd.5"), //$NON-NLS-1$
+                           Messages.getString("CACertCmd.6")) //$NON-NLS-1$
+    {
+      public void parsed(String argument) throws OptionException
+      {
+        _certFileName = argument;
+      }
+    });
+    options.add(new Option(Main.STORETYPE_OPT,
+                           Messages.getString("CACertCmd.7"), //$NON-NLS-1$
+                           Messages.getString("CACertCmd.8")) //$NON-NLS-1$
+    {
+      public void parsed(String argument) throws OptionException
+      {
+        _ksType = argument;
+      }
+    });
+    options.add(new Option(Main.KEYSTORE_OPT,
+                           Messages.getString("CACertCmd.9"), //$NON-NLS-1$
+                           Messages.getString("CACertCmd.10")) //$NON-NLS-1$
+    {
+      public void parsed(String argument) throws OptionException
+      {
+        _ksURL = argument;
+      }
+    });
+    options.add(new Option(Main.STOREPASS_OPT,
+                           Messages.getString("CACertCmd.11"), //$NON-NLS-1$
+                           Messages.getString("CACertCmd.12")) //$NON-NLS-1$
+    {
+      public void parsed(String argument) throws OptionException
+      {
+        _ksPassword = argument;
+      }
+    });
+    options.add(new Option(Main.PROVIDER_OPT,
+                           Messages.getString("CACertCmd.13"), //$NON-NLS-1$
+                           Messages.getString("CACertCmd.14")) //$NON-NLS-1$
+    {
+      public void parsed(String argument) throws OptionException
+      {
+        _providerClassName = argument;
+      }
+    });
+    options.add(new Option(Main.VERBOSE_OPT,
+                           Messages.getString("CACertCmd.15")) //$NON-NLS-1$
+    {
+      public void parsed(String argument) throws OptionException
+      {
+        verbose = true;
+      }
+    });
+    result.add(options);
+    log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
+    return result;
+  }
+
+  /**
+   * Construct an Alias string from the name of the file containing the
+   * certificate to import. This method first removes the last dot (".")
+   * character and any subsequent characters from the input name, and then
+   * replaces any space and dot characters with underscores. For example the
+   * input string <code>brasil.gov.br.cert</code> will result in
+   * <code>brasil_gov_br</code> as its alias.
+   * 
+   * @param fileName the name of the file containing the CA certificate
+   * @return a string which can, and will, be used as the Alias of this CA
+   *         certificate.
+   */
+  private String getAliasFromFileName(String fileName)
+  {
+    log.entering(this.getClass().getName(), "getAliasFromFileName", fileName); //$NON-NLS-1$
+    // get the basename
+    fileName = new File(fileName).getName();
+    // remove '.' if at start
+    if (fileName.startsWith(".")) //$NON-NLS-1$
+      fileName = fileName.substring(1);
+
+    // remove last \..+
+    int ndx = fileName.lastIndexOf('.');
+    if (ndx > 0)
+      fileName = fileName.substring(0, ndx);
+    // replace spaces and dots with underscores
+    char[] chars = fileName.toCharArray();
+    for (int i = 0; i < chars.length; i++)
+      {
+        char c = chars[i];
+        if (c == ' ' || c == '.')
+          chars[i] = '_';
+      }
+    String result = new String(chars);
+    log.exiting(this.getClass().getName(), "getAliasFromFileName", result); //$NON-NLS-1$
+    return result;
+  }
+}



From MAILER-DAEMON Sun Jun 11 07:22:01 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpO13-0006hQ-65
	for mharc-commit-classpath@gnu.org; Sun, 11 Jun 2006 07:22:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpO11-0006hE-Ek
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 07:21:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpO10-0006gf-HN
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 07:21:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpO10-0006gc-CD
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 07:21:58 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpO9U-0007sE-FK
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 07:30:44 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpO0w-00025m-00
	for <commit-classpath@gnu.org>; Sun, 11 Jun 2006 07:21:54 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FpO0v-00025j-3x
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 11:21:54 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpO0v-00025j-3x@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Sun, 11 Jun 2006 11:21:53 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Cairo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jun 2006 11:21:59 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/11 11:21:52

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 
	                       ComponentGraphics.java 

Log message:
	       * gnu/java/awt/peer/gtk/CairoGraphics2D.java (drawImage):
	       Don't recurse, return false if not an BufferedImage and no image
	       source available.
	       * gnu/java/awt/peer/gtk/ComponentGraphics.java (draw): Add
	       end_gdk_drawing() to finally block.
	       (fill): Likewise.
	       (drawRenderedImage): Likewise.
	       (drawImage): Likewise.
	       (drawGlyphVector): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7768&r2=1.7769
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java?cvsroot=classpath&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7768
retrieving revision 1.7769
diff -u -b -r1.7768 -r1.7769
--- ChangeLog	11 Jun 2006 10:40:52 -0000	1.7768
+++ ChangeLog	11 Jun 2006 11:21:51 -0000	1.7769
@@ -1,3 +1,15 @@
+2006-06-11  Mark Wielaard  <mark@klomp.org>
+
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java (drawImage):
+	Don't recurse, return false if not an BufferedImage and no image
+	source available.
+	* gnu/java/awt/peer/gtk/ComponentGraphics.java (draw): Add
+	end_gdk_drawing() to finally block.
+	(fill): Likewise.
+	(drawRenderedImage): Likewise.
+	(drawImage): Likewise.
+	(drawGlyphVector): Likewise.
+
 2006-06-11  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	* doc/tools.texinfo: Added text for new -cacert command.

Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java	10 Jun 2006 10:33:17 -0000	1.18
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java	11 Jun 2006 11:21:52 -0000	1.19
@@ -79,6 +79,7 @@
 import java.awt.image.DataBufferInt;
 import java.awt.image.DirectColorModel;
 import java.awt.image.ImageObserver;
+import java.awt.image.ImageProducer;
 import java.awt.image.ImagingOpException;
 import java.awt.image.MultiPixelPackedSampleModel;
 import java.awt.image.Raster;
@@ -1100,11 +1101,14 @@
 				     + xform.toString());
       }
 
-    // Unrecognized image - convert to a BufferedImage and come back.
+    // Unrecognized image - convert to a BufferedImage
     if( !(img instanceof BufferedImage) )
-      return this.drawImage(Toolkit.getDefaultToolkit().
-			    createImage(img.getSource()),
-			    xform, bgcolor, obs);
+      {
+	ImageProducer source = img.getSource();
+	if (source == null)
+	  return false;
+	img = Toolkit.getDefaultToolkit().createImage(source);
+      }
 
     BufferedImage b = (BufferedImage) img;
     DataBuffer db;

Index: gnu/java/awt/peer/gtk/ComponentGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gnu/java/awt/peer/gtk/ComponentGraphics.java	10 Jun 2006 10:33:18 -0000	1.12
+++ gnu/java/awt/peer/gtk/ComponentGraphics.java	11 Jun 2006 11:21:52 -0000	1.13
@@ -181,39 +181,70 @@
   public void draw(Shape s)
   {
     start_gdk_drawing();
+    try
+      {
     super.draw(s);
+      }
+    finally
+      {
     end_gdk_drawing();
   }
+  }
 
   public void fill(Shape s)
   {
     start_gdk_drawing();
+    try
+      {
     super.fill(s);
+      }
+    finally
+      {
     end_gdk_drawing();
   }
+  }
 
   public void drawRenderedImage(RenderedImage image, AffineTransform xform)
   {
     start_gdk_drawing();
+    try
+      {
     super.drawRenderedImage(image, xform);
+      }
+    finally
+      {
     end_gdk_drawing();
   }
+  }
 
   protected boolean drawImage(Image img, AffineTransform xform,
 			      Color bgcolor, ImageObserver obs)
   {
+    boolean rv;
     start_gdk_drawing();
-    boolean rv = super.drawImage(img, xform, bgcolor, obs);
+    try
+      {
+	rv = super.drawImage(img, xform, bgcolor, obs);
+      }
+    finally
+      {
     end_gdk_drawing();
+      }
     return rv;
   }
 
   public void drawGlyphVector(GlyphVector gv, float x, float y)
   {
     start_gdk_drawing();
+    try
+      {
     super.drawGlyphVector(gv, x, y);
+      }
+    finally
+      {
     end_gdk_drawing();
   }
+  }
   
   public boolean drawImage(Image img, int x, int y, ImageObserver observer)
   {



From MAILER-DAEMON Sun Jun 11 07:31:08 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpO9s-00007Z-0h
	for mharc-commit-classpath@gnu.org; Sun, 11 Jun 2006 07:31:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpO9q-00005Y-Do
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 07:31:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpO9p-0008WQ-4C
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 07:31:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpO9o-0008WF-Uy
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 07:31:04 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpOIJ-0008MU-4J
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 07:39:51 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpO9o-0002ED-00
	for <commit-classpath@gnu.org>; Sun, 11 Jun 2006 07:31:04 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FpO9n-0002E8-G7
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 11:31:04 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpO9n-0002E8-G7@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Sun, 11 Jun 2006 11:31:03 +0000
Subject: [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jun 2006 11:31:07 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/11 11:31:03

Modified files:
	.              : ChangeLog 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 

Log message:
	       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
	       (Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphs):
	       Remove unused variable glyph_index.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7769&r2=1.7770
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c?cvsroot=classpath&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7769
retrieving revision 1.7770
diff -u -b -r1.7769 -r1.7770
--- ChangeLog	11 Jun 2006 11:21:51 -0000	1.7769
+++ ChangeLog	11 Jun 2006 11:31:01 -0000	1.7770
@@ -1,5 +1,11 @@
 2006-06-11  Mark Wielaard  <mark@klomp.org>
 
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
+	(Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphs):
+	Remove unused variable glyph_index.
+
+2006-06-11  Mark Wielaard  <mark@klomp.org>
+
 	* gnu/java/awt/peer/gtk/CairoGraphics2D.java (drawImage):
 	Don't recurse, return false if not an BufferedImage and no image
 	source available.

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	11 Jun 2006 08:29:57 -0000	1.3
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	11 Jun 2006 11:31:03 -0000	1.4
@@ -86,7 +86,6 @@
   (JNIEnv *env, jobject obj, jintArray codepoints)
 {
   FT_Face ft_face;
-  jint glyph_index;
   jintArray retArray;
   PangoFcFont *font;
   jint *values, *cpvals;



From MAILER-DAEMON Sun Jun 11 08:56:32 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpPUW-0006QT-IF
	for mharc-commit-classpath@gnu.org; Sun, 11 Jun 2006 08:56:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpOqG-00017t-5O
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 08:14:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpOqF-00017i-Ht
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 08:14:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpOqF-00017f-8i
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 08:14:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpOyf-0003By-9I
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 08:23:41 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpOq8-0003xW-00
	for <commit-classpath@gnu.org>; Sun, 11 Jun 2006 08:14:48 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FpOq7-0003xT-4q
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 12:14:48 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpOq7-0003xT-4q@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sun, 11 Jun 2006 12:14:47 +0000
X-Mailman-Approved-At: Sun, 11 Jun 2006 08:56:30 -0400
Subject: [commit-cp] classpath/gnu javax/crypto/key/dhGnuDHKeyPairGe...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jun 2006 12:14:57 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/11 12:14:46

Modified files:
	gnu/javax/crypto/key/dh: GnuDHKeyPairGenerator.java 
	gnu/javax/security/auth/login: GnuConfiguration.java 
	                               ConfigFileParser.java 
	gnu/javax/crypto/cipher: Twofish.java BaseCipher.java 
	                         Rijndael.java Anubis.java Khazad.java 
	gnu/javax/crypto/jce/keyring: GnuKeyring.java 
	gnu/javax/crypto/keyring: GnuPublicKeyring.java 
	                          GnuPrivateKeyring.java Entry.java 
	                          PasswordEncryptedEntry.java 
	                          PasswordAuthenticatedEntry.java 
	                          EnvelopeEntry.java 
	gnu/java/security/key/rsa: GnuRSAPrivateKey.java 
	                           RSAKeyPairPKCS8Codec.java 
	                           RSAKeyPairX509Codec.java 
	                           RSAKeyPairGenerator.java 
	gnu/javax/crypto/jce/prng: UMacRandomSpi.java ICMRandomSpi.java 
	gnu/java/security/x509: X509CRLEntry.java X509CRL.java 
	gnu/javax/crypto/pad: TBC.java PKCS7.java PKCS1_V1_5.java 
	                      BasePad.java 
	gnu/java/security/hash: Whirlpool.java 
	gnu/javax/crypto/prng: CSPRNG.java 
	gnu/java/security/key/dss: DSSPrivateKey.java 
	                           DSSKeyPairPKCS8Codec.java 
	                           DSSKeyPairGenerator.java 
	gnu/java/security/x509/ext: Extension.java 
	gnu/javax/crypto/sasl/srp: SRPServer.java SRPClient.java 
	gnu/java/security/util: Prime2.java Base64.java 
	gnu/javax/crypto/key/srp6: SRPKeyPairGenerator.java 
	gnu/java/security/sig/rsa: EMSA_PSS.java RSAPSSSignature.java 
	gnu/java/security/pkcs: PKCS7SignedData.java SignerInfo.java 
	gnu/java/security/jce/sig: SignatureAdapter.java 
	                           EncodedKeyFactory.java 
	gnu/java/security: Properties.java 
	gnu/java/security/provider: PKIXCertPathValidatorImpl.java 
	gnu/javax/crypto/sasl: SaslInputStream.java 
	                       SaslOutputStream.java 
	.              : ChangeLog 
	gnu/javax/crypto/mac: OMAC.java 

Log message:
	2006-06-11  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		PR Classpath/26065
		* gnu/javax/security/auth/login/GnuConfiguration.java: Condition all trace/
		debug code based on Configuration.DEBUG.
		Use logger instead of STDOUT and ot STDERR.
		* gnu/javax/security/auth/login/ConfigFileParser.java: Likewise.
		* gnu/javax/crypto/sasl/SaslOutputStream.java: Likewise.
		* gnu/javax/crypto/sasl/SaslInputStream.java: Likewise.
		* gnu/javax/crypto/sasl/srp/SRPServer.java: Likewise.
		* gnu/javax/crypto/sasl/srp/SRPClient.java: Likewise.
		* gnu/javax/crypto/prng/CSPRNG.java: Likewise.
		* gnu/javax/crypto/pad/TBC.java: Likewise.
		* gnu/javax/crypto/pad/PKCS7.java: Likewise.
		* gnu/javax/crypto/pad/PKCS1_V1_5.java: Likewise.
		* gnu/javax/crypto/pad/BasePad.java: Likewise.
		* gnu/javax/crypto/mac/OMAC.java: Likewise.
		* gnu/javax/crypto/keyring/PasswordEncryptedEntry.java: Likewise.
		* gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java: Likewise.
		* gnu/javax/crypto/keyring/GnuPublicKeyring.java: Likewise.
		* gnu/javax/crypto/keyring/GnuPrivateKeyring.java: Likewise.
		* gnu/javax/crypto/keyring/EnvelopeEntry.java: Likewise.
		* gnu/javax/crypto/keyring/Entry.java: Likewise.
		* gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java: Likewise.
		* gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java: Likewise.
		* gnu/javax/crypto/jce/prng/UMacRandomSpi.java: Likewise.
		* gnu/javax/crypto/jce/prng/ICMRandomSpi.java: Likewise.
		* gnu/javax/crypto/jce/keyring/GnuKeyring.java: Likewise.
		* gnu/javax/crypto/cipher/Twofish.java: Likewise.
		* gnu/javax/crypto/cipher/Khazad.java: Likewise.
		* gnu/javax/crypto/cipher/Rijndael.java: Likewise.
		* gnu/javax/crypto/cipher/BaseCipher.java: Likewise.
		* gnu/javax/crypto/cipher/Anubis.java: Likewise.
		* gnu/java/security/Properties.java: Likewise.
		* gnu/java/security/x509/X509CRLEntry.java: Likewise.
		* gnu/java/security/x509/X509CRL.java: Likewise.
		* gnu/java/security/x509/ext/Extension.java: Likewise.
		* gnu/java/security/util/Prime2.java: Likewise.
		* gnu/java/security/util/Base64.java: Likewise.
		* gnu/java/security/sig/rsa/RSAPSSSignature.java: Likewise.
		* gnu/java/security/sig/rsa/EMSA_PSS.java: Likewise.
		* gnu/java/security/provider/PKIXCertPathValidatorImpl.java: Likewise.
		* gnu/java/security/pkcs/SignerInfo.java: Likewise.
		* gnu/java/security/pkcs/PKCS7SignedData.java: Likewise.
		* gnu/java/security/key/rsa/RSAKeyPairX509Codec.java: Likewise.
		* gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java: Likewise.
		* gnu/java/security/key/rsa/RSAKeyPairGenerator.java: Likewise.
		* gnu/java/security/key/rsa/GnuRSAPrivateKey.java: Likewise.
		* gnu/java/security/key/dss/DSSPrivateKey.java: Likewise.
		* gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java: Likewise.
		* gnu/java/security/key/dss/DSSKeyPairGenerator.java: Likewise.
		* gnu/java/security/jce/sig/SignatureAdapter.java: Likewise.
		* gnu/java/security/jce/sig/EncodedKeyFactory.java: Likewise.
		* gnu/java/security/hash/Whirlpool.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/login/GnuConfiguration.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/login/ConfigFileParser.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Twofish.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/BaseCipher.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Rijndael.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Anubis.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Khazad.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/GnuPublicKeyring.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/GnuPrivateKeyring.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/Entry.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/X509CRLEntry.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/X509CRL.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/TBC.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/PKCS7.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/BasePad.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Whirlpool.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/prng/CSPRNG.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSPrivateKey.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/ext/Extension.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/Prime2.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/Base64.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/pkcs/PKCS7SignedData.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/pkcs/SignerInfo.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/SignatureAdapter.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/EncodedKeyFactory.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/Properties.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/SaslInputStream.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7770&r2=1.7771
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mac/OMAC.java?cvsroot=classpath&r1=1.2&r2=1.3

Patches:
Index: javax/crypto/key/dh/GnuDHKeyPairGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- javax/crypto/key/dh/GnuDHKeyPairGenerator.java	22 Apr 2006 17:57:19 -0000	1.5
+++ javax/crypto/key/dh/GnuDHKeyPairGenerator.java	11 Jun 2006 12:14:43 -0000	1.6
@@ -38,18 +38,19 @@
 
 package gnu.javax.crypto.key.dh;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.hash.Sha160;
 import gnu.java.security.key.IKeyPairGenerator;
 import gnu.java.security.util.PRNG;
 
-import java.io.PrintWriter;
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.util.Map;
+import java.util.logging.Logger;
 
 import javax.crypto.spec.DHGenParameterSpec;
 import javax.crypto.spec.DHParameterSpec;
@@ -66,26 +67,7 @@
  */
 public class GnuDHKeyPairGenerator implements IKeyPairGenerator
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "dh";
-
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 5;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(String s)
-  {
-    err.println(">>> " + NAME + ": " + s);
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(GnuDHKeyPairGenerator.class.getName());
   /**
    * Property name of an optional {@link SecureRandom} instance to use. The
    * default is to use a classloader singleton from {@link PRNG}.
@@ -240,14 +222,14 @@
         p = params[RFC2631.DH_PARAMS_P];
         j = params[RFC2631.DH_PARAMS_J];
         g = params[RFC2631.DH_PARAMS_G];
-        if (DEBUG && debuglevel > 0)
+        if (Configuration.DEBUG)
           {
-            debug("seed: 0x" + seed.toString(16));
-            debug("counter: " + counter.intValue());
-            debug("q: 0x" + q.toString(16));
-            debug("p: 0x" + p.toString(16));
-            debug("j: 0x" + j.toString(16));
-            debug("g: 0x" + g.toString(16));
+            log.fine("seed: 0x" + seed.toString(16));
+            log.fine("counter: " + counter.intValue());
+            log.fine("q: 0x" + q.toString(16));
+            log.fine("p: 0x" + p.toString(16));
+            log.fine("j: 0x" + j.toString(16));
+            log.fine("g: 0x" + g.toString(16));
           }
       }
 

Index: javax/security/auth/login/GnuConfiguration.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/security/auth/login/GnuConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- javax/security/auth/login/GnuConfiguration.java	15 Jan 2006 19:42:52 -0000	1.1
+++ javax/security/auth/login/GnuConfiguration.java	11 Jun 2006 12:14:43 -0000	1.2
@@ -50,6 +50,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Logger;
 
 import javax.security.auth.AuthPermission;
 import javax.security.auth.login.AppConfigurationEntry;
@@ -127,12 +128,7 @@
  */
 public final class GnuConfiguration extends Configuration
 {
-  // Constants and fields
-  // --------------------------------------------------------------------------
-
-  private static final boolean DEBUG = true;
-  private static final void debug(String m) {if (DEBUG) System.err.println(m);};
-
+  private static final Logger log = Logger.getLogger(GnuConfiguration.class.getName());
   /**
    * The internal map of login modules keyed by application name. Each entry in
    * this map is a {@link List} of {@link AppConfigurationEntry}s for that
@@ -179,7 +175,8 @@
     if (loginModules == null || loginModules.size() == 0)
       return null;
 
-    debug("DEBUG: " + appName + " -> " + loginModules.size() + " entry(ies)");
+    if (gnu.classpath.Configuration.DEBUG)
+      log.fine(appName + " -> " + loginModules.size() + " entry(ies)");
     return (AppConfigurationEntry[]) loginModules.toArray(new AppConfigurationEntry[0]);
   }
 
@@ -193,7 +190,7 @@
    * @throws SecurityException if the caller does not have an
    * {@link AuthPermission} for the action named
    * <code>refreshLoginConfiguration</code>.
-   * @see {@link AuthPermission}
+   * @see AuthPermission
    */
   public void refresh()
   {
@@ -215,13 +212,25 @@
   private void init()
   {
     if (processSecurityProperties())
-      debug(" INFO: Using login configuration defined by Security property(ies)");
+      {
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("Using login configuration defined by Security property(ies)");
+      }
     else if (processSystemProperty())
-      debug(" INFO: Using login configuration defined by System property");
+      {
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("Using login configuration defined by System property");
+      }
     else if (processUserHome())
-      debug(" INFO: Using login configuration defined in ${user.home}");
+      {
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("Using login configuration defined in ${user.home}");
+      }
     else
-      debug(" WARN: No login configuration file found");
+      {
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("No login configuration file found");
+      }
   }
 
   /**
@@ -249,7 +258,8 @@
           s = s.trim();
           if (s.length() != 0)
             {
-              debug("DEBUG: java.security.auth.login.config.url." + counter
+              if (gnu.classpath.Configuration.DEBUG)
+                log.fine("java.security.auth.login.config.url." + counter
                     + " = " + s);
               parseConfig(getInputStreamFromURL(s));
               result = true;
@@ -257,7 +267,8 @@
         }
       catch (Throwable t)
         {
-          debug(" WARN: Exception while handling Security property at #"
+          if (gnu.classpath.Configuration.DEBUG)
+            log.fine("Exception while handling Security property at #"
                 + counter + ". Continue: " + t);
         }
     return result;
@@ -287,7 +298,8 @@
       }
     catch (MalformedURLException x)
       {
-        debug(" WARN: Failed opening as URL: " + s + ". Will try as File");
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("Failed opening as URL: " + s + ". Will try as File");
         result = new FileInputStream(s);
       }
     return result;
@@ -311,7 +323,8 @@
             s = s.trim();
             if (s.length() != 0)
               {
-                debug("DEBUG: java.security.auth.login.config = " + s);
+                if (gnu.classpath.Configuration.DEBUG)
+                  log.fine("java.security.auth.login.config = " + s);
                 parseConfig(getInputStreamFromURL(s));
                 result = true;
               }
@@ -319,7 +332,8 @@
       }
     catch (Throwable t)
       {
-        debug(" WARN: Exception while handling System property. Continue: " + t);
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("Exception while handling System property. Continue: " + t);
       }
     return result;
   }
@@ -349,7 +363,8 @@
 
         if (jaasFile == null)
           {
-            debug(" WARN: Login Configuration file, in " + userHome
+            if (gnu.classpath.Configuration.DEBUG)
+              log.fine("Login Configuration file, in " + userHome
                     + ", does not exist or is inaccessible");
             return result;
           }
@@ -360,7 +375,8 @@
       }
     catch (Throwable t)
       {
-        debug(" WARN: Exception while handling ${user.home}: " + t);
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("Exception (ignored) while handling ${user.home}: " + t);
       }
     return result;
   }
@@ -397,54 +413,54 @@
     String uh = System.getProperty("user.home");
     if (uh == null || uh.trim().length() == 0)
       {
-        debug(" WARN: User home path is not set or is empty");
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("User home path is not set or is empty");
         return null;
       }
-
     uh = uh.trim();
     File result = new File(uh);
-    if (!result.exists())
+    if (! result.exists())
       {
-        debug(" WARN: User home '" + uh + "' does not exist");
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("User home '" + uh + "' does not exist");
         return null;
       }
-
-    if (!result.isDirectory())
+    if (! result.isDirectory())
       {
-        debug(" WARN: User home '" + uh + "' is not a directory");
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("User home '" + uh + "' is not a directory");
         return null;
       }
-
-    if (!result.canRead())
+    if (! result.canRead())
       {
-        debug(" WARN: User home '" + uh + "' is not readable");
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("User home '" + uh + "' is not readable");
         return null;
       }
-
     return result;
   }
 
   private File getConfigFromUserHome(File userHome, String fileName)
   {
     File result = new File(userHome, fileName);
-    if (!result.exists())
+    if (! result.exists())
       {
-        debug(" WARN: File '" + fileName + "' does not exist in user's home");
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("File '" + fileName + "' does not exist in user's home");
         return null;
       }
-
-    if (!result.isFile())
+    if (! result.isFile())
       {
-        debug(" WARN: File '" + fileName + "' in user's home is not a file");
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("File '" + fileName + "' in user's home is not a file");
         return null;
       }
-
-    if (!result.canRead())
+    if (! result.canRead())
       {
-        debug(" WARN: File '" + fileName + "' in user's home is not readable");
+        if (gnu.classpath.Configuration.DEBUG)
+          log.fine("File '" + fileName + "' in user's home is not readable");
         return null;
       }
-
     return result;
   }
 }

Index: javax/security/auth/login/ConfigFileParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/security/auth/login/ConfigFileParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- javax/security/auth/login/ConfigFileParser.java	11 Jun 2006 00:05:10 -0000	1.3
+++ javax/security/auth/login/ConfigFileParser.java	11 Jun 2006 12:14:43 -0000	1.4
@@ -38,12 +38,15 @@
 
 package gnu.javax.security.auth.login;
 
+import gnu.classpath.Configuration;
+
 import java.io.IOException;
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Logger;
 
 import javax.security.auth.login.AppConfigurationEntry;
 
@@ -88,26 +91,12 @@
  */
 public final class ConfigFileParser
 {
-  // Constants and fields
-  // --------------------------------------------------------------------------
-
-  private static final boolean DEBUG = false;
-  private static final void debug(String m) {if (DEBUG) System.err.println(m);};
-
+  private static final Logger log = Logger.getLogger(ConfigFileParser.class.getName());
   private ConfigFileTokenizer cft;
   private Map map = new HashMap();
 
-  // Constructor(s)
-  // --------------------------------------------------------------------------
-
   // default 0-arguments constructor
 
-  // Class methods
-  // --------------------------------------------------------------------------
-
-  // Instance methods
-  // --------------------------------------------------------------------------
-
   /**
    * Returns the parse result as a {@link Map} where the keys are application
    * names, and the entries are {@link List}s of {@link AppConfigurationEntry}
@@ -161,7 +150,8 @@
       }
 
     String appName = cft.sval;
-    debug("DEBUG: APP_NAME_OR_OTHER = " + appName);
+    if (Configuration.DEBUG)
+      log.fine("APP_NAME_OR_OTHER = " + appName);
     if (cft.nextToken() != '{')
       abort("Missing '{' after APP_NAME_OR_OTHER");
 
@@ -202,13 +192,15 @@
       }
 
     String clazz = validateClassName(cft.sval);
-    debug("DEBUG: MODULE_CLASS = " + clazz);
+    if (Configuration.DEBUG)
+      log.fine("MODULE_CLASS = " + clazz);
 
     if (cft.nextToken() != ConfigFileTokenizer.TT_WORD)
       abort("Was expecting FLAG but found none");
 
     String flag = cft.sval;
-    debug("DEBUG: FLAG = " + flag);
+    if (Configuration.DEBUG)
+      log.fine("DEBUG: FLAG = " + flag);
     AppConfigurationEntry.LoginModuleControlFlag f = null;
     if (flag.equalsIgnoreCase("required"))
       f = AppConfigurationEntry.LoginModuleControlFlag.REQUIRED;
@@ -230,32 +222,39 @@
           abort("Was expecting PARAM_NAME but got '" + ((char) c) + "'");
 
         paramName = cft.sval;
-        debug("DEBUG: PARAM_NAME = " + paramName);
+        if (Configuration.DEBUG)
+          log.fine("PARAM_NAME = " + paramName);
         if (cft.nextToken() != '=')
           abort("Missing '=' after PARAM_NAME");
 
         c = cft.nextToken();
         if (c != '"' && c != '\'')
-          debug(" WARN: Was expecting a quoted string but got no quote " +
-                "character. Assume unquoted string");
-
+          {
+          if (Configuration.DEBUG)
+            log.fine("Was expecting a quoted string but got no quote character."
+                     + " Assume unquoted string");
+          }
         paramValue = expandParamValue(cft.sval);
-        debug("DEBUG: PARAM_VALUE = " + paramValue);
+        if (Configuration.DEBUG)
+          log.fine("PARAM_VALUE = " + paramValue);
         options.put(paramName, paramValue);
 
         c = cft.nextToken();
       }
-
     AppConfigurationEntry ace = new AppConfigurationEntry(clazz, f, options);
-    debug("DEBUG: LOGIN_MODULE_ENTRY = " + ace);
+    if (Configuration.DEBUG)
+      log.fine("LOGIN_MODULE_ENTRY = " + ace);
     listOfACEs.add(ace);
     return true;
   }
 
   private void abort(String m) throws IOException
   {
-    debug("ERROR: " + m);
-    debug("DEBUG: Map (so far) = " + String.valueOf(map));
+    if (Configuration.DEBUG)
+      {
+        log.fine(m);
+        log.fine("Map (so far) = " + String.valueOf(map));
+      }
     throw new IOException(m);
   }
 
@@ -312,14 +311,17 @@
             int j = s.indexOf("}", i + 2);
             if (j == -1)
               {
-                debug(" WARN: Found a ${ prefix with no } suffix. Ignore");
+                if (Configuration.DEBUG)
+                  log.fine("Found a ${ prefix with no } suffix. Ignore");
                 break;
               }
 
             String sysPropName = s.substring(i + 2, j);
-            debug("DEBUG: Found a reference to System property " + sysPropName);
+            if (Configuration.DEBUG)
+              log.fine("Found a reference to System property " + sysPropName);
             String sysPropValue = System.getProperty(sysPropName);
-            debug("DEBUG: Resolved " + sysPropName + " to '" + sysPropValue + "'");
+            if (Configuration.DEBUG)
+              log.fine("Resolved " + sysPropName + " to '" + sysPropValue + "'");
             if (sysPropValue != null)
               {
                 result = s.substring(0, i) + sysPropValue + s.substring(j + 1);
@@ -331,7 +333,8 @@
       }
     catch (Exception x)
       {
-        debug(" WARN: Exception while expanding " + s + ". Ignore: " + x);
+        if (Configuration.DEBUG)
+          log.fine("Exception (ignored) while expanding " + s + ": " + x);
       }
 
     return result;

Index: javax/crypto/cipher/Twofish.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Twofish.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/cipher/Twofish.java	21 Apr 2006 10:52:26 -0000	1.2
+++ javax/crypto/cipher/Twofish.java	11 Jun 2006 12:14:43 -0000	1.3
@@ -38,14 +38,15 @@
 
 package gnu.javax.crypto.cipher;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
-//import java.io.PrintWriter;
 import java.security.InvalidKeyException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.logging.Logger;
 
 /**
  * <p>Twofish is a balanced 128-bit Feistel cipher, consisting of 16 rounds. In
@@ -68,23 +69,7 @@
  */
 public final class Twofish extends BaseCipher
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  //   private static final String NAME = "twofish";
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 9;
-
-  //   private static final PrintWriter err = new PrintWriter(System.out, true);
-  //   private static void debug(String s) {
-  //      err.println(">>> "+NAME+": "+s);
-  //   }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(Twofish.class.getName());
   private static final int DEFAULT_BLOCK_SIZE = 16; // in bytes
 
   private static final int DEFAULT_KEY_SIZE = 16; // in bytes
@@ -265,62 +250,43 @@
 
       time = System.currentTimeMillis() - time;
 
-      if (DEBUG && debuglevel > 8)
+      if (Configuration.DEBUG)
         {
-          System.out.println("==========");
-          System.out.println();
-          System.out.println("Static Data");
-          System.out.println();
-          System.out.println("MDS[0][]:");
+          log.fine("Static Data");
+          log.fine("MDS[0][]:");
+          StringBuilder sb;
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(MDS[0][i * 4 + j])
-                                   + ", ");
+                sb.append("0x").append(Util.toString(MDS[0][i * 4 + j])).append(", ");
+              log.fine(sb.toString());
                 }
-              System.out.println();
-            }
-
-          System.out.println();
-          System.out.println("MDS[1][]:");
+          log.fine("MDS[1][]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(MDS[1][i * 4 + j])
-                                   + ", ");
+                sb.append("0x").append(Util.toString(MDS[1][i * 4 + j])).append(", ");
+              log.fine(sb.toString());
                 }
-              System.out.println();
-            }
-
-          System.out.println();
-          System.out.println("MDS[2][]:");
+          log.fine("MDS[2][]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(MDS[2][i * 4 + j])
-                                   + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(MDS[2][i * 4 + j])).append(", ");
+              log.fine(sb.toString());
             }
-
-          System.out.println();
-          System.out.println("MDS[3][]:");
+          log.fine("MDS[3][]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(MDS[3][i * 4 + j])
-                                   + ", ");
+                sb.append("0x").append(Util.toString(MDS[3][i * 4 + j])).append(", ");
+              log.fine(sb.toString());
                 }
-              System.out.println();
-            }
-
-          System.out.println();
-          System.out.println("Total initialization time: " + time + " ms.");
-          System.out.println();
+          log.fine("Total initialization time: " + time + " ms.");
         }
     }
 
@@ -630,64 +596,49 @@
                                              ^ b3(k0)];
           }
       }
-
-    if (DEBUG && debuglevel > 7)
+    if (Configuration.DEBUG)
       {
-        System.out.println("S-box[]:");
+        StringBuilder sb;
+        log.fine("S-box[]:");
         for (i = 0; i < 64; i++)
           {
+            sb = new StringBuilder();
             for (j = 0; j < 4; j++)
-              {
-                System.out.print("0x" + Util.toString(sBox[i * 4 + j]) + ", ");
-              }
-            System.out.println();
+              sb.append("0x").append(Util.toString(sBox[i * 4 + j])).append(", ");
+            log.fine(sb.toString());
           }
-        System.out.println();
+        log.fine("");
         for (i = 0; i < 64; i++)
           {
+            sb = new StringBuilder();
             for (j = 0; j < 4; j++)
-              {
-                System.out.print("0x" + Util.toString(sBox[256 + i * 4 + j])
-                                 + ", ");
-              }
-            System.out.println();
+              sb.append("0x").append(Util.toString(sBox[256 + i * 4 + j])).append(", ");
+            log.fine(sb.toString());
           }
-        System.out.println();
+        log.fine("");
         for (i = 0; i < 64; i++)
           {
+            sb = new StringBuilder();
             for (j = 0; j < 4; j++)
-              {
-                System.out.print("0x" + Util.toString(sBox[512 + i * 4 + j])
-                                 + ", ");
-              }
-            System.out.println();
+              sb.append("0x").append(Util.toString(sBox[512 + i * 4 + j])).append(", ");
+            log.fine(sb.toString());
           }
-        System.out.println();
+        log.fine("");
         for (i = 0; i < 64; i++)
           {
+            sb = new StringBuilder();
             for (j = 0; j < 4; j++)
-              {
-                System.out.print("0x" + Util.toString(sBox[768 + i * 4 + j])
-                                 + ", ");
-              }
-            System.out.println();
+              sb.append("0x").append(Util.toString(sBox[768 + i * 4 + j])).append(", ");
+            log.fine(sb.toString());
           }
-        System.out.println();
-        System.out.println("User (odd, even) keys  --> S-Box keys:");
+        log.fine("User (odd, even) keys  --> S-Box keys:");
         for (i = 0; i < k64Cnt; i++)
-          {
-            System.out.println("0x" + Util.toString(k32o[i]) + "  0x"
-                               + Util.toString(k32e[i]) + " --> 0x"
-                               + Util.toString(sBoxKey[k64Cnt - 1 - i]));
-          }
-        System.out.println();
-        System.out.println("Round keys:");
+          log.fine("0x" + Util.toString(k32o[i]) + "  0x" + Util.toString(k32e[i])
+                   + " --> 0x" + Util.toString(sBoxKey[k64Cnt - 1 - i]));
+        log.fine("Round keys:");
         for (i = 0; i < ROUND_SUBKEYS + 2 * ROUNDS; i += 2)
-          {
-            System.out.println("0x" + Util.toString(subKeys[i]) + "  0x"
-                               + Util.toString(subKeys[i + 1]));
-          }
-        System.out.println();
+          log.fine("0x" + Util.toString(subKeys[i])
+                   + "  0x" + Util.toString(subKeys[i + 1]));
       }
 
     return new Object[] { sBox, subKeys };
@@ -704,12 +655,8 @@
     Object[] sk = (Object[]) sessionKey; // extract S-box and session key
     int[] sBox = (int[]) sk[0];
     int[] sKey = (int[]) sk[1];
-
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("PT=" + Util.toString(in, inOffset, bs));
-      }
-
+    if (Configuration.DEBUG)
+      log.fine("PT=" + Util.toString(in, inOffset, bs));
     int x0 = (in[inOffset++] & 0xFF) | (in[inOffset++] & 0xFF) << 8
              | (in[inOffset++] & 0xFF) << 16 | (in[inOffset++] & 0xFF) << 24;
     int x1 = (in[inOffset++] & 0xFF) | (in[inOffset++] & 0xFF) << 8
@@ -723,12 +670,9 @@
     x1 ^= sKey[INPUT_WHITEN + 1];
     x2 ^= sKey[INPUT_WHITEN + 2];
     x3 ^= sKey[INPUT_WHITEN + 3];
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("PTw=" + Util.toString(x0) + Util.toString(x1)
+    if (Configuration.DEBUG)
+      log.fine("PTw=" + Util.toString(x0) + Util.toString(x1)
                            + Util.toString(x2) + Util.toString(x3));
-      }
-
     int t0, t1;
     int k = ROUND_SUBKEYS;
     for (int R = 0; R < ROUNDS; R += 2)
@@ -739,36 +683,26 @@
         x2 = x2 >>> 1 | x2 << 31;
         x3 = x3 << 1 | x3 >>> 31;
         x3 ^= t0 + 2 * t1 + sKey[k++];
-        if (DEBUG && debuglevel > 6)
-          {
-            System.out.println("CT" + (R) + "=" + Util.toString(x0)
-                               + Util.toString(x1) + Util.toString(x2)
-                               + Util.toString(x3));
-          }
-
+        if (Configuration.DEBUG)
+          log.fine("CT" + (R) + "=" + Util.toString(x0) + Util.toString(x1)
+                   + Util.toString(x2) + Util.toString(x3));
         t0 = Fe32(sBox, x2, 0);
         t1 = Fe32(sBox, x3, 3);
         x0 ^= t0 + t1 + sKey[k++];
         x0 = x0 >>> 1 | x0 << 31;
         x1 = x1 << 1 | x1 >>> 31;
         x1 ^= t0 + 2 * t1 + sKey[k++];
-        if (DEBUG && debuglevel > 6)
-          {
-            System.out.println("CT" + (R + 1) + "=" + Util.toString(x0)
-                               + Util.toString(x1) + Util.toString(x2)
-                               + Util.toString(x3));
-          }
+        if (Configuration.DEBUG)
+          log.fine("CT" + (R + 1) + "=" + Util.toString(x0) + Util.toString(x1)
+                   + Util.toString(x2) + Util.toString(x3));
       }
     x2 ^= sKey[OUTPUT_WHITEN];
     x3 ^= sKey[OUTPUT_WHITEN + 1];
     x0 ^= sKey[OUTPUT_WHITEN + 2];
     x1 ^= sKey[OUTPUT_WHITEN + 3];
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("CTw=" + Util.toString(x0) + Util.toString(x1)
+    if (Configuration.DEBUG)
+      log.fine("CTw=" + Util.toString(x0) + Util.toString(x1)
                            + Util.toString(x2) + Util.toString(x3));
-      }
-
     out[outOffset++] = (byte) x2;
     out[outOffset++] = (byte) (x2 >>> 8);
     out[outOffset++] = (byte) (x2 >>> 16);
@@ -785,12 +719,8 @@
     out[outOffset++] = (byte) (x1 >>> 8);
     out[outOffset++] = (byte) (x1 >>> 16);
     out[outOffset] = (byte) (x1 >>> 24);
-
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("CT=" + Util.toString(out, outOffset - 15, 16));
-        System.out.println();
-      }
+    if (Configuration.DEBUG)
+      log.fine("CT=" + Util.toString(out, outOffset - 15, 16) + "\n");
   }
 
   public void decrypt(byte[] in, int inOffset, byte[] out, int outOffset,
@@ -804,12 +734,8 @@
     Object[] sk = (Object[]) sessionKey; // extract S-box and session key
     int[] sBox = (int[]) sk[0];
     int[] sKey = (int[]) sk[1];
-
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("CT=" + Util.toString(in, inOffset, bs));
-      }
-
+    if (Configuration.DEBUG)
+      log.fine("CT=" + Util.toString(in, inOffset, bs));
     int x2 = (in[inOffset++] & 0xFF) | (in[inOffset++] & 0xFF) << 8
              | (in[inOffset++] & 0xFF) << 16 | (in[inOffset++] & 0xFF) << 24;
     int x3 = (in[inOffset++] & 0xFF) | (in[inOffset++] & 0xFF) << 8
@@ -823,12 +749,9 @@
     x3 ^= sKey[OUTPUT_WHITEN + 1];
     x0 ^= sKey[OUTPUT_WHITEN + 2];
     x1 ^= sKey[OUTPUT_WHITEN + 3];
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("CTw=" + Util.toString(x2) + Util.toString(x3)
+    if (Configuration.DEBUG)
+      log.fine("CTw=" + Util.toString(x2) + Util.toString(x3)
                            + Util.toString(x0) + Util.toString(x1));
-      }
-
     int k = ROUND_SUBKEYS + 2 * ROUNDS - 1;
     int t0, t1;
     for (int R = 0; R < ROUNDS; R += 2)
@@ -839,36 +762,26 @@
         x1 = x1 >>> 1 | x1 << 31;
         x0 = x0 << 1 | x0 >>> 31;
         x0 ^= t0 + t1 + sKey[k--];
-        if (DEBUG && debuglevel > 6)
-          {
-            System.out.println("PT" + (ROUNDS - R) + "=" + Util.toString(x2)
-                               + Util.toString(x3) + Util.toString(x0)
-                               + Util.toString(x1));
-          }
-
+        if (Configuration.DEBUG)
+          log.fine("PT" + (ROUNDS - R) + "=" + Util.toString(x2)
+                   + Util.toString(x3) + Util.toString(x0) + Util.toString(x1));
         t0 = Fe32(sBox, x0, 0);
         t1 = Fe32(sBox, x1, 3);
         x3 ^= t0 + 2 * t1 + sKey[k--];
         x3 = x3 >>> 1 | x3 << 31;
         x2 = x2 << 1 | x2 >>> 31;
         x2 ^= t0 + t1 + sKey[k--];
-        if (DEBUG && debuglevel > 6)
-          {
-            System.out.println("PT" + (ROUNDS - R - 1) + "="
-                               + Util.toString(x2) + Util.toString(x3)
-                               + Util.toString(x0) + Util.toString(x1));
-          }
+        if (Configuration.DEBUG)
+          log.fine("PT" + (ROUNDS - R - 1) + "=" + Util.toString(x2)
+                   + Util.toString(x3) + Util.toString(x0) + Util.toString(x1));
       }
     x0 ^= sKey[INPUT_WHITEN];
     x1 ^= sKey[INPUT_WHITEN + 1];
     x2 ^= sKey[INPUT_WHITEN + 2];
     x3 ^= sKey[INPUT_WHITEN + 3];
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("PTw=" + Util.toString(x2) + Util.toString(x3)
+    if (Configuration.DEBUG)
+      log.fine("PTw=" + Util.toString(x2) + Util.toString(x3)
                            + Util.toString(x0) + Util.toString(x1));
-      }
-
     out[outOffset++] = (byte) x0;
     out[outOffset++] = (byte) (x0 >>> 8);
     out[outOffset++] = (byte) (x0 >>> 16);
@@ -885,12 +798,8 @@
     out[outOffset++] = (byte) (x3 >>> 8);
     out[outOffset++] = (byte) (x3 >>> 16);
     out[outOffset] = (byte) (x3 >>> 24);
-
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("PT=" + Util.toString(out, outOffset - 15, 16));
-        System.out.println();
-      }
+    if (Configuration.DEBUG)
+      log.fine("PT=" + Util.toString(out, outOffset - 15, 16) + "\n");
   }
 
   public boolean selfTest()

Index: javax/crypto/cipher/BaseCipher.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/BaseCipher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/cipher/BaseCipher.java	4 Jun 2006 06:57:25 -0000	1.2
+++ javax/crypto/cipher/BaseCipher.java	11 Jun 2006 12:14:43 -0000	1.3
@@ -38,10 +38,14 @@
 
 package gnu.javax.crypto.cipher;
 
+import gnu.classpath.Configuration;
+
 import java.security.InvalidKeyException;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * <p>A basic abstract class to facilitate implementing symmetric key block
@@ -49,10 +53,7 @@
  */
 public abstract class BaseCipher implements IBlockCipher, IBlockCipherSpi
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(BaseCipher.class.getName());
   /** The canonical name prefix of the cipher. */
   protected String name;
 
@@ -263,7 +264,8 @@
       }
     catch (Exception x)
       {
-        x.printStackTrace(System.err);
+        if (Configuration.DEBUG)
+          log.log(Level.FINE, "Exception in testSymmetry() for " + name(), x);
         return false;
       }
   }
@@ -295,7 +297,8 @@
       }
     catch (Exception x)
       {
-        x.printStackTrace(System.err);
+        if (Configuration.DEBUG)
+          log.log(Level.FINE, "Exception in testKat() for " + name(), x);
         return false;
       }
   }

Index: javax/crypto/cipher/Rijndael.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Rijndael.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/cipher/Rijndael.java	21 Apr 2006 10:52:26 -0000	1.2
+++ javax/crypto/cipher/Rijndael.java	11 Jun 2006 12:14:43 -0000	1.3
@@ -38,14 +38,15 @@
 
 package gnu.javax.crypto.cipher;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
-//import java.io.PrintWriter;
 import java.security.InvalidKeyException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.logging.Logger;
 
 /**
  * <p>Rijndael --pronounced Reindaal-- is the AES. It is a variable block-size
@@ -63,23 +64,7 @@
  */
 public final class Rijndael extends BaseCipher
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  //   private static final String NAME = "rijndael";
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 9;
-
-  //   private static final PrintWriter err = new PrintWriter(System.out, true);
-  //   private static void debug(String s) {
-  //      err.println(">>> "+NAME+": "+s);
-  //   }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(Rijndael.class.getName());
   private static final int DEFAULT_BLOCK_SIZE = 16; // in bytes
 
   private static final int DEFAULT_KEY_SIZE = 16; // in bytes
@@ -222,169 +207,134 @@
         }
 
       time = System.currentTimeMillis() - time;
-
-      if (DEBUG && debuglevel > 8)
+      if (Configuration.DEBUG)
         {
-          System.out.println("==========");
-          System.out.println();
-          System.out.println("Static Data");
-          System.out.println();
-          System.out.println("S[]:");
+          log.fine("Static Data");
+          log.fine("S[]:");
+          StringBuilder sb;
           for (i = 0; i < 16; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 16; j++)
-                {
-                  System.out.print("0x" + Util.toString(S[i * 16 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(S[i * 16 + j])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("Si[]:");
+          log.fine("Si[]:");
           for (i = 0; i < 16; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 16; j++)
-                {
-                  System.out.print("0x" + Util.toString(Si[i * 16 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(Si[i * 16 + j])).append(", ");
+              log.fine(sb.toString());
             }
 
-          System.out.println();
-          System.out.println("T1[]:");
+          log.fine("T1[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(T1[i * 4 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(T1[i * 4 + j])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T2[]:");
+          log.fine("T2[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(T2[i * 4 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(T2[i * 4 + j])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T3[]:");
+          log.fine("T3[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(T3[i * 4 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(T3[i * 4 + j])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T4[]:");
+          log.fine("T4[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(T4[i * 4 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(T4[i * 4 + j])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T5[]:");
+          log.fine("T5[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(T5[i * 4 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T6[]:");
+          log.fine("T6[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(T6[i * 4 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(T6[i * 4 + j])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T7[]:");
+          log.fine("T7[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(T7[i * 4 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(T7[i * 4 + j])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T8[]:");
+          log.fine("T8[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(T8[i * 4 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(T8[i * 4 + j])).append(", ");
+              log.fine(sb.toString());
             }
 
-          System.out.println();
-          System.out.println("U1[]:");
+          log.fine("U1[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(U1[i * 4 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(U1[i * 4 + j])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("U2[]:");
+          log.fine("U2[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(U2[i * 4 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(U2[i * 4 + j])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("U3[]:");
+          log.fine("U3[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.print("0x" + Util.toString(U3[i * 4 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(U3[i * 4 + j])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("U4[]:");
+          log.fine("U4[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                {
-                  System.out.println("0x" + Util.toString(U4[i * 4 + j]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(U4[i * 4 + j])).append(", ");
+              log.fine(sb.toString());
             }
 
-          System.out.println();
-          System.out.println("rcon[]:");
+          log.fine("rcon[]:");
           for (i = 0; i < 5; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 6; j++)
-                {
-                  System.out.print("0x" + Util.toString(rcon[i * 6 + j]) + ", ");
+                sb.append("0x").append(Util.toString(rcon[i * 6 + j])).append(", ");
+              log.fine(sb.toString());
                 }
-              System.out.println();
-            }
-
-          System.out.println();
-          System.out.println("Total initialization time: " + time + " ms.");
-          System.out.println();
+          log.fine("Total initialization time: " + time + " ms.");
         }
     }
 
@@ -454,11 +404,8 @@
           }
 
         System.arraycopy(a, 0, t, 0, BC);
-
-        if (DEBUG && debuglevel > 6)
-          {
-            System.out.println("CT" + r + "=" + Util.toString(t));
-          }
+        if (Configuration.DEBUG)
+          log.fine("CT" + r + "=" + Util.toString(t));
       }
 
     for (i = 0; i < BC; i++)
@@ -469,12 +416,8 @@
         out[outOffset++] = (byte) (S[(t[(i + s2) % BC] >>> 8) & 0xFF] ^ (tt >>> 8));
         out[outOffset++] = (byte) (S[t[(i + s3) % BC] & 0xFF] ^ tt);
       }
-
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("CT=" + Util.toString(out, outOffset - bs + 1, bs));
-        System.out.println();
-      }
+    if (Configuration.DEBUG)
+      log.fine("CT=" + Util.toString(out, outOffset - bs, bs));
   }
 
   private static void rijndaelDecrypt(byte[] in, int inOffset, byte[] out,
@@ -510,11 +453,8 @@
           }
 
         System.arraycopy(a, 0, t, 0, BC);
-
-        if (DEBUG && debuglevel > 6)
-          {
-            System.out.println("PT" + r + "=" + Util.toString(t));
-          }
+        if (Configuration.DEBUG)
+          log.fine("PT" + r + "=" + Util.toString(t));
       }
 
     for (i = 0; i < BC; i++)
@@ -525,12 +465,8 @@
         out[outOffset++] = (byte) (Si[(t[(i + s2) % BC] >>> 8) & 0xFF] ^ (tt >>> 8));
         out[outOffset++] = (byte) (Si[t[(i + s3) % BC] & 0xFF] ^ tt);
       }
-
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("PT=" + Util.toString(out, outOffset - bs + 1, bs));
-        System.out.println();
-      }
+    if (Configuration.DEBUG)
+      log.fine("PT=" + Util.toString(out, outOffset - bs, bs));
   }
 
   private static void aesEncrypt(byte[] in, int i, byte[] out, int j, Object key)
@@ -565,15 +501,10 @@
         t1 = a1;
         t2 = a2;
         t3 = a3;
-
-        if (DEBUG && debuglevel > 6)
-          {
-            System.out.println("CT" + r + "=" + Util.toString(t0)
-                               + Util.toString(t1) + Util.toString(t2)
-                               + Util.toString(t3));
+        if (Configuration.DEBUG)
+          log.fine("CT" + r + "=" + Util.toString(t0) + Util.toString(t1)
+                   + Util.toString(t2) + Util.toString(t3));
           }
-      }
-
     // last round is special
     Ker = Ke[ROUNDS];
     int tt = Ker[0];
@@ -596,12 +527,8 @@
     out[j++] = (byte) (S[(t0 >>> 16) & 0xFF] ^ (tt >>> 16));
     out[j++] = (byte) (S[(t1 >>> 8) & 0xFF] ^ (tt >>> 8));
     out[j++] = (byte) (S[t2 & 0xFF] ^ tt);
-
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("CT=" + Util.toString(out, j - 15, 16));
-        System.out.println();
-      }
+    if (Configuration.DEBUG)
+      log.fine("CT=" + Util.toString(out, j - 16, 16));
   }
 
   private static void aesDecrypt(byte[] in, int i, byte[] out, int j, Object key)
@@ -636,15 +563,10 @@
         t1 = a1;
         t2 = a2;
         t3 = a3;
-
-        if (DEBUG && debuglevel > 6)
-          {
-            System.out.println("PT" + r + "=" + Util.toString(t0)
-                               + Util.toString(t1) + Util.toString(t2)
-                               + Util.toString(t3));
-          }
+        if (Configuration.DEBUG)
+          log.fine("PT" + r + "=" + Util.toString(t0) + Util.toString(t1)
+                   + Util.toString(t2) + Util.toString(t3));
       }
-
     // last round is special
     Kdr = Kd[ROUNDS];
     int tt = Kdr[0];
@@ -667,12 +589,8 @@
     out[j++] = (byte) (Si[(t2 >>> 16) & 0xFF] ^ (tt >>> 16));
     out[j++] = (byte) (Si[(t1 >>> 8) & 0xFF] ^ (tt >>> 8));
     out[j++] = (byte) (Si[t0 & 0xFF] ^ tt);
-
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("PT=" + Util.toString(out, j - 15, 16));
-        System.out.println();
-      }
+    if (Configuration.DEBUG)
+      log.fine("PT=" + Util.toString(out, j - 16, 16));
   }
 
   // Instance methods

Index: javax/crypto/cipher/Anubis.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Anubis.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/cipher/Anubis.java	21 Apr 2006 10:52:26 -0000	1.2
+++ javax/crypto/cipher/Anubis.java	11 Jun 2006 12:14:43 -0000	1.3
@@ -38,14 +38,15 @@
 
 package gnu.javax.crypto.cipher;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
-//import java.io.PrintWriter;
 import java.security.InvalidKeyException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.logging.Logger;
 
 /**
  * <p>Anubis is a 128-bit block cipher that accepts a variable-length key. The
@@ -65,23 +66,7 @@
  */
 public final class Anubis extends BaseCipher
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  //   private static final String NAME = "anubis";
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 9;
-
-  //   private static final PrintWriter err = new PrintWriter(System.out, true);
-  //   private static void debug(String s) {
-  //      err.println(">>> "+NAME+": "+s);
-  //   }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(Anubis.class.getName());
   private static final int DEFAULT_BLOCK_SIZE = 16; // in bytes
 
   private static final int DEFAULT_KEY_SIZE = 16; // in bytes
@@ -189,84 +174,62 @@
 
       time = System.currentTimeMillis() - time;
 
-      if (DEBUG && debuglevel > 8)
+      if (Configuration.DEBUG)
         {
-          System.out.println("==========");
-          System.out.println();
-          System.out.println("Static data");
-          System.out.println();
-
-          System.out.println();
-          System.out.println("T0[]:");
+          log.fine("Static data");
+          log.fine("T0[]:");
+          StringBuilder sb;
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (t = 0; t < 4; t++)
-                {
-                  System.out.print("0x" + Util.toString(T0[i * 4 + t]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(T0[i * 4 + t])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T1[]:");
+          log.fine("T1[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (t = 0; t < 4; t++)
-                {
-                  System.out.print("0x" + Util.toString(T1[i * 4 + t]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(T1[i * 4 + t])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T2[]:");
+          log.fine("T2[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (t = 0; t < 4; t++)
-                {
-                  System.out.print("0x" + Util.toString(T2[i * 4 + t]) + ", ");
+                sb.append("0x").append(Util.toString(T2[i * 4 + t])).append(", ");
+              log.fine(sb.toString());
                 }
-              System.out.println();
-            }
-          System.out.println();
-          System.out.println("T3[]:");
+          log.fine("T3[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (t = 0; t < 4; t++)
-                {
-                  System.out.print("0x" + Util.toString(T3[i * 4 + t]) + ", ");
+                sb.append("0x").append(Util.toString(T3[i * 4 + t])).append(", ");
+              log.fine(sb.toString());
                 }
-              System.out.println();
-            }
-          System.out.println();
-          System.out.println("T4[]:");
+          log.fine("T4[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (t = 0; t < 4; t++)
-                {
-                  System.out.print("0x" + Util.toString(T4[i * 4 + t]) + ", ");
+                sb.append("0x").append(Util.toString(T4[i * 4 + t])).append(", ");
+              log.fine(sb.toString());
                 }
-              System.out.println();
-            }
-          System.out.println();
-          System.out.println("T5[]:");
+          log.fine("T5[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (t = 0; t < 4; t++)
-                {
-                  System.out.print("0x" + Util.toString(T5[i * 4 + t]) + ", ");
-                }
-              System.out.println();
+                sb.append("0x").append(Util.toString(T5[i * 4 + t])).append(", ");
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("rc[]:");
+          log.fine("rc[]:");
           for (i = 0; i < 18; i++)
-            {
-              System.out.println("0x" + Util.toString(rc[i]));
-            }
-          System.out.println();
-
-          System.out.println();
-          System.out.println("Total initialization time: " + time + " ms.");
-          System.out.println();
+            log.fine("0x" + Util.toString(rc[i]));
+          log.fine("Total initialization time: " + time + " ms.");
         }
     }
 
@@ -315,12 +278,9 @@
         a1 = b1;
         a2 = b2;
         a3 = b3;
-        if (DEBUG && debuglevel > 6)
-          {
-            System.out.println("T" + r + "=" + Util.toString(a0)
-                               + Util.toString(a1) + Util.toString(a2)
-                               + Util.toString(a3));
-          }
+        if (Configuration.DEBUG)
+          log.fine("T" + r + "=" + Util.toString(a0) + Util.toString(a1)
+                   + Util.toString(a2) + Util.toString(a3));
       }
 
     // last round function
@@ -346,11 +306,8 @@
     out[j++] = (byte) (S[a2 & 0xFF] ^ (tt >>> 8));
     out[j] = (byte) (S[a3 & 0xFF] ^ tt);
 
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("T=" + Util.toString(out, j - 15, 16));
-        System.out.println();
-      }
+    if (Configuration.DEBUG)
+      log.fine("T=" + Util.toString(out, j - 15, 16) + "\n");
   }
 
   // Instance methods
@@ -517,29 +474,26 @@
           }
       }
 
-    if (DEBUG && debuglevel > 8)
+    if (Configuration.DEBUG)
       {
-        System.out.println();
-        System.out.println("Key schedule");
-        System.out.println();
-        System.out.println("Ke[]:");
+        log.fine("Key schedule");
+        log.fine("Ke[]:");
+        StringBuilder sb;
         for (r = 0; r < R + 1; r++)
           {
-            System.out.print("#" + r + ": ");
+            sb = new StringBuilder("#").append(r).append(": ");
             for (j = 0; j < 4; j++)
-              System.out.print("0x" + Util.toString(Ke[r][j]) + ", ");
-            System.out.println();
+              sb.append("0x").append(Util.toString(Ke[r][j])).append(", ");
+            log.fine(sb.toString());
           }
-        System.out.println();
-        System.out.println("Kd[]:");
+        log.fine("Kd[]:");
         for (r = 0; r < R + 1; r++)
           {
-            System.out.print("#" + r + ": ");
+            sb = new StringBuilder("#").append(r).append(": ");
             for (j = 0; j < 4; j++)
-              System.out.print("0x" + Util.toString(Kd[r][j]) + ", ");
-            System.out.println();
+              sb.append("0x").append(Util.toString(Kd[r][j])).append(", ");
+            log.fine(sb.toString());
           }
-        System.out.println();
       }
 
     return new Object[] { Ke, Kd };

Index: javax/crypto/cipher/Khazad.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Khazad.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/cipher/Khazad.java	21 Apr 2006 10:52:26 -0000	1.2
+++ javax/crypto/cipher/Khazad.java	11 Jun 2006 12:14:43 -0000	1.3
@@ -38,14 +38,15 @@
 
 package gnu.javax.crypto.cipher;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
-//import java.io.PrintWriter;
 import java.security.InvalidKeyException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.logging.Logger;
 
 /**
  * <p>Khazad is a 64-bit (legacy-level) block cipher that accepts a 128-bit key.
@@ -65,23 +66,7 @@
  */
 public final class Khazad extends BaseCipher
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  //   private static final String NAME = "khazad";
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 9;
-
-  //   private static final PrintWriter err = new PrintWriter(System.out, true);
-  //   private static void debug(String s) {
-  //      err.println(">>> "+NAME+": "+s);
-  //   }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(Khazad.class.getName());
   private static final int DEFAULT_BLOCK_SIZE = 8; // in bytes
 
   private static final int DEFAULT_KEY_SIZE = 16; // in bytes
@@ -194,86 +179,78 @@
 
       time = System.currentTimeMillis() - time;
 
-      if (DEBUG && debuglevel > 8)
+      if (Configuration.DEBUG)
         {
-          System.out.println("==========");
-          System.out.println();
-          System.out.println("Static data");
-          System.out.println();
-
-          System.out.println();
-          System.out.println("T0[]:");
+          log.fine("Static data");
+          log.fine("T0[]:");
+          StringBuilder b;
           for (i = 0; i < 64; i++)
             {
+              b = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T0[i * 4 + j]) + ", ");
-              System.out.println();
+                b.append("0x").append(Util.toString(T0[i * 4 + j])).append(", ");
+              log.fine(b.toString());
             }
-          System.out.println();
-          System.out.println("T1[]:");
+          log.fine("T1[]:");
           for (i = 0; i < 64; i++)
             {
+              b = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T1[i * 4 + j]) + ", ");
-              System.out.println();
+                b.append("0x").append(Util.toString(T1[i * 4 + j])).append(", ");
+              log.fine(b.toString());
             }
-          System.out.println();
-          System.out.println("T2[]:");
+          log.fine("T2[]:");
           for (i = 0; i < 64; i++)
             {
+              b = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T2[i * 4 + j]) + ", ");
-              System.out.println();
+                b.append("0x").append(Util.toString(T2[i * 4 + j])).append(", ");
+              log.fine(b.toString());
             }
-          System.out.println();
-          System.out.println("T3[]:");
+          log.fine("T3[]:");
           for (i = 0; i < 64; i++)
             {
+              b = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T3[i * 4 + j]) + ", ");
-              System.out.println();
+                b.append("0x").append(Util.toString(T3[i * 4 + j])).append(", ");
+              log.fine(b.toString());
             }
-          System.out.println();
-          System.out.println("T4[]:");
+          log.fine("T4[]:");
           for (i = 0; i < 64; i++)
             {
+              b = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T4[i * 4 + j]) + ", ");
-              System.out.println();
+                b.append("0x").append(Util.toString(T4[i * 4 + j])).append(", ");
+              log.fine(b.toString());
             }
-          System.out.println();
-          System.out.println("T5[]:");
+          log.fine("T5[]:");
           for (i = 0; i < 64; i++)
             {
+              b = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T5[i * 4 + j]) + ", ");
-              System.out.println();
+                b.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");
+              log.fine(b.toString());
             }
-          System.out.println();
-          System.out.println("T6[]:");
+          log.fine("T6[]:");
           for (i = 0; i < 64; i++)
             {
+              b = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T6[i * 4 + j]) + ", ");
-              System.out.println();
+                b.append("0x").append(Util.toString(T6[i * 4 + j])).append(", ");
+              log.fine(b.toString());
             }
-          System.out.println();
-          System.out.println("T7[]:");
+          log.fine("T7[]:");
           for (i = 0; i < 64; i++)
             {
+              b = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T7[i * 4 + j]) + ", ");
-              System.out.println();
+                b.append("0x").append(Util.toString(T7[i * 4 + j])).append(", ");
+              log.fine(b.toString());
             }
-          System.out.println();
-          System.out.println("rc[]:");
+          log.fine("rc[]:");
           for (i = 0; i < R + 1; i++)
-            System.out.print("0x" + Util.toString(rc[i][0])
-                             + Util.toString(rc[i][1]));
-          System.out.println();
-
-          System.out.println("Total initialization time: " + time + " ms.");
-          System.out.println();
+            log.fine("0x" + Util.toString(rc[i][0]) + Util.toString(rc[i][1]));
+          log.fine("Total initialization time: " + time + " ms.");
         }
     }
 
@@ -313,12 +290,8 @@
              ^ T6[(a0 >>> 8) & 0xFF] ^ T7[a0 & 0xFF] ^ k1;
         a0 = b0;
         a1 = b1;
-
-        if (DEBUG && debuglevel > 6)
-          {
-            System.out.println("T" + r + "=" + Util.toString(a0)
-                               + Util.toString(a1));
-          }
+        if (Configuration.DEBUG)
+          log.fine("T" + r + "=" + Util.toString(a0) + Util.toString(a1));
       }
 
     // sigma(K[R]) o gamma applied to previous output
@@ -333,12 +306,8 @@
     out[j++] = (byte) (S[(a1 >>> 16) & 0xFF] ^ (k1 >>> 16));
     out[j++] = (byte) (S[(a1 >>> 8) & 0xFF] ^ (k1 >>> 8));
     out[j] = (byte) (S[a1 & 0xFF] ^ k1);
-
-    if (DEBUG && debuglevel > 6)
-      {
-        System.out.println("T=" + Util.toString(out, j - 7, 8));
-        System.out.println();
-      }
+    if (Configuration.DEBUG)
+      log.fine("T=" + Util.toString(out, j - 7, 8) + "\n");
   }
 
   // Instance methods
@@ -458,26 +427,17 @@
                            ^ T7[S[kr0 & 0xFF] & 0xFF];
           }
       }
-
-    if (DEBUG && debuglevel > 8)
+    if (Configuration.DEBUG)
       {
-        System.out.println();
-        System.out.println("Key schedule");
-        System.out.println();
-        System.out.println("Ke[]:");
+        log.fine("Key schedule");
+        log.fine("Ke[]:");
         for (r = 0; r < R + 1; r++)
-          {
-            System.out.println("#" + r + ": 0x" + Util.toString(Ke[r][0])
-                               + Util.toString(Ke[r][1]));
-          }
-        System.out.println();
-        System.out.println("Kd[]:");
+          log.fine("#" + r + ": 0x"
+                   + Util.toString(Ke[r][0]) + Util.toString(Ke[r][1]));
+        log.fine("Kd[]:");
         for (r = 0; r < R + 1; r++)
-          {
-            System.out.println("#" + r + ": 0x" + Util.toString(Kd[r][0])
-                               + Util.toString(Kd[r][1]));
-          }
-        System.out.println();
+          log.fine("#" + r + ": 0x"
+                   + Util.toString(Kd[r][0]) + Util.toString(Kd[r][1]));
       }
 
     return new Object[] { Ke, Kd };

Index: javax/crypto/jce/keyring/GnuKeyring.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- javax/crypto/jce/keyring/GnuKeyring.java	20 May 2006 03:04:20 -0000	1.3
+++ javax/crypto/jce/keyring/GnuKeyring.java	11 Jun 2006 12:14:43 -0000	1.4
@@ -38,6 +38,7 @@
 
 package gnu.javax.crypto.jce.keyring;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.javax.crypto.keyring.GnuPrivateKeyring;
 import gnu.javax.crypto.keyring.GnuPublicKeyring;
@@ -90,6 +91,7 @@
 
   public Enumeration engineAliases()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineAliases");
     ensureLoaded();
     Enumeration result;
@@ -106,7 +108,8 @@
                 alias = alias.trim();
                 if (alias.length() > 0)
                   {
-                    log.finest("Adding alias (from private keyring): " + alias);
+                    if (Configuration.DEBUG)
+                      log.fine("Adding alias (from private keyring): " + alias);
                     aliases.add(alias);
                   }
               }
@@ -119,29 +122,34 @@
                 alias = alias.trim();
                 if (alias.length() > 0)
                   {
-                    log.finest("Adding alias (from public keyring): " + alias);
+                    if (Configuration.DEBUG)
+                      log.fine("Adding alias (from public keyring): " + alias);
                     aliases.add(alias);
                   }
               }
           }
-        log.finest("Will enumerate: " + aliases);
+        if (Configuration.DEBUG)
+          log.fine("Will enumerate: " + aliases);
         result = Collections.enumeration(aliases);
       }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineAliases");
     return result;
   }
 
   public boolean engineContainsAlias(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineContainsAlias", alias);
-
     ensureLoaded();
     boolean inPrivateKR = privateKR.containsAlias(alias);
-    log.finest("inPrivateKR=" + inPrivateKR);
+    if (Configuration.DEBUG)
+      log.fine("inPrivateKR=" + inPrivateKR);
     boolean inPublicKR = publicKR.containsAlias(alias);
-    log.finest("inPublicKR=" + inPublicKR);
+    if (Configuration.DEBUG)
+      log.fine("inPublicKR=" + inPublicKR);
     boolean result = inPrivateKR || inPublicKR;
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineContainsAlias",
                 Boolean.valueOf(result));
     return result;
@@ -149,34 +157,34 @@
 
   public void engineDeleteEntry(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineDeleteEntry", alias);
-
     ensureLoaded();
     if (privateKR.containsAlias(alias))
       privateKR.remove(alias);
     else if (publicKR.containsAlias(alias))
       publicKR.remove(alias);
-    else
-      log.finer("Unknwon alias: " + alias);
-
+    else if (Configuration.DEBUG)
+      log.fine("Unknwon alias: " + alias);
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineDeleteEntry");
   }
 
   public Certificate engineGetCertificate(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineGetCertificate", alias);
-
     ensureLoaded();
     Certificate result = publicKR.getCertificate(alias);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineGetCertificate", result);
     return result;
   }
 
   public String engineGetCertificateAlias(Certificate cert)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineGetCertificateAlias", cert);
-
     ensureLoaded();
     String result = null;
     for (Enumeration aliases = publicKR.aliases(); aliases.hasMoreElements();)
@@ -189,7 +197,7 @@
             break;
           }
       }
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineGetCertificateAlias", result);
     return result;
   }
@@ -197,6 +205,7 @@
   public void engineSetCertificateEntry(String alias, Certificate cert)
       throws KeyStoreException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineSetCertificateEntry",
                  new Object[] { alias, cert });
     ensureLoaded();
@@ -206,35 +215,37 @@
                                   + "Trusted Certificate Entry");
     if (publicKR.containsCertificate(alias))
       {
+        if (Configuration.DEBUG)
         log.fine("Public keyring already contains Alias [" + alias
                  + "]. Will remove it");
         publicKR.remove(alias);
       }
-
     publicKR.putCertificate(alias, cert);
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineSetCertificateEntry");
   }
 
   public Certificate[] engineGetCertificateChain(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineGetCertificateChain", alias);
-
     ensureLoaded();
     Certificate[] result = privateKR.getCertPath(alias);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineGetCertificateChain", result);
     return result;
   }
 
   public Date engineGetCreationDate(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineGetCreationDate", alias);
-
     ensureLoaded();
     Date result = getCreationDate(alias, privateKR);
     if (result == null)
       result = getCreationDate(alias, publicKR);
 
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineGetCreationDate", result);
     return result;
   }
@@ -242,6 +253,7 @@
   public Key engineGetKey(String alias, char[] password)
       throws UnrecoverableKeyException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineGetKey", alias);
     ensureLoaded();
     Key result = null;
@@ -253,6 +265,7 @@
     else if (privateKR.containsPrivateKey(alias))
       result = privateKR.getPrivateKey(alias, password); 
 
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineGetKey",
                 result == null ? "null" : result.getClass().getName());
     return result;
@@ -262,6 +275,7 @@
                                 Certificate[] chain)
       throws KeyStoreException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineSetKeyEntry",
                  new Object[] { alias, key.getClass().getName(), chain });
     ensureLoaded();
@@ -282,9 +296,11 @@
                                       + key.getClass().getName());
         privateKR.remove(alias);
         privateKR.putCertPath(alias, chain);
-        log.finest("About to put private key in keyring...");
+        if (Configuration.DEBUG)
+          log.fine("About to put private key in keyring...");
         privateKR.putPrivateKey(alias, key, password);
       }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineSetKeyEntry");
   }
 
@@ -292,17 +308,18 @@
       throws KeyStoreException
   {
     KeyStoreException x = new KeyStoreException("method not supported");
+    if (Configuration.DEBUG)
     log.throwing(this.getClass().getName(), "engineSetKeyEntry(3)", x);
     throw x;
   }
 
   public boolean engineIsCertificateEntry(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineIsCertificateEntry", alias);
-
     ensureLoaded();
     boolean result = publicKR.containsCertificate(alias);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineIsCertificateEntry",
                 Boolean.valueOf(result));
     return result;
@@ -310,12 +327,12 @@
 
   public boolean engineIsKeyEntry(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineIsKeyEntry", alias);
-
     ensureLoaded();
     boolean result = privateKR.containsPublicKey(alias)
                   || privateKR.containsPrivateKey(alias);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineIsKeyEntry",
                 Boolean.valueOf(result));
     return result;
@@ -323,6 +340,7 @@
 
   public void engineLoad(InputStream in, char[] password) throws IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineLoad");
     if (in != null)
       {
@@ -336,11 +354,13 @@
       createNewKeyrings();
 
     loaded = true;
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineLoad");
   }
 
   public void engineStore(OutputStream out, char[] password) throws IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineStore");
     ensureLoaded();
     HashMap attr = new HashMap();
@@ -349,16 +369,19 @@
 
     privateKR.store(attr);
     publicKR.store(attr);
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineStore");
   }
 
   public int engineSize()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineSize");
     int result = 0;
     for (Enumeration e = engineAliases(); e.hasMoreElements(); result++)
       e.nextElement();
 
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineSize", Integer.valueOf(result));
     return result;
   }
@@ -386,8 +409,8 @@
   private void loadPrivateKeyring(InputStream in, char[] password)
       throws MalformedKeyringException, IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "loadPrivateKeyring");
-
     in.mark(5);
     for (int i = 0; i < 4; i++)
       if (in.read() != Registry.GKR_MAGIC[i])
@@ -403,7 +426,7 @@
     attr.put(IKeyring.KEYRING_PASSWORD, password);
     privateKR = new GnuPrivateKeyring();
     privateKR.load(attr);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "loadPrivateKeyring");
   }
 
@@ -418,8 +441,8 @@
   private void loadPublicKeyring(InputStream in, char[] password)
       throws MalformedKeyringException, IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "loadPublicKeyring");
-
     in.mark(5);
     for (int i = 0; i < 4; i++)
       if (in.read() != Registry.GKR_MAGIC[i])
@@ -435,7 +458,7 @@
     attr.put(IKeyring.KEYRING_PASSWORD, password);
     publicKR = new GnuPublicKeyring();
     publicKR.load(attr);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "loadPublicKeyring");
   }
 
@@ -450,9 +473,9 @@
    */
   private Date getCreationDate(String alias, IKeyring keyring)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getCreationDate",
                  new Object[] { alias, keyring });
-
     Date result = null;
     if (keyring != null)
       for (Iterator it = keyring.get(alias).iterator(); it.hasNext();)
@@ -464,7 +487,7 @@
               break;
             }
         }
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getCreationDate", result);
     return result;
   }
@@ -472,11 +495,11 @@
   /** Create empty keyrings. */
   private void createNewKeyrings()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "createNewKeyrings");
-
     privateKR = new GnuPrivateKeyring("HMAC-SHA-1", 20, "AES", "OFB", 16);
     publicKR = new GnuPublicKeyring("HMAC-SHA-1", 20);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "createNewKeyrings");
   }
 }

Index: javax/crypto/keyring/GnuPublicKeyring.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/GnuPublicKeyring.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- javax/crypto/keyring/GnuPublicKeyring.java	20 May 2006 02:38:20 -0000	1.3
+++ javax/crypto/keyring/GnuPublicKeyring.java	11 Jun 2006 12:14:43 -0000	1.4
@@ -38,6 +38,7 @@
 
 package gnu.javax.crypto.keyring;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 
 import java.io.DataInputStream;
@@ -77,6 +78,7 @@
 
   public boolean containsCertificate(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "containsCertificate", alias);
     boolean result = false;
     if (containsAlias(alias))
@@ -86,6 +88,7 @@
             result = true;
             break;
           }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "containsCertificate",
                 Boolean.valueOf(result));
     return result;
@@ -93,6 +96,7 @@
 
   public Certificate getCertificate(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getCertificate", alias);
     Certificate result = null;
     if (containsAlias(alias))
@@ -105,12 +109,14 @@
               break;
             }
         }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getCertificate", result);
     return result;
   }
 
   public void putCertificate(String alias, Certificate cert)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "putCertificate",
                  new Object[] { alias, cert });
     if (! containsCertificate(alias))
@@ -119,14 +125,16 @@
         p.put("alias", fixAlias(alias));
         add(new CertificateEntry(cert, new Date(), p));
       }
-    else
-      log.finer("Keyring already contains alias: " + alias);
+    else if (Configuration.DEBUG)
+      log.fine("Keyring already contains alias: " + alias);
 
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "putCertificate");
   }
 
   protected void load(InputStream in, char[] password) throws IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "load");
     if (in.read() != USAGE)
       throw new MalformedKeyringException("incompatible keyring usage");
@@ -136,14 +144,17 @@
 
     DataInputStream dis = new DataInputStream(in);
     keyring = PasswordAuthenticatedEntry.decode(dis, password);
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "load");
   }
 
   protected void store(OutputStream out, char[] password) throws IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "store");
     out.write(USAGE);
     keyring.encode(new DataOutputStream(out), password);
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "store");
   }
 }

Index: javax/crypto/keyring/GnuPrivateKeyring.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/GnuPrivateKeyring.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- javax/crypto/keyring/GnuPrivateKeyring.java	20 May 2006 02:38:20 -0000	1.3
+++ javax/crypto/keyring/GnuPrivateKeyring.java	11 Jun 2006 12:14:43 -0000	1.4
@@ -38,6 +38,7 @@
 
 package gnu.javax.crypto.keyring;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 
 import java.io.DataInputStream;
@@ -105,6 +106,7 @@
 
   public boolean containsPrivateKey(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "containsPrivateKey", alias);
     boolean result = false;
     if (containsAlias(alias))
@@ -114,6 +116,7 @@
             result = true;
             break;
           }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "containsPrivateKey",
                 Boolean.valueOf(result));
     return result;
@@ -122,6 +125,7 @@
   public Key getPrivateKey(String alias, char[] password)
       throws UnrecoverableKeyException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getPrivateKey", alias);
     Key result = null;
     if (containsAlias(alias))
@@ -130,6 +134,7 @@
         for (Iterator it = get(alias).iterator(); it.hasNext();)
           {
             Entry e = (Entry) it.next();
+            if (Configuration.DEBUG)
             log.finest("Entry: " + e);
             if (e instanceof PasswordAuthenticatedEntry)
               {
@@ -137,8 +142,8 @@
                 break;
               }
           }
-
-        log.finest("e1 = " + e1);
+        if (Configuration.DEBUG)
+          log.fine("e1 = " + e1);
         if (e1 != null)
           {
             try
@@ -147,6 +152,7 @@
               }
             catch (Exception e)
               {
+                if (Configuration.DEBUG)
                 log.throwing(this.getClass().getName(), "getPrivateKey", e);
                 throw new UnrecoverableKeyException("authentication failed");
               }
@@ -186,6 +192,7 @@
               }
           }
       }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getPrivateKey",
                 result == null ? "null" : result.getClass().getName());
     return result;
@@ -193,6 +200,7 @@
 
   public void putPrivateKey(String alias, Key key, char[] password)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "putPrivateKey",
                  new Object[] { alias, key.getClass().getName() });
     if (! containsPrivateKey(alias))
@@ -201,8 +209,8 @@
         Properties p = new Properties();
         p.put("alias", alias);
         PrivateKeyEntry pke = new PrivateKeyEntry(key, new Date(), p);
-
-        log.finest("About to encrypt the key...");
+        if (Configuration.DEBUG)
+          log.fine("About to encrypt the key...");
         PasswordEncryptedEntry enc;
         enc = new PasswordEncryptedEntry(cipher, mode, keylen, new Properties());
         enc.add(pke);
@@ -212,12 +220,13 @@
           }
         catch (IOException x)
           {
-            log.log(Level.FINER, "Exception while encrypting the key. "
+            if (Configuration.DEBUG)
+              log.log(Level.FINE, "Exception while encrypting the key. "
                                  + "Rethrow as IllegalArgumentException", x);
             throw new IllegalArgumentException(x.toString());
           }
-
-        log.finest("About to authenticate the encrypted key...");
+        if (Configuration.DEBUG)
+          log.fine("About to authenticate the encrypted key...");
         PasswordAuthenticatedEntry auth;
         auth = new PasswordAuthenticatedEntry(mac, maclen, new Properties());
         auth.add(enc);
@@ -227,21 +236,24 @@
           }
         catch (IOException x)
           {
-            log.log(Level.FINER, "Exception while authenticating the encrypted "
+            if (Configuration.DEBUG)
+              log.log(Level.FINE, "Exception while authenticating the encrypted "
                                  + "key. Rethrow as IllegalArgumentException", x);
             throw new IllegalArgumentException(x.toString());
           }
 
         keyring.add(auth);
       }
-    else
-      log.finer("Keyring already contains alias: " + alias);
+    else if (Configuration.DEBUG)
+      log.fine("Keyring already contains alias: " + alias);
 
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "putPrivateKey");
   }
 
   public boolean containsPublicKey(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "containsPublicKey", alias);
     boolean result = false;
     if (containsAlias(alias))
@@ -251,6 +263,7 @@
             result = true;
             break;
           }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "containsPublicKey",
                 Boolean.valueOf(result));
     return result;
@@ -258,6 +271,7 @@
 
   public PublicKey getPublicKey(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getPublicKey", alias);
     PublicKey result = null;
     if (containsAlias(alias))
@@ -270,6 +284,7 @@
               break;
             }
         }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getPublicKey",
                 result == null ? "null" : result.getClass().getName());
     return result;
@@ -277,6 +292,7 @@
 
   public void putPublicKey(String alias, PublicKey key)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "putPublicKey",
                  new Object[] { alias, key.getClass().getName() });
     if (! containsPublicKey(alias))
@@ -285,14 +301,16 @@
         p.put("alias", fixAlias(alias));
         add(new PublicKeyEntry(key, new Date(), p));
       }
-    else
-      log.finer("Keyring already contains alias: " + alias);
+    else if (Configuration.DEBUG)
+      log.fine("Keyring already contains alias: " + alias);
 
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "putPublicKey");
   }
 
   public boolean containsCertPath(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "containsCertPath", alias);
     boolean result = false;
     if (containsAlias(alias))
@@ -302,6 +320,7 @@
             result = true;
             break;
           }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "containsCertPath",
                 Boolean.valueOf(result));
     return result;
@@ -309,6 +328,7 @@
 
   public Certificate[] getCertPath(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getCertPath", alias);
     Certificate[] result = null;
     if (containsAlias(alias))
@@ -321,12 +341,14 @@
               break;
             }
         }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getCertPath", result);
     return result;
   }
 
   public void putCertPath(String alias, Certificate[] path)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "putCertPath",
                  new Object[] { alias, path });
     if (! containsCertPath(alias))
@@ -335,14 +357,16 @@
         p.put("alias", fixAlias(alias));
         add(new CertPathEntry(path, new Date(), p));
       }
-    else
-      log.finer("Keyring already contains alias: " + alias);
+    else if (Configuration.DEBUG)
+      log.fine("Keyring already contains alias: " + alias);
 
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "putCertPath");
   }
 
   protected void load(InputStream in, char[] password) throws IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "load");
     if (in.read() != USAGE)
       throw new MalformedKeyringException("incompatible keyring usage");
@@ -352,14 +376,17 @@
 
     keyring = PasswordAuthenticatedEntry.decode(new DataInputStream(in),
                                                 password);
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "load");
   }
 
   protected void store(OutputStream out, char[] password) throws IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "store");
     out.write(USAGE);
     keyring.encode(new DataOutputStream(out), password);
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "store");
   }
 }

Index: javax/crypto/keyring/Entry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/Entry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/keyring/Entry.java	20 May 2006 02:38:20 -0000	1.2
+++ javax/crypto/keyring/Entry.java	11 Jun 2006 12:14:43 -0000	1.3
@@ -38,6 +38,8 @@
 
 package gnu.javax.crypto.keyring;
 
+import gnu.classpath.Configuration;
+
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -179,7 +181,8 @@
       {
         throw new IOException("corrupt length");
       }
-    log.finest("About to instantiate new payload byte array for " + this);
+    if (Configuration.DEBUG)
+      log.fine("About to instantiate new payload byte array for " + this);
     payload = new byte[len];
     in.readFully(payload);
   }

Index: javax/crypto/keyring/PasswordEncryptedEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- javax/crypto/keyring/PasswordEncryptedEntry.java	20 May 2006 02:38:20 -0000	1.3
+++ javax/crypto/keyring/PasswordEncryptedEntry.java	11 Jun 2006 12:14:43 -0000	1.4
@@ -38,6 +38,7 @@
 
 package gnu.javax.crypto.keyring;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.prng.IRandom;
 import gnu.java.security.prng.LimitReachedException;
@@ -132,6 +133,7 @@
   public void decrypt(char[] password) throws IllegalArgumentException,
       WrongPaddingException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "decrypt");
     if (isMasked() && payload != null)
       {
@@ -162,15 +164,18 @@
             throw new IllegalArgumentException("decryption failed");
           }
         tt += System.currentTimeMillis();
-        log.finer("Decrypted in " + tt + "ms.");
+        log.fine("Decrypted in " + tt + "ms.");
       }
-    else
-      log.finer("Skip decryption; " + (isMasked() ? "null payload" : "unmasked"));
+    else if (Configuration.DEBUG)
+      log.fine("Skip decryption; " + (isMasked() ? "null payload" : "unmasked"));
+
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "decrypt");
   }
 
   public void encrypt(char[] password) throws IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "encrypt", String.valueOf(password));
     long tt = - System.currentTimeMillis();
     long t1 = - System.currentTimeMillis();
@@ -178,7 +183,8 @@
     byte[] salt = new byte[8];
     PRNG.getInstance().nextBytes(salt);
     t1 += System.currentTimeMillis();
-    log.finer("-- Generated salt in " + t1 + "ms.");
+    if (Configuration.DEBUG)
+      log.fine("-- Generated salt in " + t1 + "ms.");
     properties.put("salt", Util.toString(salt));
     IMode mode = getMode(password, IMode.ENCRYPTION);
     IPad pad = PadFactory.getInstance("PKCS7");
@@ -188,11 +194,13 @@
     for (Iterator it = entries.iterator(); it.hasNext();)
       {
         Entry entry = (Entry) it.next();
-        log.finer("-- About to encode one " + entry);
+        if (Configuration.DEBUG)
+          log.fine("-- About to encode one " + entry);
         t1 = - System.currentTimeMillis();
         entry.encode(out2);
         t1 += System.currentTimeMillis();
-        log.finer("-- Encoded an Entry in " + t1 + "ms.");
+        if (Configuration.DEBUG)
+          log.fine("-- Encoded an Entry in " + t1 + "ms.");
       }
     byte[] plaintext = bout.toByteArray();
     byte[] padding = pad.pad(plaintext, 0, plaintext.length);
@@ -212,9 +220,12 @@
     setMasked(true);
 
     tt += System.currentTimeMillis();
-    log.finer("Encrypted in " + tt + "ms.");
+    if (Configuration.DEBUG)
+      {
+        log.fine("Encrypted in " + tt + "ms.");
     log.exiting(this.getClass().getName(), "encrypt");
   }
+  }
 
   public void encode(DataOutputStream out, char[] password) throws IOException
   {
@@ -226,6 +237,7 @@
   {
     if (payload == null)
       {
+        if (Configuration.DEBUG)
         log.fine("Null payload: " + this);
         throw new IllegalStateException("not encrypted");
       }

Index: javax/crypto/keyring/PasswordAuthenticatedEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- javax/crypto/keyring/PasswordAuthenticatedEntry.java	20 May 2006 02:38:19 -0000	1.3
+++ javax/crypto/keyring/PasswordAuthenticatedEntry.java	11 Jun 2006 12:14:43 -0000	1.4
@@ -38,6 +38,7 @@
 
 package gnu.javax.crypto.keyring;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.prng.IRandom;
 import gnu.java.security.prng.LimitReachedException;
@@ -146,10 +147,12 @@
 
   public void verify(char[] password)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "verify");
     if (isMasked() && payload != null)
       {
-        log.finest("payload to verify: " + Util.dumpString(payload));
+        if (Configuration.DEBUG)
+          log.fine("payload to verify: " + Util.dumpString(payload));
         long tt = - System.currentTimeMillis();
         IMac m = null;
         try
@@ -184,15 +187,19 @@
           }
 
         tt += System.currentTimeMillis();
-        log.finer("Verified in " + tt + "ms.");
+        if (Configuration.DEBUG)
+          log.fine("Verified in " + tt + "ms.");
       }
-    else
-      log.finer("Skip verification; " + (isMasked() ? "null payload" : "unmasked"));
+    else if (Configuration.DEBUG)
+      log.fine("Skip verification; " + (isMasked() ? "null payload" : "unmasked"));
+
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "verify");
   }
 
   public void authenticate(char[] password) throws IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "authenticate");
     long tt = - System.currentTimeMillis();
     long t1 = - System.currentTimeMillis();
@@ -203,7 +210,8 @@
     byte[] salt = new byte[8];
     PRNG.getInstance().nextBytes(salt);
     t1 += System.currentTimeMillis();
-    log.finer("-- Generated salt in " + t1 + "ms.");
+    if (Configuration.DEBUG)
+      log.fine("-- Generated salt in " + t1 + "ms.");
     properties.put("salt", Util.toString(salt));
     IMac m = getMac(password);
     ByteArrayOutputStream bout = new ByteArrayOutputStream(1024);
@@ -212,22 +220,28 @@
     for (Iterator it = entries.iterator(); it.hasNext();)
       {
         Entry entry = (Entry) it.next();
-        log.finer("-- About to authenticate one " + entry);
+        if (Configuration.DEBUG)
+          log.fine("-- About to authenticate one " + entry);
         t1 = - System.currentTimeMillis();
         entry.encode(out2);
         t1 += System.currentTimeMillis();
-        log.finer("-- Authenticated an Entry in " + t1 + "ms.");
+        if (Configuration.DEBUG)
+          log.fine("-- Authenticated an Entry in " + t1 + "ms.");
       }
     bout.write(m.digest());
 
     payload = bout.toByteArray();
-    log.finest("authenticated payload: " + Util.dumpString(payload));
+    if (Configuration.DEBUG)
+      log.fine("authenticated payload: " + Util.dumpString(payload));
     setMasked(true);
 
     tt += System.currentTimeMillis();
-    log.finer("Authenticated in " + tt + "ms.");
+    if (Configuration.DEBUG)
+      {
+        log.fine("Authenticated in " + tt + "ms.");
     log.exiting(this.getClass().getName(), "authenticate");
   }
+  }
 
   public void encode(DataOutputStream out, char[] password) throws IOException
   {
@@ -249,6 +263,7 @@
 
   private IMac getMac(char[] password) throws MalformedKeyringException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getMac");
     String saltString = properties.get("salt");
     if (saltString == null)
@@ -303,6 +318,7 @@
       {
         throw new Error(shouldNotHappen.toString());
       }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getMac");
     return mac;
   }

Index: javax/crypto/keyring/EnvelopeEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/keyring/EnvelopeEntry.java	20 May 2006 02:38:20 -0000	1.2
+++ javax/crypto/keyring/EnvelopeEntry.java	11 Jun 2006 12:14:43 -0000	1.3
@@ -38,6 +38,8 @@
 
 package gnu.javax.crypto.keyring;
 
+import gnu.classpath.Configuration;
+
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -94,6 +96,7 @@
    */
   public void add(Entry entry)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "add", entry);
     if (! containsEntry(entry))
       {
@@ -101,9 +104,11 @@
           ((EnvelopeEntry) entry).setContainingEnvelope(this);
 
         entries.add(entry);
-        log.finest("Payload is " + (payload == null ? "" : "not ") + "null");
+        if (Configuration.DEBUG)
+          log.fine("Payload is " + (payload == null ? "" : "not ") + "null");
         makeAliasList();
       }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "add");
   }
 
@@ -117,9 +122,11 @@
    */
   public boolean containsAlias(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "containsAlias", alias);
     String aliases = getAliasList();
-    log.finest("aliases = [" + aliases + "]");
+    if (Configuration.DEBUG)
+      log.fine("aliases = [" + aliases + "]");
     boolean result = false;
     if (aliases != null)
       {
@@ -131,7 +138,9 @@
               break;
             }
       }
-    log.exiting(this.getClass().getName(), "containsAlias", Boolean.valueOf(result));
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "containsAlias",
+                  Boolean.valueOf(result));
     return result;
   }
 
@@ -182,8 +191,8 @@
    */
   public List get(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "get", alias);
-
     List result = new LinkedList();
     for (Iterator it = entries.iterator(); it.hasNext();)
       {
@@ -199,13 +208,14 @@
                 MaskableEnvelopeEntry mee = (MaskableEnvelopeEntry) ee;
                 if (mee.isMasked())
                   {
-                    log.finer("Processing masked entry: " + mee);
+                    if (Configuration.DEBUG)
+                      log.fine("Processing masked entry: " + mee);
                     result.add(mee);
                     continue;
                   }
               }
-
-            log.finer("Processing unmasked entry: " + ee);
+            if (Configuration.DEBUG)
+              log.fine("Processing unmasked entry: " + ee);
             result.addAll(ee.get(alias));
           }
         else if (e instanceof PrimitiveEntry)
@@ -215,7 +225,7 @@
               result.add(e);
           }
       }
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "get", result);
     return result;
   }
@@ -247,6 +257,7 @@
    */
   public boolean remove(Entry entry)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "remove", entry);
     boolean ret = false;
     for (Iterator it = entries.iterator(); it.hasNext();)
@@ -278,11 +289,14 @@
       }
     if (ret)
       {
-        log.finest("State before: " + this);
+        if (Configuration.DEBUG)
+          log.fine("State before: " + this);
         payload = null;
         makeAliasList();
-        log.finest("State after: " + this);
+        if (Configuration.DEBUG)
+          log.fine("State after: " + this);
       }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "remove", Boolean.valueOf(ret));
     return ret;
   }
@@ -298,6 +312,7 @@
    */
   public boolean remove(String alias)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "remove", alias);
     boolean result = false;
     for (Iterator it = entries.iterator(); it.hasNext();)
@@ -320,11 +335,14 @@
       }
     if (result)
       {
-        log.finest("State before: " + this);
+        if (Configuration.DEBUG)
+          log.fine("State before: " + this);
         payload = null;
         makeAliasList();
-        log.finest("State after: " + this);
+        if (Configuration.DEBUG)
+          log.fine("State after: " + this);
       }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "remove", Boolean.valueOf(result));
     return result;
   }
@@ -410,6 +428,7 @@
 
   private void makeAliasList()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "makeAliasList");
     if (! entries.isEmpty())
       {
@@ -423,7 +442,7 @@
               aliasOrList = ((EnvelopeEntry) entry).getAliasList();
             else if (entry instanceof PrimitiveEntry)
               aliasOrList = ((PrimitiveEntry) entry).getAlias();
-            else
+            else if (Configuration.DEBUG)
               log.fine("Entry with no Alias. Ignored: " + entry);
 
             if (aliasOrList != null)
@@ -439,10 +458,12 @@
           }
         String aliasList = buf.toString();
         properties.put("alias-list", aliasList);
-        log.finer("alias-list=[" + aliasList + "]");
+        if (Configuration.DEBUG)
+          log.fine("alias-list=[" + aliasList + "]");
         if (containingEnvelope != null)
           containingEnvelope.makeAliasList();
       }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "makeAliasList");
   }
 }

Index: java/security/key/rsa/GnuRSAPrivateKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- java/security/key/rsa/GnuRSAPrivateKey.java	29 Apr 2006 06:53:06 -0000	1.5
+++ java/security/key/rsa/GnuRSAPrivateKey.java	11 Jun 2006 12:14:43 -0000	1.6
@@ -38,6 +38,7 @@
 
 package gnu.java.security.key.rsa;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.SystemProperties;
 import gnu.java.security.Registry;
 import gnu.java.security.key.IKeyPairCodec;
@@ -61,11 +62,6 @@
 public class GnuRSAPrivateKey extends GnuRSAKey implements PrivateKey,
     RSAPrivateCrtKey
 {
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  private static final boolean DEBUG = false;
-
   /** The first prime divisor of the modulus. */
   private final BigInteger p;
 
@@ -307,12 +303,18 @@
         String ls = SystemProperties.getProperty("line.separator");
         str = new StringBuilder(this.getClass().getName()).append("(")
             .append(super.toString()).append(",").append(ls)
-            .append("d=0x").append(DEBUG ? d.toString(16) : "**...*").append(ls)
-            .append("p=0x").append(DEBUG ? p.toString(16) : "**...*").append(ls)
-            .append("q=0x").append(DEBUG ? q.toString(16) : "**...*").append(ls)
-            .append("dP=0x").append(DEBUG ? dP.toString(16) : "**...*").append(ls)
-            .append("dQ=0x").append(DEBUG ? dQ.toString(16) : "**...*").append(ls)
-            .append("qInv=0x").append(DEBUG ? qInv.toString(16) : "**...*").append(ls)
+            .append("d=0x").append(Configuration.DEBUG ? d.toString(16)
+                                                       : "**...*").append(ls)
+            .append("p=0x").append(Configuration.DEBUG ? p.toString(16)
+                                                       : "**...*").append(ls)
+            .append("q=0x").append(Configuration.DEBUG ? q.toString(16)
+                                                       : "**...*").append(ls)
+            .append("dP=0x").append(Configuration.DEBUG ? dP.toString(16)
+                                                        : "**...*").append(ls)
+            .append("dQ=0x").append(Configuration.DEBUG ? dQ.toString(16)
+                                                        : "**...*").append(ls)
+            .append("qInv=0x").append(Configuration.DEBUG ? qInv.toString(16)
+                                                          : "**...*").append(ls)
             .append(")").toString();
       }
     return str;

Index: java/security/key/rsa/RSAKeyPairPKCS8Codec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- java/security/key/rsa/RSAKeyPairPKCS8Codec.java	29 Apr 2006 06:53:06 -0000	1.4
+++ java/security/key/rsa/RSAKeyPairPKCS8Codec.java	11 Jun 2006 12:14:43 -0000	1.5
@@ -38,15 +38,7 @@
 
 package gnu.java.security.key.rsa;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.InvalidParameterException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.util.ArrayList;
-import java.util.logging.Logger;
-
+import gnu.classpath.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.Registry;
 import gnu.java.security.der.DER;
@@ -56,6 +48,15 @@
 import gnu.java.security.key.IKeyPairCodec;
 import gnu.java.security.util.DerUtil;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.security.InvalidParameterException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.util.ArrayList;
+import java.util.logging.Logger;
+
 /**
  * An implementation of an {@link IKeyPairCodec} that knows how to encode /
  * decode PKCS#8 ASN.1 external representation of RSA private keys.
@@ -122,6 +123,7 @@
    */
   public byte[] encodePrivateKey(PrivateKey key)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "encodePrivateKey()", key);
 
     if (! (key instanceof GnuRSAPrivateKey))
@@ -190,7 +192,7 @@
         y.initCause(x);
         throw y;
       }
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "encodePrivateKey()", result);
     return result;
   }
@@ -213,6 +215,7 @@
    */
   public PrivateKey decodePrivateKey(byte[] input)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "decodePrivateKey()", input);
 
     if (input == null)
@@ -287,6 +290,7 @@
 
     PrivateKey result = new GnuRSAPrivateKey(Registry.PKCS8_ENCODING_ID, n, e,
                                              d, p, q, dP, dQ, qInv);
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "decodePrivateKey()", result);
     return result;
   }

Index: java/security/key/rsa/RSAKeyPairX509Codec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- java/security/key/rsa/RSAKeyPairX509Codec.java	29 Apr 2006 06:53:06 -0000	1.5
+++ java/security/key/rsa/RSAKeyPairX509Codec.java	11 Jun 2006 12:14:43 -0000	1.6
@@ -38,6 +38,7 @@
 
 package gnu.java.security.key.rsa;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.Registry;
 import gnu.java.security.der.BitString;
@@ -114,6 +115,7 @@
    */
   public byte[] encodePublicKey(PublicKey key)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "encodePublicKey()", key);
 
     if (! (key instanceof GnuRSAPublicKey))
@@ -160,7 +162,7 @@
         y.initCause(x);
         throw y;
       }
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "encodePublicKey()", result);
     return result;
   }
@@ -183,6 +185,7 @@
    */
   public PublicKey decodePublicKey(byte[] input)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "decodePublicKey()", input);
 
     if (input == null)
@@ -235,6 +238,7 @@
       }
 
     PublicKey result = new GnuRSAPublicKey(Registry.X509_ENCODING_ID, n, e);
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "decodePublicKey()", result);
     return result;
   }

Index: java/security/key/rsa/RSAKeyPairGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- java/security/key/rsa/RSAKeyPairGenerator.java	29 Apr 2006 06:53:06 -0000	1.4
+++ java/security/key/rsa/RSAKeyPairGenerator.java	11 Jun 2006 12:14:43 -0000	1.5
@@ -38,6 +38,7 @@
 
 package gnu.java.security.key.rsa;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.key.IKeyPairGenerator;
 import gnu.java.security.util.PRNG;
@@ -152,8 +153,8 @@
    */
   public void setup(Map attributes)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "setup", attributes);
-
     // do we have a SecureRandom, or should we use our own?
     rnd = (SecureRandom) attributes.get(SOURCE_OF_RANDOMNESS);
 
@@ -181,7 +182,7 @@
     Integer formatID = (Integer) attributes.get(PREFERRED_ENCODING_FORMAT);
     preferredFormat = formatID == null ? DEFAULT_ENCODING_FORMAT
                                        : formatID.intValue();
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "setup");
   }
 
@@ -193,6 +194,7 @@
    */
   public KeyPair generate()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "generate");
 
     BigInteger p, q, n, d;
@@ -243,6 +245,7 @@
     PrivateKey secK = new GnuRSAPrivateKey(preferredFormat, p, q, e, d);
 
     KeyPair result = new KeyPair(pubK, secK);
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "generate", result);
     return result;
   }

Index: javax/crypto/jce/prng/UMacRandomSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- javax/crypto/jce/prng/UMacRandomSpi.java	26 Jan 2006 02:25:09 -0000	1.1
+++ javax/crypto/jce/prng/UMacRandomSpi.java	11 Jun 2006 12:14:44 -0000	1.2
@@ -38,15 +38,16 @@
 
 package gnu.javax.crypto.jce.prng;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
-import gnu.javax.crypto.cipher.IBlockCipher;
 import gnu.java.security.prng.LimitReachedException;
+import gnu.javax.crypto.cipher.IBlockCipher;
 import gnu.javax.crypto.prng.UMacGenerator;
 
-import java.io.PrintWriter;
 import java.security.SecureRandomSpi;
 import java.util.HashMap;
 import java.util.Random;
+import java.util.logging.Logger;
 
 /**
  * <p>An <em>Adapter</em> class around {@link UMacGenerator} to allow using this
@@ -54,24 +55,7 @@
  */
 public class UMacRandomSpi extends SecureRandomSpi
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "UMacRandomSpi";
-
-  private static final boolean DEBUG = false;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(String s)
-  {
-    err.println(">>> " + NAME + ": " + s);
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(UMacRandomSpi.class.getName());
   /** Class-wide prng to generate random material for the underlying prng.*/
   private static final UMacGenerator prng; // blank final
   static
@@ -181,10 +165,10 @@
               }
             catch (LimitReachedException x)
               {
-                if (DEBUG)
+                if (Configuration.DEBUG)
                   {
-                    debug(MSG + String.valueOf(x));
-                    debug(RETRY);
+                    log.fine(MSG + String.valueOf(x));
+                    log.fine(RETRY);
                   }
               }
           }

Index: javax/crypto/jce/prng/ICMRandomSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- javax/crypto/jce/prng/ICMRandomSpi.java	26 Jan 2006 02:25:09 -0000	1.1
+++ javax/crypto/jce/prng/ICMRandomSpi.java	11 Jun 2006 12:14:44 -0000	1.2
@@ -38,16 +38,17 @@
 
 package gnu.javax.crypto.jce.prng;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
+import gnu.java.security.prng.LimitReachedException;
 import gnu.javax.crypto.cipher.IBlockCipher;
 import gnu.javax.crypto.prng.ICMGenerator;
-import gnu.java.security.prng.LimitReachedException;
 
-import java.io.PrintWriter;
 import java.math.BigInteger;
 import java.security.SecureRandomSpi;
 import java.util.HashMap;
 import java.util.Random;
+import java.util.logging.Logger;
 
 /**
  * <p>An <em>Adapter</em> class around {@link ICMGenerator} to allow using this
@@ -55,26 +56,7 @@
  */
 public class ICMRandomSpi extends SecureRandomSpi
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "ICMRandomSpi";
-
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 0;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(String s)
-  {
-    err.println(">>> " + NAME + ": " + s);
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(ICMRandomSpi.class.getName());
   /** Class-wide prng to generate random material for the underlying prng.*/
   private static final ICMGenerator prng; // blank final
   static
@@ -106,8 +88,8 @@
 
   private static void resetLocalPRNG()
   {
-    if (DEBUG && debuglevel > 8)
-      debug(">>> resetLocalPRNG()");
+    if (Configuration.DEBUG)
+      log.entering(ICMRandomSpi.class.getName(), "resetLocalPRNG");
     HashMap attributes = new HashMap();
     attributes.put(ICMGenerator.CIPHER, Registry.AES_CIPHER);
     byte[] key = new byte[128 / 8]; // AES default key size
@@ -131,8 +113,8 @@
     attributes.put(ICMGenerator.SEGMENT_INDEX, new BigInteger(1, index));
 
     prng.setup(attributes);
-    if (DEBUG && debuglevel > 8)
-      debug("<<< resetLocalPRNG()");
+    if (Configuration.DEBUG)
+      log.exiting(ICMRandomSpi.class.getName(), "resetLocalPRNG");
   }
 
   // Instance methods
@@ -142,25 +124,25 @@
 
   public byte[] engineGenerateSeed(int numBytes)
   {
-    if (DEBUG && debuglevel > 8)
-      debug(">>> engineGenerateSeed()");
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "engineGenerateSeed");
     if (numBytes < 1)
       {
-        if (DEBUG && debuglevel > 8)
-          debug("<<< engineGenerateSeed()");
+        if (Configuration.DEBUG)
+          log.exiting(this.getClass().getName(), "engineGenerateSeed");
         return new byte[0];
       }
     byte[] result = new byte[numBytes];
     this.engineNextBytes(result);
-    if (DEBUG && debuglevel > 8)
-      debug("<<< engineGenerateSeed()");
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "engineGenerateSeed");
     return result;
   }
 
   public void engineNextBytes(byte[] bytes)
   {
-    if (DEBUG && debuglevel > 8)
-      debug(">>> engineNextBytes()");
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "engineNextBytes");
     if (!adaptee.isInitialised())
       {
         this.engineSetSeed(new byte[0]);
@@ -175,23 +157,22 @@
           }
         catch (LimitReachedException x)
           { // reseed the generator
-            if (DEBUG)
+            if (Configuration.DEBUG)
               {
-                debug(LIMIT_REACHED_MSG + String.valueOf(x));
-                x.printStackTrace(err);
-                debug(RESEED);
+                log.fine(LIMIT_REACHED_MSG + String.valueOf(x));
+                log.fine(RESEED);
               }
             resetLocalPRNG();
           }
       }
-    if (DEBUG && debuglevel > 8)
-      debug("<<< engineNextBytes()");
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "engineNextBytes");
   }
 
   public void engineSetSeed(byte[] seed)
   {
-    if (DEBUG && debuglevel > 8)
-      debug(">>> engineSetSeed()");
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "engineSetSeed");
     // compute the total number of random bytes required to setup adaptee
     int materialLength = 0;
     materialLength += 16; // key material size
@@ -224,10 +205,10 @@
               }
             catch (LimitReachedException x)
               {
-                if (DEBUG)
+                if (Configuration.DEBUG)
                   {
-                    debug(MSG + String.valueOf(x));
-                    debug(RETRY);
+                    log.fine(MSG + String.valueOf(x));
+                    log.fine(RETRY);
                   }
               }
           }
@@ -254,7 +235,7 @@
     attributes.put(ICMGenerator.SEGMENT_INDEX, new BigInteger(1, index));
 
     adaptee.init(attributes);
-    if (DEBUG && debuglevel > 8)
-      debug("<<< engineSetSeed()");
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "engineSetSeed");
   }
 }
\ No newline at end of file

Index: java/security/x509/X509CRLEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/x509/X509CRLEntry.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- java/security/x509/X509CRLEntry.java	2 Jul 2005 20:32:14 -0000	1.5
+++ java/security/x509/X509CRLEntry.java	11 Jun 2006 12:14:44 -0000	1.6
@@ -38,6 +38,7 @@
 
 package gnu.java.security.x509;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
@@ -53,6 +54,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.logging.Logger;
 
 /**
  * A single entry in a X.509 certificate revocation list.
@@ -63,20 +65,7 @@
 class X509CRLEntry extends java.security.cert.X509CRLEntry
   implements GnuPKIExtension
 {
-
-  // Constants and fields.
-  // ------------------------------------------------------------------------
-
-  private static final boolean DEBUG = false;
-  private static void debug(String msg)
-  {
-    if (DEBUG)
-      {
-        System.err.print(">> X509CRLEntry: ");
-        System.err.println(msg);
-      }
-  }
-
+  private static final Logger log = Logger.getLogger(X509CRLEntry.class.getName());
   /** The DER encoded form of this CRL entry. */
   private byte[] encoded;
 
@@ -230,26 +219,29 @@
   {
     // RevokedCertificate ::= SEQUENCE {
     DERValue entry = der.read();
-    debug("start CRL entry   len == " + entry.getLength());
+    if (Configuration.DEBUG)
+      log.fine("start CRL entry   len == " + entry.getLength());
     if (!entry.isConstructed())
       throw new IOException("malformed revokedCertificate");
     encoded = entry.getEncoded();
     int len = 0;
-
-    debug("encoded entry:\n" + Util.hexDump(encoded, ">>>> "));
+    if (Configuration.DEBUG)
+      log.fine("encoded entry:\n" + Util.hexDump(encoded, ">>>> "));
 
     //   userCertificate   CertificateSerialNumber,
     DERValue val = der.read();
     serialNo = (BigInteger) val.getValue();
     len += val.getEncodedLength();
-    debug("userCertificate == " + serialNo + "  current count == " + len);
+    if (Configuration.DEBUG)
+      log.fine("userCertificate == " + serialNo + "  current count == " + len);
 
     //   revocationDate   Time,
     val = der.read();
     revocationDate = (Date) val.getValue();
     len += val.getEncodedLength();
-    debug("revocationDate == " + revocationDate + "  current count == " + len);
-
+    if (Configuration.DEBUG)
+      log.fine("revocationDate == " + revocationDate + "  current count == "
+               + len);
     //   crlEntryExtensions   Extensions OPTIONAL
     //                          -- if present MUST be v2
     if (len < entry.getLength())
@@ -259,19 +251,22 @@
         DERValue exts = der.read();
         if (!exts.isConstructed())
           throw new IOException("malformed Extensions");
-        debug("start Extensions  len == " + exts.getLength());
+        if (Configuration.DEBUG)
+          log.fine("start Extensions  len == " + exts.getLength());
         len = 0;
         while (len < exts.getLength())
           {
             val = der.read();
             if (!val.isConstructed())
               throw new IOException("malformed Extension");
-            debug("start Extension  len == " + val.getLength());
+            if (Configuration.DEBUG)
+              log.fine("start Extension  len == " + val.getLength());
             Extension e = new Extension(val.getEncoded());
             extensions.put(e.getOid(), e);
             der.skip(val.getLength());
             len += val.getEncodedLength();
-            debug("current count == " + len);
+            if (Configuration.DEBUG)
+              log.fine("current count == " + len);
           }
       }
   }

Index: java/security/x509/X509CRL.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/x509/X509CRL.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- java/security/x509/X509CRL.java	2 Jul 2005 20:32:14 -0000	1.7
+++ java/security/x509/X509CRL.java	11 Jun 2006 12:14:44 -0000	1.8
@@ -38,6 +38,7 @@
 
 package gnu.java.security.x509;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.der.BitString;
 import gnu.java.security.der.DER;
@@ -64,6 +65,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.logging.Logger;
 
 import javax.security.auth.x500.X500Principal;
 
@@ -75,20 +77,7 @@
 public class X509CRL extends java.security.cert.X509CRL
   implements GnuPKIExtension
 {
-
-  // Constants and fields.
-  // ------------------------------------------------------------------------
-
-  private static final boolean DEBUG = false;
-  private static void debug(String msg)
-  {
-    if (DEBUG)
-      {
-        System.err.print(">> X509CRL: ");
-        System.err.println(msg);
-      }
-  }
-
+  private static final Logger log = Logger.getLogger(X509CRL.class.getName());
   private static final OID ID_DSA = new OID("1.2.840.10040.4.1");
   private static final OID ID_DSA_WITH_SHA1 = new OID("1.2.840.10040.4.3");
   private static final OID ID_RSA = new OID("1.2.840.113549.1.1.1");
@@ -350,7 +339,8 @@
     // CertificateList ::= SEQUENCE {
     DERReader der = new DERReader(in);
     DERValue val = der.read();
-    debug("start CertificateList len == " + val.getLength());
+    if (Configuration.DEBUG)
+      log.fine("start CertificateList len == " + val.getLength());
     if (!val.isConstructed())
       throw new IOException("malformed CertificateList");
     encoded = val.getEncoded();
@@ -359,7 +349,8 @@
     val = der.read();
     if (!val.isConstructed())
       throw new IOException("malformed TBSCertList");
-    debug("start tbsCertList  len == " + val.getLength());
+    if (Configuration.DEBUG)
+      log.fine("start tbsCertList  len == " + val.getLength());
     tbsCRLBytes = val.getEncoded();
 
     //     version    Version OPTIONAL,
@@ -372,19 +363,23 @@
       }
     else
       version = 1;
-    debug("read version == " + version);
+    if (Configuration.DEBUG)
+      log.fine("read version == " + version);
 
     //     signature   AlgorithmIdentifier,
-    debug("start AlgorithmIdentifier len == " + val.getLength());
+    if (Configuration.DEBUG)
+      log.fine("start AlgorithmIdentifier len == " + val.getLength());
     if (!val.isConstructed())
       throw new IOException("malformed AlgorithmIdentifier");
     DERValue algIdVal = der.read();
     algId = (OID) algIdVal.getValue();
-    debug("read object identifier == " + algId);
+    if (Configuration.DEBUG)
+      log.fine("read object identifier == " + algId);
     if (val.getLength() > algIdVal.getEncodedLength())
       {
         val = der.read();
-        debug("read parameters  len == " + val.getEncodedLength());
+        if (Configuration.DEBUG)
+          log.fine("read parameters  len == " + val.getEncodedLength());
         algParams = val.getEncoded();
         if (val.isConstructed())
           in.skip(val.getLength());
@@ -394,18 +389,21 @@
     val = der.read();
     issuerDN = new X500DistinguishedName(val.getEncoded());
     der.skip(val.getLength());
-    debug("read issuer == " + issuerDN);
+    if (Configuration.DEBUG)
+      log.fine("read issuer == " + issuerDN);
 
     //     thisUpdate   Time,
     thisUpdate = (Date) der.read().getValue();
-    debug("read thisUpdate == " + thisUpdate);
+    if (Configuration.DEBUG)
+      log.fine("read thisUpdate == " + thisUpdate);
 
     //     nextUpdate   Time OPTIONAL,
     val = der.read();
     if (val.getValue() instanceof Date)
       {
         nextUpdate = (Date) val.getValue();
-        debug("read nextUpdate == " + nextUpdate);
+        if (Configuration.DEBUG)
+          log.fine("read nextUpdate == " + nextUpdate);
         val = der.read();
       }
 
@@ -433,7 +431,8 @@
         DERValue exts = der.read();
         if (!exts.isConstructed())
           throw new IOException("malformed Extensions");
-        debug("start Extensions  len == " + exts.getLength());
+        if (Configuration.DEBUG)
+          log.fine("start Extensions  len == " + exts.getLength());
         int len = 0;
         while (len < exts.getLength())
           {
@@ -444,32 +443,42 @@
             extensions.put(e.getOid(), e);
             der.skip(ext.getLength());
             len += ext.getEncodedLength();
-            debug("current count == " + len);
+            if (Configuration.DEBUG)
+              log.fine("current count == " + len);
           }
         val = der.read();
       }
 
-    debug("read tag == " + val.getTag());
+    if (Configuration.DEBUG)
+      log.fine("read tag == " + val.getTag());
     if (!val.isConstructed())
       throw new IOException("malformed AlgorithmIdentifier");
-    debug("start AlgorithmIdentifier  len == " + val.getLength());
+    if (Configuration.DEBUG)
+      log.fine("start AlgorithmIdentifier  len == " + val.getLength());
     DERValue sigAlgVal = der.read();
-    debug("read tag == " + sigAlgVal.getTag());
+    if (Configuration.DEBUG)
+      log.fine("read tag == " + sigAlgVal.getTag());
     if (sigAlgVal.getTag() != DER.OBJECT_IDENTIFIER)
       throw new IOException("malformed AlgorithmIdentifier");
     sigAlg = (OID) sigAlgVal.getValue();
-    debug("signature id == " + sigAlg);
-    debug("sigAlgVal length == " + sigAlgVal.getEncodedLength());
+    if (Configuration.DEBUG)
+      {
+        log.fine("signature id == " + sigAlg);
+        log.fine("sigAlgVal length == " + sigAlgVal.getEncodedLength());
+      }
     if (val.getLength() > sigAlgVal.getEncodedLength())
       {
         val = der.read();
-        debug("sig params tag = " + val.getTag() + " len == " + val.getEncodedLength());
+        if (Configuration.DEBUG)
+          log.fine("sig params tag = " + val.getTag() + " len == "
+                   + val.getEncodedLength());
         sigAlgParams = (byte[]) val.getEncoded();
         if (val.isConstructed())
           in.skip(val.getLength());
       }
     val = der.read();
-    debug("read tag = " + val.getTag());
+    if (Configuration.DEBUG)
+      log.fine("read tag = " + val.getTag());
     rawSig = val.getEncoded();
     signature = ((BitString) val.getValue()).toByteArray();
   }

Index: javax/crypto/pad/TBC.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/TBC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/pad/TBC.java	4 Jun 2006 06:57:25 -0000	1.2
+++ javax/crypto/pad/TBC.java	11 Jun 2006 12:14:44 -0000	1.3
@@ -38,10 +38,11 @@
 
 package gnu.javax.crypto.pad;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
-import java.io.PrintWriter;
+import java.util.logging.Logger;
 
 /**
  * <p>The implementation of the Trailing Bit Complement (TBC) padding algorithm.</p>
@@ -59,28 +60,7 @@
  */
 public final class TBC extends BasePad
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "tbc";
-
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 9;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(String s)
-  {
-    err.println(">>> " + NAME + ": " + s);
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -------------------------------------------------------------------------
+  private static final Logger log = Logger.getLogger(TBC.class.getName());
 
   /**
    * Trivial package-private constructor for use by the <i>Factory</i> class.<p>
@@ -123,10 +103,8 @@
           }
       } // else it's already set to zeroes by virtue of initialisation
 
-    if (DEBUG && debuglevel > 8)
-      {
-        debug("padding: 0x" + Util.toString(result));
-      }
+    if (Configuration.DEBUG)
+      log.fine("padding: 0x" + Util.toString(result));
     return result;
   }
 
@@ -146,11 +124,8 @@
       {
         throw new WrongPaddingException();
       }
-
-    if (DEBUG && debuglevel > 8)
-      {
-        debug("padding length: " + String.valueOf(result));
-      }
+    if (Configuration.DEBUG)
+      log.fine("padding length: " + result);
     return result;
   }
 }
\ No newline at end of file

Index: javax/crypto/pad/PKCS7.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/PKCS7.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/pad/PKCS7.java	4 Jun 2006 06:57:25 -0000	1.2
+++ javax/crypto/pad/PKCS7.java	11 Jun 2006 12:14:44 -0000	1.3
@@ -38,10 +38,11 @@
 
 package gnu.javax.crypto.pad;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
-import java.io.PrintWriter;
+import java.util.logging.Logger;
 
 /**
  * <p>The implementation of the PKCS7 padding algorithm.</p>
@@ -60,28 +61,7 @@
  */
 public final class PKCS7 extends BasePad
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "pkcs7";
-
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 9;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(String s)
-  {
-    err.println(">>> " + NAME + ": " + s);
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -------------------------------------------------------------------------
+  private static final Logger log = Logger.getLogger(PKCS7.class.getName());
 
   /**
    * Trivial package-private constructor for use by the <i>Factory</i> class.<p>
@@ -119,11 +99,8 @@
       {
         result[i++] = (byte) padLength;
       }
-
-    if (DEBUG && debuglevel > 8)
-      {
-        debug("padding: 0x" + Util.toString(result));
-      }
+    if (Configuration.DEBUG)
+      log.fine("padding: 0x" + Util.toString(result));
     return result;
   }
 
@@ -139,11 +116,8 @@
             throw new WrongPaddingException();
           }
       }
-
-    if (DEBUG && debuglevel > 8)
-      {
-        debug("padding length: " + String.valueOf(result));
-      }
+    if (Configuration.DEBUG)
+      log.fine("padding length: " + result);
     return result;
   }
 }
\ No newline at end of file

Index: javax/crypto/pad/PKCS1_V1_5.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- javax/crypto/pad/PKCS1_V1_5.java	4 Jun 2006 06:57:25 -0000	1.3
+++ javax/crypto/pad/PKCS1_V1_5.java	11 Jun 2006 12:14:44 -0000	1.4
@@ -38,12 +38,14 @@
 
 package gnu.javax.crypto.pad;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.sig.rsa.EME_PKCS1_V1_5;
 import gnu.java.security.util.PRNG;
 import gnu.java.security.util.Util;
 
-import java.io.PrintWriter;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * <p>A padding algorithm implementation of the EME-PKCS1-V1.5 encoding/decoding
@@ -63,26 +65,7 @@
  */
 public class PKCS1_V1_5 extends BasePad
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = Registry.EME_PKCS1_V1_5_PAD;
-
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 9;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(final String s)
-  {
-    err.println(">>> " + NAME + ": " + s);
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(PKCS1_V1_5.class.getName());
   private EME_PKCS1_V1_5 codec;
 
   // Constructor(s)
@@ -117,10 +100,8 @@
     final byte[] EM = codec.encode(M);
     final byte[] result = new byte[blockSize - length];
     System.arraycopy(EM, 0, result, 0, result.length);
-    if (DEBUG && debuglevel > 8)
-      {
-        debug("padding: 0x" + Util.toString(result));
-      }
+    if (Configuration.DEBUG)
+      log.fine("padding: 0x" + Util.toString(result));
     return result;
   }
 
@@ -130,10 +111,8 @@
     final byte[] EM = new byte[length];
     System.arraycopy(in, offset, EM, 0, length);
     final int result = length - codec.decode(EM).length;
-    if (DEBUG && debuglevel > 8)
-      {
-        debug("padding length: " + String.valueOf(result));
-      }
+    if (Configuration.DEBUG)
+      log.fine("padding length: " + String.valueOf(result));
     return result;
   }
 
@@ -156,7 +135,10 @@
             p = pad(M, 0, j);
             if (j + p.length != blockSize)
               {
-                new RuntimeException(name()).printStackTrace(System.err);
+                if (Configuration.DEBUG)
+                  log.log(Level.SEVERE,
+                          "Length of padded text MUST be a multiple of " + blockSize,
+                          new RuntimeException(name()));
                 return false;
               }
 
@@ -166,13 +148,17 @@
               {
                 if (p.length != unpad(EM, 0, blockSize))
                   {
-                    new RuntimeException(name()).printStackTrace(System.err);
+                    if (Configuration.DEBUG)
+                      log.log(Level.SEVERE,
+                              "Failed symmetric operation",
+                              new RuntimeException(name()));
                     return false;
                   }
               }
             catch (WrongPaddingException x)
               {
-                x.printStackTrace(System.err);
+                if (Configuration.DEBUG)
+                  log.throwing(this.getClass().getName(), "selfTest", x);
                 return false;
               }
           }

Index: javax/crypto/pad/BasePad.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/BasePad.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/pad/BasePad.java	9 Jun 2006 11:28:46 -0000	1.2
+++ javax/crypto/pad/BasePad.java	11 Jun 2006 12:14:44 -0000	1.3
@@ -38,18 +38,19 @@
 
 package gnu.javax.crypto.pad;
 
+import gnu.classpath.Configuration;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 /**
- * <p>An abstract class to facilitate implementing padding algorithms.</p>
+ * An abstract class to facilitate implementing padding algorithms.
  */
 public abstract class BasePad implements IPad
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(BasePad.class.getName());
   /** The canonical name prefix of the padding algorithm. */
   protected String name;
-
   /** The block size, in bytes, for this instance. */
   protected int blockSize;
 
@@ -139,7 +140,10 @@
         padBytes = pad(buffer, offset, i);
         if (((i + padBytes.length) % blockSize) != 0)
           {
-            new RuntimeException(name()).printStackTrace(System.err);
+            if (Configuration.DEBUG)
+              log.log(Level.SEVERE,
+                      "Length of padded text MUST be a multiple of " + blockSize,
+                      new RuntimeException(name()));
             return false;
           }
         System.arraycopy(padBytes, 0, buffer, offset + i, padBytes.length);
@@ -147,13 +151,17 @@
           {
             if (padBytes.length != unpad(buffer, offset, i + padBytes.length))
               {
-                new RuntimeException(name()).printStackTrace(System.err);
+                if (Configuration.DEBUG)
+                  log.log(Level.SEVERE,
+                          "IPad [" + name() + "] failed symmetric operation",
+                          new RuntimeException(name()));
                 return false;
               }
           }
         catch (WrongPaddingException x)
           {
-            x.printStackTrace(System.err);
+            if (Configuration.DEBUG)
+              log.throwing(this.getClass().getName(), "test1BlockSize", x);
             return false;
           }
       }

Index: java/security/hash/Whirlpool.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/hash/Whirlpool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- java/security/hash/Whirlpool.java	21 Apr 2006 10:35:36 -0000	1.3
+++ java/security/hash/Whirlpool.java	11 Jun 2006 12:14:44 -0000	1.4
@@ -38,9 +38,12 @@
 
 package gnu.java.security.hash;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 
+import java.util.logging.Logger;
+
 /**
  * Whirlpool, a new 512-bit hashing function operating on messages less than
  * 2 ** 256 bits in length. The function structure is designed according to the
@@ -61,16 +64,7 @@
  */
 public final class Whirlpool extends BaseHash
 {
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 3;
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(Whirlpool.class.getName());
   private static final int BLOCK_SIZE = 64; // inner block size in bytes
 
   /** The digest of the 0-bit long message. */
@@ -183,95 +177,87 @@
                 ^ (T7[i++] & 0x00000000000000FFL);
 
       time = System.currentTimeMillis() - time;
-      if (DEBUG && debuglevel > 8)
+      if (Configuration.DEBUG)
         {
-          System.out.println("==========");
-          System.out.println();
-          System.out.println("Static data");
-          System.out.println();
-          
-          System.out.println();
-          System.out.println("T0[]:");
+          log.fine("Static data");
+          log.fine("T0[]:");
+          StringBuilder sb;
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T0[i * 4 + j]) + ", ");
+                sb.append("0x").append(Util.toString(T0[i * 4 + j])).append(", ");
 
-              System.out.println();
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T1[]:");
+          log.fine("T1[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T1[i * 4 + j]) + ", ");
+                sb.append("0x").append(Util.toString(T1[i * 4 + j])).append(", ");
 
-              System.out.println();
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T2[]:");
+          log.fine("T2[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T2[i * 4 + j]) + ", ");
+                sb.append("0x").append(Util.toString(T2[i * 4 + j])).append(", ");
 
-              System.out.println();
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T3[]:");
+          log.fine("T3[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T3[i * 4 + j]) + ", ");
+                sb.append("0x").append(Util.toString(T3[i * 4 + j])).append(", ");
 
-              System.out.println();
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T4[]:");
+          log.fine("\nT4[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T4[i * 4 + j]) + ", ");
+                sb.append("0x").append(Util.toString(T4[i * 4 + j])).append(", ");
 
-              System.out.println();
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T5[]:");
+          log.fine("T5[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T5[i * 4 + j]) + ", ");
+                sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");
 
-              System.out.println();
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T6[]:");
+          log.fine("T6[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T5[i * 4 + j]) + ", ");
+                sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");
 
-              System.out.println();
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("T7[]:");
+          log.fine("T7[]:");
           for (i = 0; i < 64; i++)
             {
+              sb = new StringBuilder();
               for (j = 0; j < 4; j++)
-                System.out.print("0x" + Util.toString(T5[i * 4 + j]) + ", ");
+                sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");
 
-              System.out.println();
+              log.fine(sb.toString());
             }
-          System.out.println();
-          System.out.println("rc[]:");
+          log.fine("rc[]:");
           for (i = 0; i < R; i++)
-            System.out.println("0x" + Util.toString(rc[i]));
-
-          System.out.println();
+            log.fine("0x" + Util.toString(rc[i]));
 
-          System.out.println();
-          System.out.println("Total initialization time: " + time + " ms.");
-          System.out.println();
+          log.fine("Total initialization time: " + time + " ms.");
         }
     }
 

Index: javax/crypto/prng/CSPRNG.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/prng/CSPRNG.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- javax/crypto/prng/CSPRNG.java	4 Jun 2006 06:57:25 -0000	1.3
+++ javax/crypto/prng/CSPRNG.java	11 Jun 2006 12:14:44 -0000	1.4
@@ -38,6 +38,7 @@
 
 package gnu.javax.crypto.prng;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Properties;
 import gnu.java.security.Registry;
 import gnu.java.security.hash.HashFactory;
@@ -68,6 +69,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * <p>An entropy pool-based pseudo-random number generator based on the PRNG
@@ -84,18 +87,7 @@
  */
 public class CSPRNG extends BasePRNG
 {
-
-  // Constants and fields.
-  // -------------------------------------------------------------------------
-
-  private static final boolean DEBUG = false;
-
-  private static void debug(String msg)
-  {
-    System.err.print(">>> CSPRNG: ");
-    System.err.println(msg);
-  }
-
+  private static final Logger log = Logger.getLogger(CSPRNG.class.getName());
   /**
    * Property name for the list of files to read for random values. The
    * mapped value is a list with the following values:
@@ -480,34 +472,25 @@
   public void setup(Map attrib)
   {
     List list = null;
-
-    if (DEBUG)
-      {
-        debug(String.valueOf(attrib));
-      }
+    if (Configuration.DEBUG)
+      log.fine("attrib=" + String.valueOf(attrib));
     try
       {
         list = (List) attrib.get(FILE_SOURCES);
-        if (DEBUG)
-          {
-            debug(String.valueOf(list));
-          }
+        if (Configuration.DEBUG)
+          log.fine("list=" + String.valueOf(list));
         if (list != null)
           {
             files.clear();
             for (Iterator it = list.iterator(); it.hasNext();)
               {
                 List l = (List) it.next();
-                if (DEBUG)
-                  {
-                    debug("l=" + l);
-                  }
+                if (Configuration.DEBUG)
+                  log.fine("l=" + l);
                 if (l.size() != 4)
                   {
-                    if (DEBUG)
-                      {
-                        debug("file list too small: " + l.size());
-                      }
+                    if (Configuration.DEBUG)
+                      log.fine("file list too small: " + l.size());
                     throw new IllegalArgumentException("invalid file list");
                   }
                 Double quality = (Double) l.get(0);
@@ -520,37 +503,28 @@
       }
     catch (ClassCastException cce)
       {
-        if (DEBUG)
-          {
-            debug("bad file list: " + cce.getMessage());
-            cce.printStackTrace();
-          }
+        if (Configuration.DEBUG)
+          log.log(Level.FINE, "bad file list", cce);
         throw new IllegalArgumentException("invalid file list");
       }
 
     try
       {
         list = (List) attrib.get(URL_SOURCES);
-        if (DEBUG)
-          {
-            debug(String.valueOf(list));
-          }
+        if (Configuration.DEBUG)
+          log.fine("list=" + String.valueOf(list));
         if (list != null)
           {
             urls.clear();
             for (Iterator it = list.iterator(); it.hasNext();)
               {
                 List l = (List) it.next();
-                if (DEBUG)
-                  {
-                    debug("l=" + l);
-                  }
+                if (Configuration.DEBUG)
+                  log.fine("l=" + l);
                 if (l.size() != 4)
                   {
-                    if (DEBUG)
-                      {
-                        debug("URL list too small: " + l.size());
-                      }
+                    if (Configuration.DEBUG)
+                      log.fine("URL list too small: " + l.size());
                     throw new IllegalArgumentException("invalid URL list");
                   }
                 Double quality = (Double) l.get(0);
@@ -563,37 +537,28 @@
       }
     catch (ClassCastException cce)
       {
-        if (DEBUG)
-          {
-            debug("bad URL list: " + cce.getMessage());
-            cce.printStackTrace();
-          }
+        if (Configuration.DEBUG)
+          log.log(Level.FINE, "bad URL list", cce);
         throw new IllegalArgumentException("invalid URL list");
       }
 
     try
       {
         list = (List) attrib.get(PROGRAM_SOURCES);
-        if (DEBUG)
-          {
-            debug(String.valueOf(list));
-          }
+        if (Configuration.DEBUG)
+          log.fine("list=" + String.valueOf(list));
         if (list != null)
           {
             progs.clear();
             for (Iterator it = list.iterator(); it.hasNext();)
               {
                 List l = (List) it.next();
-                if (DEBUG)
-                  {
-                    debug("l=" + l);
-                  }
+                if (Configuration.DEBUG)
+                  log.fine("l=" + l);
                 if (l.size() != 4)
                   {
-                    if (DEBUG)
-                      {
-                        debug("program list too small: " + l.size());
-                      }
+                    if (Configuration.DEBUG)
+                      log.fine("program list too small: " + l.size());
                     throw new IllegalArgumentException("invalid program list");
                   }
                 Double quality = (Double) l.get(0);
@@ -606,31 +571,24 @@
       }
     catch (ClassCastException cce)
       {
-        if (DEBUG)
-          {
-            debug("bad program list: " + cce.getMessage());
-            cce.printStackTrace();
-          }
+        if (Configuration.DEBUG)
+          log.log(Level.FINE, "bad program list", cce);
         throw new IllegalArgumentException("invalid program list");
       }
 
     try
       {
         list = (List) attrib.get(OTHER_SOURCES);
-        if (DEBUG)
-          {
-            debug(String.valueOf(list));
-          }
+        if (Configuration.DEBUG)
+          log.fine("list=" + String.valueOf(list));
         if (list != null)
           {
             other.clear();
             for (Iterator it = list.iterator(); it.hasNext();)
               {
                 EntropySource src = (EntropySource) it.next();
-                if (DEBUG)
-                  {
-                    debug("src=" + src);
-                  }
+                if (Configuration.DEBUG)
+                  log.fine("src=" + src);
                 if (src == null)
                   {
                     throw new NullPointerException("null source in source list");
@@ -674,16 +632,12 @@
 
   public void fillBlock() throws LimitReachedException
   {
-    if (DEBUG)
-      {
-        debug("fillBlock");
-      }
+    if (Configuration.DEBUG)
+      log.fine("fillBlock");
     if (getQuality() < 100.0)
       {
-        if (DEBUG)
-          {
-            debug("doing slow poll");
-          }
+        if (Configuration.DEBUG)
+          log.fine("doing slow poll");
         slowPoll();
       }
 
@@ -759,10 +713,10 @@
       {
         throw new ArrayIndexOutOfBoundsException();
       }
-    if (DEBUG)
+    if (Configuration.DEBUG)
       {
-        debug("adding random bytes:");
-        debug(Util.toString(buf, off, len));
+        log.fine("adding random bytes:");
+        log.fine(Util.toString(buf, off, len));
       }
     final int count = off + len;
     for (int i = off; i < count; i++)
@@ -785,10 +739,8 @@
    */
   public synchronized void addRandomByte(byte b)
   {
-    if (DEBUG)
-      {
-        debug("adding byte " + Integer.toHexString(b));
-      }
+    if (Configuration.DEBUG)
+      log.fine("adding byte " + Integer.toHexString(b));
     pool[index++] ^= b;
     if (index >= pool.length)
       {
@@ -802,18 +754,14 @@
 
   synchronized void addQuality(double quality)
   {
-    if (DEBUG)
-      {
-        debug("adding quality " + quality);
-      }
+    if (Configuration.DEBUG)
+      log.fine("adding quality " + quality);
     if (this.quality < 100)
       {
         this.quality += quality;
       }
-    if (DEBUG)
-      {
-        debug("quality now " + this.quality);
-      }
+    if (Configuration.DEBUG)
+      log.fine("quality now " + this.quality);
   }
 
   synchronized double getQuality()
@@ -923,11 +871,9 @@
 
   private void slowPoll() throws LimitReachedException
   {
-    if (DEBUG)
-      {
-        debug("poller is alive? "
+    if (Configuration.DEBUG)
+      log.fine("poller is alive? "
               + (pollerThread == null ? false : pollerThread.isAlive()));
-      }
     if (pollerThread == null || !pollerThread.isAlive())
       {
         boolean interrupted = false;
@@ -951,12 +897,9 @@
         // and there in insufficient randomness, throw an exception.
         if (!interrupted && blocking && quality < 100.0)
           {
-            if (DEBUG)
-              {
-                debug("insufficient quality: " + quality);
-              }
-            throw new LimitReachedException(
-                                            "insufficient randomness was polled");
+            if (Configuration.DEBUG)
+              log.fine("insufficient quality: " + quality);
+            throw new LimitReachedException("insufficient randomness was polled");
           }
       }
   }
@@ -1054,11 +997,11 @@
     public void run()
     {
       running = true;
-      if (DEBUG)
+      if (Configuration.DEBUG)
         {
-          debug("files: " + files);
-          debug("URLs: " + urls);
-          debug("progs: " + progs);
+          log.fine("files: " + files);
+          log.fine("URLs: " + urls);
+          log.fine("progs: " + progs);
         }
       Iterator files_it = files.iterator();
       Iterator urls_it = urls.iterator();
@@ -1080,10 +1023,8 @@
               try
                 {
                   List l = (List) files_it.next();
-                  if (DEBUG)
-                    {
-                      debug(l.toString());
-                    }
+                  if (Configuration.DEBUG)
+                    log.fine(l.toString());
                   double qual = ((Double) l.get(0)).doubleValue();
                   int offset = ((Integer) l.get(1)).intValue();
                   int count = ((Integer) l.get(2)).intValue();
@@ -1100,18 +1041,13 @@
                       pool.addRandomBytes(buf, 0, len);
                       pool.addQuality(qual * ((double) len / (double) count));
                     }
-                  if (DEBUG)
-                    {
-                      debug("got " + len + " bytes from " + src);
-                    }
+                  if (Configuration.DEBUG)
+                    log.fine("got " + len + " bytes from " + src);
                 }
               catch (Exception x)
                 {
-                  if (DEBUG)
-                    {
-                      debug(x.toString());
-                      x.printStackTrace();
-                    }
+                  if (Configuration.DEBUG)
+                    log.throwing(this.getClass().getName(), "run", x);
                 }
             }
 
@@ -1125,10 +1061,8 @@
               try
                 {
                   List l = (List) urls_it.next();
-                  if (DEBUG)
-                    {
-                      debug(l.toString());
-                    }
+                  if (Configuration.DEBUG)
+                    log.fine(l.toString());
                   double qual = ((Double) l.get(0)).doubleValue();
                   int offset = ((Integer) l.get(1)).intValue();
                   int count = ((Integer) l.get(2)).intValue();
@@ -1145,18 +1079,13 @@
                       pool.addRandomBytes(buf, 0, len);
                       pool.addQuality(qual * ((double) len / (double) count));
                     }
-                  if (DEBUG)
-                    {
-                      debug("got " + len + " bytes from " + src);
-                    }
+                  if (Configuration.DEBUG)
+                    log.fine("got " + len + " bytes from " + src);
                 }
               catch (Exception x)
                 {
-                  if (DEBUG)
-                    {
-                      debug(x.toString());
-                      x.printStackTrace();
-                    }
+                  if (Configuration.DEBUG)
+                    log.throwing(this.getClass().getName(), "run", x);
                 }
             }
 
@@ -1171,10 +1100,8 @@
               try
                 {
                   List l = (List) prog_it.next();
-                  if (DEBUG)
-                    {
-                      debug(l.toString());
-                    }
+                  if (Configuration.DEBUG)
+                    log.finer(l.toString());
                   double qual = ((Double) l.get(0)).doubleValue();
                   int offset = ((Integer) l.get(1)).intValue();
                   int count = ((Integer) l.get(2)).intValue();
@@ -1195,18 +1122,13 @@
                     }
                   proc.destroy();
                   proc.waitFor();
-                  if (DEBUG)
-                    {
-                      debug("got " + len + " bytes from " + src);
-                    }
+                  if (Configuration.DEBUG)
+                    log.fine("got " + len + " bytes from " + src);
                 }
               catch (Exception x)
                 {
-                  if (DEBUG)
-                    {
-                      debug(x.toString());
-                      x.printStackTrace();
-                    }
+                  if (Configuration.DEBUG)
+                    log.throwing(this.getClass().getName(), "run", x);
                   try
                     {
                       if (proc != null)
@@ -1238,18 +1160,13 @@
                     }
                   pool.addRandomBytes(buf, 0, buf.length);
                   pool.addQuality(src.quality());
-                  if (DEBUG)
-                    {
-                      debug("got " + buf.length + " bytes from " + src);
-                    }
+                  if (Configuration.DEBUG)
+                    log.fine("got " + buf.length + " bytes from " + src);
                 }
               catch (Exception x)
                 {
-                  if (DEBUG)
-                    {
-                      debug(x.toString());
-                      x.printStackTrace();
-                    }
+                  if (Configuration.DEBUG)
+                    log.throwing(this.getClass().getName(), "run", x);
                 }
             }
         }

Index: java/security/key/dss/DSSPrivateKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/dss/DSSPrivateKey.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- java/security/key/dss/DSSPrivateKey.java	26 Mar 2006 22:57:46 -0000	1.4
+++ java/security/key/dss/DSSPrivateKey.java	11 Jun 2006 12:14:44 -0000	1.5
@@ -38,6 +38,7 @@
 
 package gnu.java.security.key.dss;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.SystemProperties;
 import gnu.java.security.Registry;
 import gnu.java.security.key.IKeyPairCodec;
@@ -53,11 +54,6 @@
  */
 public class DSSPrivateKey extends DSSKey implements PrivateKey, DSAPrivateKey
 {
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  private static final boolean DEBUG = false;
-
   /**
    * <p>A randomly or pseudorandomly generated integer with <code>0 &lt; x &lt;
    * q</code>.</p>
@@ -210,7 +206,8 @@
         String ls = SystemProperties.getProperty("line.separator");
         str = new StringBuilder(this.getClass().getName()).append("(")
         .append(super.toString()).append(",").append(ls)
-        .append("x=0x").append(DEBUG ? x.toString(16) : "**...*").append(ls)
+        .append("x=0x").append(Configuration.DEBUG ? x.toString(16)
+                                                   : "**...*").append(ls)
         .append(")").toString();
       }
 

Index: java/security/key/dss/DSSKeyPairPKCS8Codec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- java/security/key/dss/DSSKeyPairPKCS8Codec.java	25 Mar 2006 11:19:26 -0000	1.5
+++ java/security/key/dss/DSSKeyPairPKCS8Codec.java	11 Jun 2006 12:14:44 -0000	1.6
@@ -38,6 +38,7 @@
 
 package gnu.java.security.key.dss;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.Registry;
 import gnu.java.security.der.DER;
@@ -184,7 +185,8 @@
    */
   public PrivateKey decodePrivateKey(byte[] input)
   {
-    log.entering("DSSKeyPairPKCS8Codec", "decodePrivateKey");
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "decodePrivateKey");
 
     if (input == null)
       throw new InvalidParameterException("Input bytes MUST NOT be null");
@@ -226,9 +228,11 @@
         g = (BigInteger) val.getValue();
 
         val = der.read();
-        log.finest("val = " + val);
+        if (Configuration.DEBUG)
+          log.fine("val = " + val);
         byte[] xBytes = (byte[]) val.getValue();
-        log.finest(Util.dumpString(xBytes, "xBytes: "));
+        if (Configuration.DEBUG)
+          log.fine(Util.dumpString(xBytes, "xBytes: "));
         DERReader der2 = new DERReader(xBytes);
         val = der2.read();
         DerUtil.checkIsBigInteger(val, "Wrong X field");
@@ -240,8 +244,8 @@
         y.initCause(e);
         throw y;
       }
-
-    log.exiting("DSSKeyPairPKCS8Codec", "decodePrivateKey");
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "decodePrivateKey");
     return new DSSPrivateKey(Registry.PKCS8_ENCODING_ID, p, q, g, x);
   }
 }

Index: java/security/key/dss/DSSKeyPairGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- java/security/key/dss/DSSKeyPairGenerator.java	23 Feb 2006 12:54:46 -0000	1.4
+++ java/security/key/dss/DSSKeyPairGenerator.java	11 Jun 2006 12:14:44 -0000	1.5
@@ -38,12 +38,12 @@
 
 package gnu.java.security.key.dss;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.hash.Sha160;
 import gnu.java.security.key.IKeyPairGenerator;
 import gnu.java.security.util.PRNG;
 
-import java.io.PrintWriter;
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.security.PrivateKey;
@@ -51,6 +51,7 @@
 import java.security.SecureRandom;
 import java.security.spec.DSAParameterSpec;
 import java.util.Map;
+import java.util.logging.Logger;
 
 /**
  * <p>A key-pair generator for asymetric keys to use in conjunction with the DSS
@@ -63,26 +64,7 @@
  */
 public class DSSKeyPairGenerator implements IKeyPairGenerator
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "dss";
-
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 5;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(String s)
-  {
-    err.println(">>> " + NAME + ": " + s);
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(DSSKeyPairGenerator.class.getName());
   /** The BigInteger constant 2. */
   private static final BigInteger TWO = new BigInteger("2");
 
@@ -361,14 +343,14 @@
         p = params[FIPS186.DSA_PARAMS_P];
         e = params[FIPS186.DSA_PARAMS_E];
         g = params[FIPS186.DSA_PARAMS_G];
-        if (DEBUG && debuglevel > 0)
+        if (Configuration.DEBUG)
           {
-            debug("seed: " + seed.toString(16));
-            debug("counter: " + counter.intValue());
-            debug("q: " + q.toString(16));
-            debug("p: " + p.toString(16));
-            debug("e: " + e.toString(16));
-            debug("g: " + g.toString(16));
+            log.fine("seed: " + seed.toString(16));
+            log.fine("counter: " + counter.intValue());
+            log.fine("q: " + q.toString(16));
+            log.fine("p: " + p.toString(16));
+            log.fine("e: " + e.toString(16));
+            log.fine("g: " + g.toString(16));
           }
       }
 

Index: java/security/x509/ext/Extension.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/x509/ext/Extension.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- java/security/x509/ext/Extension.java	1 Oct 2005 18:48:46 -0000	1.5
+++ java/security/x509/ext/Extension.java	11 Jun 2006 12:14:44 -0000	1.6
@@ -38,6 +38,7 @@
 
 package gnu.java.security.x509.ext;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERReader;
@@ -48,20 +49,11 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.logging.Logger;
 
 public class Extension
 {
-
-  // Fields.
-  // -------------------------------------------------------------------------
-
-  private static final boolean DEBUG = false;
-  private static void debug(String msg)
-  {
-    System.err.print(">> Extension: ");
-    System.err.println(msg);
-  }
-
+  private static final Logger log = Logger.getLogger(Extension.class.getName());
   /**
    * This extension's object identifier.
    */
@@ -97,7 +89,8 @@
 
     // Extension ::= SEQUENCE {
     DERValue val = der.read();
-    if (DEBUG) debug("read val  tag == " + val.getTag() + " len == " + val.getLength());
+    if (Configuration.DEBUG)
+      log.fine("read val  tag == " + val.getTag() + " len == " + val.getLength());
     if (!val.isConstructed())
       throw new IOException("malformed Extension");
 
@@ -106,7 +99,8 @@
     if (val.getTag() != DER.OBJECT_IDENTIFIER)
       throw new IOException("expecting OBJECT IDENTIFIER");
     oid = (OID) val.getValue();
-    if (DEBUG) debug("read oid == " + oid);
+    if (Configuration.DEBUG)
+      log.fine("read oid == " + oid);
 
     //   critical  BOOLEAN DEFAULT FALSE,
     val = der.read();
@@ -117,7 +111,8 @@
       }
     else
       critical = false;
-    if (DEBUG) debug("is critical == " + critical);
+    if (Configuration.DEBUG)
+      log.fine("is critical == " + critical);
 
     //   extnValue OCTET STRING }
     if (val.getTag() != DER.OCTET_STRING)
@@ -181,7 +176,8 @@
         value = new Value(encval);
         isSupported = false;
       }
-    if (DEBUG) debug("read value == " + value);
+    if (Configuration.DEBUG)
+      log.fine("read value == " + value);
   }
 
   public Extension (final OID oid, final Value value, final boolean critical)

Index: javax/crypto/sasl/srp/SRPServer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- javax/crypto/sasl/srp/SRPServer.java	13 Apr 2006 21:07:03 -0000	1.3
+++ javax/crypto/sasl/srp/SRPServer.java	11 Jun 2006 12:14:44 -0000	1.4
@@ -38,18 +38,18 @@
 
 package gnu.javax.crypto.sasl.srp;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.PRNG;
 import gnu.java.security.util.Util;
-
 import gnu.javax.crypto.assembly.Direction;
 import gnu.javax.crypto.cipher.CipherFactory;
 import gnu.javax.crypto.cipher.IBlockCipher;
 import gnu.javax.crypto.key.IKeyAgreementParty;
-import gnu.javax.crypto.key.KeyAgreementFactory;
+import gnu.javax.crypto.key.IncomingMessage;
 import gnu.javax.crypto.key.KeyAgreementException;
+import gnu.javax.crypto.key.KeyAgreementFactory;
 import gnu.javax.crypto.key.OutgoingMessage;
-import gnu.javax.crypto.key.IncomingMessage;
 import gnu.javax.crypto.key.srp6.SRP6KeyAgreement;
 import gnu.javax.crypto.sasl.IllegalMechanismStateException;
 import gnu.javax.crypto.sasl.InputBuffer;
@@ -57,114 +57,55 @@
 import gnu.javax.crypto.sasl.OutputBuffer;
 import gnu.javax.crypto.sasl.ServerMechanism;
 
-import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.StringTokenizer;
+import java.util.logging.Logger;
 
 import javax.security.sasl.AuthenticationException;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
 
 /**
- * <p>The SASL-SRP server-side mechanism.</p>
+ * The SASL-SRP server-side mechanism.
  */
 public class SRPServer extends ServerMechanism implements SaslServer
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "SRPServer";
-
-  //   private static final String ERROR = "ERROR";
-  private static final String WARN = " WARN";
-
-  private static final String INFO = " INFO";
-
-  private static final String TRACE = "DEBUG";
-
-  private static final boolean DEBUG = true;
-
-  private static final int debuglevel = 3;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(final String level, final Object obj)
-  {
-    err.println("[" + level + "] " + NAME + ": " + String.valueOf(obj));
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(SRPServer.class.getName());
   private String U = null; // client's username
-
   private BigInteger N, g, A, B;
-
   private byte[] s; // salt
-
   private byte[] cIV, sIV; // client+server IVs, when confidentiality is on
-
   private byte[] cn, sn; // client's and server's nonce
-
   private SRP srp; // SRP algorithm instance used by this server
-
   private byte[] sid; // session ID when re-used
-
   private int ttl = 360; // session time-to-live in seconds
-
   private byte[] cCB; // peer's channel binding'
-
   private String mandatory; // List of available options
-
   private String L = null;
-
   private String o;
-
   private String chosenIntegrityAlgorithm;
-
   private String chosenConfidentialityAlgorithm;
-
   private int rawSendSize = Registry.SASL_BUFFER_MAX_LIMIT;
-
   private byte[] K; // shared session key
-
   private boolean replayDetection = true; // whether Replay Detection is on
-
   private int inCounter = 0; // messages sequence numbers
-
   private int outCounter = 0;
-
   private IALG inMac, outMac; // if !null, use for integrity
-
   private CALG inCipher, outCipher; // if !null, use for confidentiality
-
   private IKeyAgreementParty serverHandler = KeyAgreementFactory.getPartyBInstance(Registry.SRP_SASL_KA);
-
   /** Our default source of randomness. */
   private PRNG prng = null;
 
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   public SRPServer()
   {
     super(Registry.SASL_SRP_MECHANISM);
   }
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
-
-  // abstract methods implementation -----------------------------------------
-
   protected void initMechanism() throws SaslException
   {
     // TODO:
@@ -187,21 +128,18 @@
     sid = null;
   }
 
-  // javax.security.sasl.SaslServer interface implementation -----------------
-
   public byte[] evaluateResponse(final byte[] response) throws SaslException
   {
     switch (state)
       {
       case 0:
         if (response == null)
-          {
             return null;
-          }
+
         state++;
         return sendProtocolElements(response);
       case 1:
-        if (!complete)
+        if (! complete)
           {
             state++;
             return sendEvidence(response);
@@ -215,65 +153,15 @@
   protected byte[] engineUnwrap(final byte[] incoming, final int offset,
                                 final int len) throws SaslException
   {
-    //      if (DEBUG && debuglevel > 8) debug(TRACE, "==> engineUnwrap()");
-    //
-    //      if (inMac == null && inCipher == null) {
-    //         throw new IllegalStateException("connection is not protected");
-    //      }
-    //
-    //      if (DEBUG && debuglevel > 6) debug(TRACE, "Incoming buffer (before security): "+Util.dumpString(incoming, offset, len));
-    //
-    //      byte[] data = null;
-    //      try {
-    //         InputBuffer frameIn = InputBuffer.getInstance(incoming, offset, len);
-    //         data = frameIn.getEOS();
-    //         if (inMac != null) {
-    //            byte[] received_mac = frameIn.getOS();
-    //            if (DEBUG && debuglevel > 6) debug(TRACE, "Got C (received MAC): "+Util.dumpString(received_mac));
-    //            inMac.update(data);
-    //            if (replayDetection) {
-    //               inCounter++;
-    //               if (DEBUG && debuglevel > 6) debug(TRACE, "inCounter="+String.valueOf(inCounter));
-    //               inMac.update(new byte[] {
-    //                  (byte)(inCounter >>> 24),
-    //                  (byte)(inCounter >>> 16),
-    //                  (byte)(inCounter >>>  8),
-    //                  (byte) inCounter });
-    //            }
-    //            final byte[] computed_mac = inMac.doFinal();
-    //            if (DEBUG && debuglevel > 6) debug(TRACE, "Computed MAC: "+Util.dumpString(computed_mac));
-    //            if (!Arrays.equals(received_mac, computed_mac))
-    //               throw new IntegrityException("engineUnwrap()");
-    //         }
-    //         if (inCipher != null) {
-    //            data = inCipher.doFinal(data);
-    //         }
-    //       } catch (IOException x) {
-    //          if (x instanceof SaslException) {
-    //             throw (SaslException) x;
-    //          }
-    //          throw new SaslException("engineUnwrap()", x);
-    //       }
-    //
-    //      if (DEBUG && debuglevel > 6) debug(TRACE, "Incoming buffer (after security): "+Util.dumpString(data));
-    //      if (DEBUG && debuglevel > 8) debug(TRACE, "<== engineUnwrap()");
-    //      return data;
-
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> engineUnwrap()");
-
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "engineUnwrap");
     if (inMac == null && inCipher == null)
-      {
         throw new IllegalStateException("connection is not protected");
-      }
-
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Incoming buffer (before security): "
+    if (Configuration.DEBUG)
+      log.fine("Incoming buffer (before security): "
                    + Util.dumpString(incoming, offset, len));
-
     // at this point one, or both, of confidentiality and integrity protection
     // services are active.
-
     final byte[] result;
     try
       {
@@ -284,137 +172,67 @@
             final byte[] received_mac = new byte[macBytesCount];
             System.arraycopy(incoming, offset + payloadLength, received_mac, 0,
                              macBytesCount);
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Got C (received MAC): "
-                           + Util.dumpString(received_mac));
+            if (Configuration.DEBUG)
+              log.fine("Got C (received MAC): " + Util.dumpString(received_mac));
             inMac.update(incoming, offset, payloadLength);
             if (replayDetection)
               {
                 inCounter++;
-                if (DEBUG && debuglevel > 6)
-                  debug(TRACE, "inCounter=" + String.valueOf(inCounter));
-                inMac.update(new byte[] { (byte) (inCounter >>> 24),
-                                         (byte) (inCounter >>> 16),
-                                         (byte) (inCounter >>> 8),
+                if (Configuration.DEBUG)
+                  log.fine("inCounter=" + String.valueOf(inCounter));
+                inMac.update(new byte[] { (byte)(inCounter >>> 24),
+                                          (byte)(inCounter >>> 16),
+                                          (byte)(inCounter >>> 8),
                                          (byte) inCounter });
               }
-
             final byte[] computed_mac = inMac.doFinal();
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Computed MAC: " + Util.dumpString(computed_mac));
+            if (Configuration.DEBUG)
+              log.fine("Computed MAC: " + Util.dumpString(computed_mac));
             if (!Arrays.equals(received_mac, computed_mac))
-              {
                 throw new IntegrityException("engineUnwrap()");
-              }
 
             // deal with the payload, which can be either plain or encrypted
             if (inCipher != null)
-              {
                 result = inCipher.doFinal(incoming, offset, payloadLength);
-              }
             else
               {
                 result = new byte[payloadLength];
                 System.arraycopy(incoming, offset, result, 0, result.length);
               }
           }
-        else
-          { // no integrity protection; just confidentiality
-          //            if (inCipher != null) {
+        else // no integrity protection; just confidentiality
             result = inCipher.doFinal(incoming, offset, len);
-            //            } else {
-            //               result = new byte[len];
-            //               System.arraycopy(incoming, offset, result, 0, len);
-            //            }
-          }
       }
     catch (IOException x)
       {
         if (x instanceof SaslException)
-          {
             throw (SaslException) x;
-          }
         throw new SaslException("engineUnwrap()", x);
       }
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Incoming buffer (after security): "
-                   + Util.dumpString(result));
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "<== engineUnwrap()");
+    if (Configuration.DEBUG)
+      {
+        log.fine("Incoming buffer (after security): " + Util.dumpString(result));
+        log.exiting(this.getClass().getName(), "engineUnwrap");
+      }
     return result;
   }
 
   protected byte[] engineWrap(final byte[] outgoing, final int offset,
                               final int len) throws SaslException
   {
-    //      if (DEBUG && debuglevel > 8) debug(TRACE, "==> engineWrap()");
-    //
-    //      if (outMac == null && outCipher == null) {
-    //         throw new IllegalStateException("connection is not protected");
-    //      }
-    //
-    //      byte[] data = new byte[len];
-    //      System.arraycopy(outgoing, offset, data, 0, len);
-    //
-    //      if (DEBUG && debuglevel > 6) debug(TRACE, "Outgoing buffer (before security) (hex): "+Util.dumpString(data));
-    //      if (DEBUG && debuglevel > 6) debug(TRACE, "Outgoing buffer (before security) (str): \""+new String(data)+"\"");
-    //
-    //      final byte[] result;
-    //      try {
-    //         OutputBuffer frameOut = new OutputBuffer();
-    //         // Process the data
-    //         if (outCipher != null) {
-    //            data = outCipher.doFinal(data);
-    //            if (DEBUG && debuglevel > 6) debug(TRACE, "Encoding c (encrypted plaintext): "+Util.dumpString(data));
-    //         } else {
-    //            if (DEBUG && debuglevel > 6) debug(TRACE, "Encoding p (plaintext): "+Util.dumpString(data));
-    //         }
-    //         frameOut.setEOS(data);
-    //         if (outMac != null) {
-    //            outMac.update(data);
-    //            if (replayDetection) {
-    //               outCounter++;
-    //               if (DEBUG && debuglevel > 6) debug(TRACE, "outCounter="+String.valueOf(outCounter));
-    //               outMac.update(new byte[] {
-    //                  (byte)(outCounter >>> 24),
-    //                  (byte)(outCounter >>> 16),
-    //                  (byte)(outCounter >>>  8),
-    //                  (byte) outCounter});
-    //            }
-    //            byte[] C = outMac.doFinal();
-    //            frameOut.setOS(C);
-    //            if (DEBUG && debuglevel > 6) debug(TRACE, "Encoding C (integrity checksum): "+Util.dumpString(C));
-    //         }
-    //         result = frameOut.wrap();
-    //
-    //      } catch (IOException x) {
-    //         if (x instanceof SaslException) {
-    //            throw (SaslException) x;
-    //         }
-    //         throw new SaslException("engineWrap()", x);
-    //      }
-    //
-    //      if (DEBUG && debuglevel > 8) debug(TRACE, "<== engineWrap()");
-    //      return result;
-
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> engineWrap()");
-
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "engineWrap");
     if (outMac == null && outCipher == null)
-      {
         throw new IllegalStateException("connection is not protected");
-      }
-
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Outgoing buffer (before security) (hex): "
+    if (Configuration.DEBUG)
+      {
+        log.fine("Outgoing buffer (before security) (hex): "
                    + Util.dumpString(outgoing, offset, len));
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Outgoing buffer (before security) (str): \""
+        log.fine("Outgoing buffer (before security) (str): \""
                    + new String(outgoing, offset, len) + "\"");
-
+      }
     // at this point one, or both, of confidentiality and integrity protection
     // services are active.
-
     byte[] result;
     try
       {
@@ -422,74 +240,62 @@
         if (outCipher != null)
           {
             result = outCipher.doFinal(outgoing, offset, len);
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Encoding c (encrypted plaintext): "
+            if (Configuration.DEBUG)
+              log.fine("Encoding c (encrypted plaintext): "
                            + Util.dumpString(result));
-
             out.write(result);
-
             if (outMac != null)
               {
                 outMac.update(result);
                 if (replayDetection)
                   {
                     outCounter++;
-                    if (DEBUG && debuglevel > 6)
-                      debug(TRACE, "outCounter=" + String.valueOf(outCounter));
-                    outMac.update(new byte[] { (byte) (outCounter >>> 24),
-                                              (byte) (outCounter >>> 16),
-                                              (byte) (outCounter >>> 8),
+                    if (Configuration.DEBUG)
+                      log.fine("outCounter=" + outCounter);
+                    outMac.update(new byte[] { (byte)(outCounter >>> 24),
+                                               (byte)(outCounter >>> 16),
+                                               (byte)(outCounter >>> 8),
                                               (byte) outCounter });
                   }
                 final byte[] C = outMac.doFinal();
                 out.write(C);
-                if (DEBUG && debuglevel > 6)
-                  debug(TRACE, "Encoding C (integrity checksum): "
-                               + Util.dumpString(C));
-              } // else ciphertext only; do nothing
+                if (Configuration.DEBUG)
+                  log.fine("Encoding C (integrity checksum): " + Util.dumpString(C));
           }
-        else
-          { // no confidentiality; just integrity [+ replay detection]
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Encoding p (plaintext): "
+            // else ciphertext only; do nothing
+          }
+        else // no confidentiality; just integrity [+ replay detection]
+          {
+            if (Configuration.DEBUG)
+              log.fine("Encoding p (plaintext): "
                            + Util.dumpString(outgoing, offset, len));
-
             out.write(outgoing, offset, len);
-
-            //            if (outMac != null) {
             outMac.update(outgoing, offset, len);
             if (replayDetection)
               {
                 outCounter++;
-                if (DEBUG && debuglevel > 6)
-                  debug(TRACE, "outCounter=" + String.valueOf(outCounter));
-                outMac.update(new byte[] { (byte) (outCounter >>> 24),
-                                          (byte) (outCounter >>> 16),
-                                          (byte) (outCounter >>> 8),
+                if (Configuration.DEBUG)
+                  log.fine("outCounter=" + outCounter);
+                outMac.update(new byte[] { (byte)(outCounter >>> 24),
+                                           (byte)(outCounter >>> 16),
+                                           (byte)(outCounter >>> 8),
                                           (byte) outCounter });
               }
             final byte[] C = outMac.doFinal();
             out.write(C);
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Encoding C (integrity checksum): "
-                           + Util.dumpString(C));
-            //            } // else plaintext only; do nothing
+            if (Configuration.DEBUG)
+              log.fine("Encoding C (integrity checksum): " + Util.dumpString(C));
           }
-
         result = out.toByteArray();
-
       }
     catch (IOException x)
       {
         if (x instanceof SaslException)
-          {
             throw (SaslException) x;
-          }
         throw new SaslException("engineWrap()", x);
       }
-
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "<== engineWrap()");
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "engineWrap");
     return result;
   }
 
@@ -498,14 +304,10 @@
     if (inMac != null)
       {
         if (inCipher != null)
-          {
             return Registry.QOP_AUTH_CONF;
-          }
-        else
-          {
+
             return Registry.QOP_AUTH_INT;
           }
-      }
     return Registry.QOP_AUTH;
   }
 
@@ -514,14 +316,10 @@
     if (inMac != null)
       {
         if (inCipher != null)
-          {
             return Registry.STRENGTH_HIGH;
-          }
-        else
-          {
+
             return Registry.STRENGTH_MEDIUM;
           }
-      }
     return Registry.STRENGTH_LOW;
   }
 
@@ -535,45 +333,39 @@
     return Registry.REUSE_TRUE;
   }
 
-  // other methods -----------------------------------------------------------
-
   private byte[] sendProtocolElements(final byte[] input) throws SaslException
   {
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> sendProtocolElements()");
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "C: " + Util.dumpString(input));
-
+    if (Configuration.DEBUG)
+      {
+        log.entering(this.getClass().getName(), "sendProtocolElements");
+        log.fine("C: " + Util.dumpString(input));
+      }
     // Client send U, I, sid, cn
     final InputBuffer frameIn = new InputBuffer(input);
     try
       {
         U = frameIn.getText(); // Extract username
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got U (username): \"" + U + "\"");
+        if (Configuration.DEBUG)
+          log.fine("Got U (username): \"" + U + "\"");
         authorizationID = frameIn.getText(); // Extract authorisation ID
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got I (userid): \"" + authorizationID + "\"");
+        if (Configuration.DEBUG)
+          log.fine("Got I (userid): \"" + authorizationID + "\"");
         sid = frameIn.getEOS();
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got sid (session ID): " + new String(sid));
+        if (Configuration.DEBUG)
+          log.fine("Got sid (session ID): " + new String(sid));
         cn = frameIn.getOS();
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got cn (client nonce): " + Util.dumpString(cn));
+        if (Configuration.DEBUG)
+          log.fine("Got cn (client nonce): " + Util.dumpString(cn));
         cCB = frameIn.getEOS();
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got cCB (client channel binding): "
-                       + Util.dumpString(cCB));
+        if (Configuration.DEBUG)
+          log.fine("Got cCB (client channel binding): " + Util.dumpString(cCB));
       }
     catch (IOException x)
       {
         if (x instanceof SaslException)
-          {
             throw (SaslException) x;
-          }
         throw new AuthenticationException("sendProtocolElements()", x);
       }
-
     // do/can we re-use?
     if (ServerStore.instance().isAlive(sid))
       {
@@ -589,15 +381,11 @@
         outMac = ctx.getOutMac();
         inCipher = ctx.getInCipher();
         outCipher = ctx.getOutCipher();
-
         if (sn == null || sn.length != 16)
-          {
             sn = new byte[16];
-          }
-        getDefaultPRNG().nextBytes(sn);
 
+        getDefaultPRNG().nextBytes(sn);
         setupSecurityServices(false);
-
         final OutputBuffer frameOut = new OutputBuffer();
         try
           {
@@ -608,34 +396,27 @@
         catch (IOException x)
           {
             if (x instanceof SaslException)
-              {
                 throw (SaslException) x;
-              }
             throw new AuthenticationException("sendProtocolElements()", x);
           }
         final byte[] result = frameOut.encode();
-        if (DEBUG && debuglevel > 8)
-          debug(TRACE, "<== sendProtocolElements()");
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "Old session...");
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "S: " + Util.dumpString(result));
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "  sn = " + Util.dumpString(sn));
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, " sCB = " + Util.dumpString(channelBinding));
+        if (Configuration.DEBUG)
+          {
+            log.fine("Old session...");
+            log.fine("S: " + Util.dumpString(result));
+            log.fine("  sn = " + Util.dumpString(sn));
+            log.fine(" sCB = " + Util.dumpString(channelBinding));
+            log.exiting(this.getClass().getName(), "sendProtocolElements");
+          }
         return result;
       }
     else
       { // new session
         authenticator.activate(properties);
-
         // -------------------------------------------------------------------
         final HashMap mapB = new HashMap();
-        //         mapB.put(SRP6KeyAgreement.HASH_FUNCTION,    srp.newDigest());
         mapB.put(SRP6KeyAgreement.HASH_FUNCTION, srp.getAlgorithm());
         mapB.put(SRP6KeyAgreement.HOST_PASSWORD_DB, authenticator);
-
         try
           {
             serverHandler.init(mapB);
@@ -643,7 +424,6 @@
             out.writeString(U);
             IncomingMessage in = new IncomingMessage(out.toByteArray());
             out = serverHandler.processMessage(in);
-
             in = new IncomingMessage(out.toByteArray());
             N = in.readMPI();
             g = in.readMPI();
@@ -655,26 +435,22 @@
             throw new SaslException("sendProtocolElements()", x);
           }
         // -------------------------------------------------------------------
-
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Encoding N (modulus): " + Util.dump(N));
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Encoding g (generator): " + Util.dump(g));
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Encoding s (client's salt): " + Util.dumpString(s));
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Encoding B (server ephemeral public key): "
-                       + Util.dump(B));
-
+        if (Configuration.DEBUG)
+          {
+            log.fine("Encoding N (modulus): " + Util.dump(N));
+            log.fine("Encoding g (generator): " + Util.dump(g));
+            log.fine("Encoding s (client's salt): " + Util.dumpString(s));
+            log.fine("Encoding B (server ephemeral public key): " + Util.dump(B));
+          }
         // The server creates an options list (L), which consists of a
         // comma-separated list of option strings that specify the security
         // service options the server supports.
         L = createL();
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Encoding L (available options): \"" + L + "\"");
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Encoding sIV (server IV): " + Util.dumpString(sIV));
-
+        if (Configuration.DEBUG)
+          {
+            log.fine("Encoding L (available options): \"" + L + "\"");
+            log.fine("Encoding sIV (server IV): " + Util.dumpString(sIV));
+          }
         final OutputBuffer frameOut = new OutputBuffer();
         try
           {
@@ -688,69 +464,58 @@
         catch (IOException x)
           {
             if (x instanceof SaslException)
-              {
                 throw (SaslException) x;
-              }
             throw new AuthenticationException("sendProtocolElements()", x);
           }
         final byte[] result = frameOut.encode();
-        if (DEBUG && debuglevel > 8)
-          debug(TRACE, "<== sendProtocolElements()");
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "New session...");
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "S: " + Util.dumpString(result));
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "   N = 0x" + N.toString(16));
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "   g = 0x" + g.toString(16));
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "   s = " + Util.dumpString(s));
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "   B = 0x" + B.toString(16));
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "   L = " + L);
+        if (Configuration.DEBUG)
+          {
+            log.fine("New session...");
+            log.fine("S: " + Util.dumpString(result));
+            log.fine("   N = 0x" + N.toString(16));
+            log.fine("   g = 0x" + g.toString(16));
+            log.fine("   s = " + Util.dumpString(s));
+            log.fine("   B = 0x" + B.toString(16));
+            log.fine("   L = " + L);
+            log.exiting(this.getClass().getName(), "sendProtocolElements");
+          }
         return result;
       }
   }
 
   private byte[] sendEvidence(final byte[] input) throws SaslException
   {
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> sendEvidence()");
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "C: " + Util.dumpString(input));
-
+    if (Configuration.DEBUG)
+      {
+        log.entering(this.getClass().getName(), "sendEvidence");
+        log.fine("C: " + Util.dumpString(input));
+      }
     // Client send A, M1, o, cIV
     final InputBuffer frameIn = new InputBuffer(input);
     final byte[] M1;
     try
       {
         A = frameIn.getMPI(); // Extract client's ephemeral public key
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got A (client ephemeral public key): " + Util.dump(A));
+        if (Configuration.DEBUG)
+          log.fine("Got A (client ephemeral public key): " + Util.dump(A));
         M1 = frameIn.getOS(); // Extract evidence
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got M1 (client evidence): " + Util.dumpString(M1));
+        if (Configuration.DEBUG)
+          log.fine("Got M1 (client evidence): " + Util.dumpString(M1));
         o = frameIn.getText(); // Extract client's options list
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got o (client chosen options): \"" + o + "\"");
+        if (Configuration.DEBUG)
+          log.fine("Got o (client chosen options): \"" + o + "\"");
         cIV = frameIn.getOS(); // Extract client's IV
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got cIV (client IV): " + Util.dumpString(cIV));
+        if (Configuration.DEBUG)
+          log.fine("Got cIV (client IV): " + Util.dumpString(cIV));
       }
     catch (IOException x)
       {
         if (x instanceof SaslException)
-          {
             throw (SaslException) x;
-          }
         throw new AuthenticationException("sendEvidence()", x);
       }
-
     // Parse client's options and set security layer variables
     parseO(o);
-
     // ----------------------------------------------------------------------
     try
       {
@@ -765,10 +530,8 @@
         throw new SaslException("sendEvidence()", x);
       }
     // ----------------------------------------------------------------------
-
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "K: " + Util.dumpString(K));
-
+    if (Configuration.DEBUG)
+      log.fine("K: " + Util.dumpString(K));
     final byte[] expected;
     try
       {
@@ -779,15 +542,11 @@
       {
         throw new AuthenticationException("sendEvidence()", x);
       }
-
     // Verify client evidence
     if (!Arrays.equals(M1, expected))
-      {
         throw new AuthenticationException("M1 mismatch");
-      }
 
     setupSecurityServices(true);
-
     final byte[] M2;
     try
       {
@@ -798,7 +557,6 @@
       {
         throw new AuthenticationException("sendEvidence()", x);
       }
-
     final OutputBuffer frameOut = new OutputBuffer();
     try
       {
@@ -811,93 +569,71 @@
     catch (IOException x)
       {
         if (x instanceof SaslException)
-          {
             throw (SaslException) x;
-          }
         throw new AuthenticationException("sendEvidence()", x);
       }
     final byte[] result = frameOut.encode();
-    if (DEBUG && debuglevel > 2)
-      debug(INFO, "S: " + Util.dumpString(result));
-    if (DEBUG && debuglevel > 2)
-      debug(INFO, "  M2 = " + Util.dumpString(M2));
-    if (DEBUG && debuglevel > 2)
-      debug(INFO, " sIV = " + Util.dumpString(sIV));
-    if (DEBUG && debuglevel > 2)
-      debug(INFO, " sid = " + new String(sid));
-    if (DEBUG && debuglevel > 2)
-      debug(INFO, " ttl = " + ttl);
-    if (DEBUG && debuglevel > 2)
-      debug(INFO, " sCB = " + Util.dumpString(channelBinding));
-
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "<== sendEvidence()");
+    if (Configuration.DEBUG)
+      {
+        log.fine("S: " + Util.dumpString(result));
+        log.fine("  M2 = " + Util.dumpString(M2));
+        log.fine(" sIV = " + Util.dumpString(sIV));
+        log.fine(" sid = " + new String(sid));
+        log.fine(" ttl = " + ttl);
+        log.fine(" sCB = " + Util.dumpString(channelBinding));
+        log.exiting(this.getClass().getName(), "sendEvidence");
+      }
     return result;
   }
 
   private String createL()
   {
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> createL()");
-
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "createL()");
     String s = (String) properties.get(SRPRegistry.SRP_MANDATORY);
     if (s == null)
-      {
         s = SRPRegistry.DEFAULT_MANDATORY;
-      }
-    if (!SRPRegistry.MANDATORY_NONE.equals(s)
-        && !SRPRegistry.OPTION_REPLAY_DETECTION.equals(s)
-        && !SRPRegistry.OPTION_INTEGRITY.equals(s)
-        && !SRPRegistry.OPTION_CONFIDENTIALITY.equals(s))
-      {
-        if (DEBUG && debuglevel > 4)
-          debug(WARN, "Unrecognised mandatory option (" + s
-                      + "). Using default...");
+
+    if (! SRPRegistry.MANDATORY_NONE.equals(s)
+        && ! SRPRegistry.OPTION_REPLAY_DETECTION.equals(s)
+        && ! SRPRegistry.OPTION_INTEGRITY.equals(s)
+        && ! SRPRegistry.OPTION_CONFIDENTIALITY.equals(s))
+      {
+        if (Configuration.DEBUG)
+          log.fine("Unrecognised mandatory option (" + s + "). Using default...");
         s = SRPRegistry.DEFAULT_MANDATORY;
       }
-
     mandatory = s;
-
     s = (String) properties.get(SRPRegistry.SRP_CONFIDENTIALITY);
     final boolean confidentiality = (s == null ? SRPRegistry.DEFAULT_CONFIDENTIALITY
                                               : Boolean.valueOf(s).booleanValue());
-
     s = (String) properties.get(SRPRegistry.SRP_INTEGRITY_PROTECTION);
     boolean integrity = (s == null ? SRPRegistry.DEFAULT_INTEGRITY
                                   : Boolean.valueOf(s).booleanValue());
-
     s = (String) properties.get(SRPRegistry.SRP_REPLAY_DETECTION);
     final boolean replayDetection = (s == null ? SRPRegistry.DEFAULT_REPLAY_DETECTION
                                               : Boolean.valueOf(s).booleanValue());
-
     final StringBuffer sb = new StringBuffer();
-    sb.append(SRPRegistry.OPTION_SRP_DIGEST).append("=").append(
-                                                                srp.getAlgorithm()).append(
-                                                                                           ",");
+    sb.append(SRPRegistry.OPTION_SRP_DIGEST).append("=")
+      .append(srp.getAlgorithm()).append(",");
+
+    if (! SRPRegistry.MANDATORY_NONE.equals(mandatory))
+      sb.append(SRPRegistry.OPTION_MANDATORY)
+        .append("=").append(mandatory).append(",");
 
-    if (!SRPRegistry.MANDATORY_NONE.equals(mandatory))
-      {
-        sb.append(SRPRegistry.OPTION_MANDATORY).append("=").append(mandatory).append(
-                                                                                     ",");
-      }
     if (replayDetection)
       {
         sb.append(SRPRegistry.OPTION_REPLAY_DETECTION).append(",");
         // if replay detection is on then force integrity protection
         integrity = true;
       }
-
     int i;
     if (integrity)
       {
         for (i = 0; i < SRPRegistry.INTEGRITY_ALGORITHMS.length; i++)
-          {
-            sb.append(SRPRegistry.OPTION_INTEGRITY).append("=").append(
-                                                                       SRPRegistry.INTEGRITY_ALGORITHMS[i]).append(
-                                                                                                                   ",");
-          }
+          sb.append(SRPRegistry.OPTION_INTEGRITY).append("=")
+            .append(SRPRegistry.INTEGRITY_ALGORITHMS[i]).append(",");
       }
-
     if (confidentiality)
       {
         IBlockCipher cipher;
@@ -905,19 +641,15 @@
           {
             cipher = CipherFactory.getInstance(SRPRegistry.CONFIDENTIALITY_ALGORITHMS[i]);
             if (cipher != null)
-              {
-                sb.append(SRPRegistry.OPTION_CONFIDENTIALITY).append("=").append(
-                                                                                 SRPRegistry.CONFIDENTIALITY_ALGORITHMS[i]).append(
-                                                                                                                                   ",");
-              }
+              sb.append(SRPRegistry.OPTION_CONFIDENTIALITY).append("=")
+                .append(SRPRegistry.CONFIDENTIALITY_ALGORITHMS[i]).append(",");
           }
       }
-
-    final String result = sb.append(SRPRegistry.OPTION_MAX_BUFFER_SIZE).append(
-                                                                               "=").append(
-                                                                                           Registry.SASL_BUFFER_MAX_LIMIT).toString();
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "<== createL()");
+    final String result = sb.append(SRPRegistry.OPTION_MAX_BUFFER_SIZE)
+                            .append("=").append(Registry.SASL_BUFFER_MAX_LIMIT)
+                            .toString();
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "createL");
     return result;
   }
 
@@ -934,24 +666,18 @@
     while (st.hasMoreTokens())
       {
         option = st.nextToken();
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "option: <" + option + ">");
+        if (Configuration.DEBUG)
+          log.fine("option: <" + option + ">");
         if (option.equals(SRPRegistry.OPTION_REPLAY_DETECTION))
-          {
             replayDetection = true;
-          }
         else if (option.startsWith(SRPRegistry.OPTION_INTEGRITY + "="))
           {
             if (integrity)
-              {
-                throw new AuthenticationException(
-                                                  "Only one integrity algorithm may be chosen");
-              }
-            else
-              {
+              throw new AuthenticationException("Only one integrity algorithm may be chosen");
+
                 option = option.substring(option.indexOf('=') + 1);
-                if (DEBUG && debuglevel > 6)
-                  debug(TRACE, "algorithm: <" + option + ">");
+            if (Configuration.DEBUG)
+              log.fine("algorithm: <" + option + ">");
                 for (i = 0; i < SRPRegistry.INTEGRITY_ALGORITHMS.length; i++)
                   {
                     if (SRPRegistry.INTEGRITY_ALGORITHMS[i].equals(option))
@@ -961,26 +687,18 @@
                         break;
                       }
                   }
-                if (!integrity)
-                  {
-                    throw new AuthenticationException(
-                                                      "Unknown integrity algorithm: "
+            if (! integrity)
+              throw new AuthenticationException("Unknown integrity algorithm: "
                                                           + option);
                   }
-              }
-          }
         else if (option.startsWith(SRPRegistry.OPTION_CONFIDENTIALITY + "="))
           {
             if (confidentiality)
-              {
-                throw new AuthenticationException(
-                                                  "Only one confidentiality algorithm may be chosen");
-              }
-            else
-              {
+              throw new AuthenticationException("Only one confidentiality algorithm may be chosen");
+
                 option = option.substring(option.indexOf('=') + 1);
-                if (DEBUG && debuglevel > 6)
-                  debug(TRACE, "algorithm: <" + option + ">");
+            if (Configuration.DEBUG)
+              log.fine("algorithm: <" + option + ">");
                 for (i = 0; i < SRPRegistry.CONFIDENTIALITY_ALGORITHMS.length; i++)
                   {
                     if (SRPRegistry.CONFIDENTIALITY_ALGORITHMS[i].equals(option))
@@ -990,14 +708,10 @@
                         break;
                       }
                   }
-                if (!confidentiality)
-                  {
-                    throw new AuthenticationException(
-                                                      "Unknown confidentiality algorithm: "
+            if (! confidentiality)
+              throw new AuthenticationException("Unknown confidentiality algorithm: "
                                                           + option);
                   }
-              }
-          }
         else if (option.startsWith(SRPRegistry.OPTION_MAX_BUFFER_SIZE + "="))
           {
             final String maxBufferSize = option.substring(option.indexOf('=') + 1);
@@ -1006,71 +720,49 @@
                 rawSendSize = Integer.parseInt(maxBufferSize);
                 if (rawSendSize > Registry.SASL_BUFFER_MAX_LIMIT
                     || rawSendSize < 1)
-                  throw new AuthenticationException(
-                                                    "Illegal value for 'maxbuffersize' option");
+                  throw new AuthenticationException("Illegal value for 'maxbuffersize' option");
               }
             catch (NumberFormatException x)
               {
-                throw new AuthenticationException(
-                                                  SRPRegistry.OPTION_MAX_BUFFER_SIZE
-                                                      + "="
-                                                      + String.valueOf(maxBufferSize),
+                throw new AuthenticationException(SRPRegistry.OPTION_MAX_BUFFER_SIZE
+                                                  + "=" + maxBufferSize,
                                                   x);
               }
           }
       }
-
     // check if client did the right thing
     if (replayDetection)
       {
-        if (!integrity)
-          {
-            throw new AuthenticationException(
-                                              "Missing integrity protection algorithm "
+        if (! integrity)
+          throw new AuthenticationException("Missing integrity protection algorithm "
                                                   + "but replay detection is chosen");
           }
-      }
     if (mandatory.equals(SRPRegistry.OPTION_REPLAY_DETECTION))
       {
-        if (!replayDetection)
-          {
-            throw new AuthenticationException(
-                                              "Replay detection is mandatory but was not chosen");
-          }
+        if (! replayDetection)
+          throw new AuthenticationException("Replay detection is mandatory but was not chosen");
       }
     if (mandatory.equals(SRPRegistry.OPTION_INTEGRITY))
       {
-        if (!integrity)
-          {
-            throw new AuthenticationException(
-                                              "Integrity protection is mandatory but was not chosen");
-          }
+        if (! integrity)
+          throw new AuthenticationException("Integrity protection is mandatory but was not chosen");
       }
     if (mandatory.equals(SRPRegistry.OPTION_CONFIDENTIALITY))
       {
-        if (!confidentiality)
-          {
-            throw new AuthenticationException(
-                                              "Confidentiality is mandatory but was not chosen");
-          }
+        if (! confidentiality)
+          throw new AuthenticationException("Confidentiality is mandatory but was not chosen");
       }
-
     int blockSize = 0;
     if (chosenConfidentialityAlgorithm != null)
       {
         final IBlockCipher cipher = CipherFactory.getInstance(chosenConfidentialityAlgorithm);
         if (cipher != null)
-          {
             blockSize = cipher.defaultBlockSize();
-          }
-        else
-          { // should not happen
+        else // should not happen
             throw new AuthenticationException("Confidentiality algorithm ("
                                               + chosenConfidentialityAlgorithm
                                               + ") not available");
           }
-      }
-
     sIV = new byte[blockSize];
     if (blockSize > 0)
       getDefaultPRNG().nextBytes(sIV);
@@ -1086,30 +778,26 @@
         // instantiate cipher if confidentiality protection filter is active
         if (chosenConfidentialityAlgorithm != null)
           {
-            if (DEBUG && debuglevel > 2)
-              debug(INFO, "Activating confidentiality protection filter");
+            if (Configuration.DEBUG)
+              log.fine("Activating confidentiality protection filter");
             inCipher = CALG.getInstance(chosenConfidentialityAlgorithm);
             outCipher = CALG.getInstance(chosenConfidentialityAlgorithm);
           }
         // instantiate hmacs if integrity protection filter is active
         if (chosenIntegrityAlgorithm != null)
           {
-            if (DEBUG && debuglevel > 2)
-              debug(INFO, "Activating integrity protection filter");
+            if (Configuration.DEBUG)
+              log.fine("Activating integrity protection filter");
             inMac = IALG.getInstance(chosenIntegrityAlgorithm);
             outMac = IALG.getInstance(chosenIntegrityAlgorithm);
           }
-
         // generate a new sid if at least integrity is used
         sid = (inMac != null ? ServerStore.getNewSessionID() : new byte[0]);
       }
-    else
-      { // same session new keys
+    else // same session new keys
         K = srp.generateKn(K, cn, sn);
-      }
 
     final KDF kdf = KDF.getInstance(K);
-
     // initialise in/out ciphers if confidentaility protection is used
     if (inCipher != null)
       {
@@ -1122,15 +810,12 @@
         outMac.init(kdf);
         inMac.init(kdf);
       }
-
     if (sid != null && sid.length != 0)
       { // update the security context and save in map
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "Updating security context for sid = " + new String(sid));
-        ServerStore.instance().cacheSession(
-                                            ttl,
-                                            new SecurityContext(
-                                                                srp.getAlgorithm(),
+        if (Configuration.DEBUG)
+          log.fine("Updating security context for sid = " + new String(sid));
+        ServerStore.instance().cacheSession(ttl,
+                                            new SecurityContext(srp.getAlgorithm(),
                                                                 sid,
                                                                 K,
                                                                 cIV,

Index: javax/crypto/sasl/srp/SRPClient.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/sasl/srp/SRPClient.java	3 Feb 2006 19:29:01 -0000	1.2
+++ javax/crypto/sasl/srp/SRPClient.java	11 Jun 2006 12:14:44 -0000	1.3
@@ -38,147 +38,84 @@
 
 package gnu.javax.crypto.sasl.srp;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.hash.MD5;
 import gnu.java.security.util.PRNG;
 import gnu.java.security.util.Util;
-
+import gnu.javax.crypto.assembly.Direction;
+import gnu.javax.crypto.cipher.CipherFactory;
+import gnu.javax.crypto.cipher.IBlockCipher;
 import gnu.javax.crypto.key.IKeyAgreementParty;
 import gnu.javax.crypto.key.IncomingMessage;
-import gnu.javax.crypto.key.KeyAgreementFactory;
 import gnu.javax.crypto.key.KeyAgreementException;
+import gnu.javax.crypto.key.KeyAgreementFactory;
 import gnu.javax.crypto.key.OutgoingMessage;
 import gnu.javax.crypto.key.srp6.SRP6KeyAgreement;
-import gnu.javax.crypto.assembly.Direction;
-import gnu.javax.crypto.cipher.CipherFactory;
-import gnu.javax.crypto.cipher.IBlockCipher;
 import gnu.javax.crypto.sasl.ClientMechanism;
 import gnu.javax.crypto.sasl.IllegalMechanismStateException;
 import gnu.javax.crypto.sasl.InputBuffer;
 import gnu.javax.crypto.sasl.IntegrityException;
 import gnu.javax.crypto.sasl.OutputBuffer;
-
 import gnu.javax.security.auth.Password;
 
-import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.StringTokenizer;
+import java.util.logging.Logger;
 
+import javax.security.auth.DestroyFailedException;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.DestroyFailedException;
 import javax.security.sasl.AuthenticationException;
 import javax.security.sasl.SaslClient;
 import javax.security.sasl.SaslException;
 
 /**
- * <p>The SASL-SRP client-side mechanism.</p>
+ * The SASL-SRP client-side mechanism.
  */
 public class SRPClient extends ClientMechanism implements SaslClient
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "SRPClient";
-
-  //   private static final String ERROR = "ERROR";
-  //   private static final String WARN =  " WARN";
-  private static final String INFO = " INFO";
-
-  private static final String TRACE = "DEBUG";
-
-  private static final boolean DEBUG = true;
-
-  private static final int debuglevel = 3;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(final String level, final Object obj)
-  {
-    err.println("[" + level + "] " + NAME + ": " + String.valueOf(obj));
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  //   private static final HashMap uid2ctx = new HashMap();
-
+  private static final Logger log = Logger.getLogger(SRPClient.class.getName());
   private String uid; // the unique key for this type of client
-
   private String U; // the authentication identity
-
   BigInteger N, g, A, B;
-
   private Password password; // the authentication credentials
-
   private byte[] s; // the user's salt
-
   private byte[] cIV, sIV; // client+server IVs, when confidentiality is on
-
   private byte[] M1, M2; // client+server evidences
-
   private byte[] cn, sn; // client's and server's nonce
-
   private SRP srp; // SRP algorithm instance used by this client
-
   private byte[] sid; // session ID when re-used
-
   private int ttl; // session time-to-live in seconds
-
   private byte[] sCB; // the peer's channel binding data
-
   private String L; // available options
-
   private String o;
-
   private String chosenIntegrityAlgorithm;
-
   private String chosenConfidentialityAlgorithm;
-
   private int rawSendSize = Registry.SASL_BUFFER_MAX_LIMIT;
-
   private byte[] K; // shared session key
-
   private boolean replayDetection = true; // whether Replay Detection is on
-
   private int inCounter = 0; // messages sequence numbers
-
   private int outCounter = 0;
-
   private IALG inMac, outMac; // if !null, use for integrity
-
   private CALG inCipher, outCipher; // if !null, use for confidentiality
-
   private IKeyAgreementParty clientHandler = KeyAgreementFactory.getPartyAInstance(Registry.SRP_SASL_KA);
-
   /** Our default source of randomness. */
   private PRNG prng = null;
 
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   public SRPClient()
   {
     super(Registry.SASL_SRP_MECHANISM);
   }
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
-
-  // abstract methods implementation -----------------------------------------
-
   protected void initMechanism() throws SaslException
   {
     // we shall keep track of the sid (and the security context of this
@@ -195,9 +132,8 @@
     b = protocol.getBytes();
     md.update(b, 0, b.length);
     if (channelBinding.length > 0)
-      {
         md.update(channelBinding, 0, channelBinding.length);
-      }
+
     uid = Util.toBase64(md.digest());
     if (ClientStore.instance().isAlive(uid))
       {
@@ -253,8 +189,6 @@
     sn = null;
   }
 
-  // javax.security.sasl.SaslClient interface implementation -----------------
-
   public boolean hasInitialResponse()
   {
     return true;
@@ -282,7 +216,7 @@
           }
         return result;
       case 2: // should only occur if session re-use was rejected
-        if (!complete)
+        if (! complete)
           {
             state++;
             return receiveEvidence(challenge);
@@ -296,22 +230,15 @@
   protected byte[] engineUnwrap(final byte[] incoming, final int offset,
                                 final int len) throws SaslException
   {
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> engineUnwrap()");
-
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "engineUnwrap");
     if (inMac == null && inCipher == null)
-      {
         throw new IllegalStateException("connection is not protected");
-      }
-
     // at this point one, or both, of confidentiality and integrity protection
     // services are active.
-
     final byte[] result;
     try
       {
-        //         final InputBuffer frameIn = InputBuffer.getInstance(incoming, offset, len);
-        //         result = frameIn.getEOS();
         if (inMac != null)
           { // integrity bytes are at the end of the stream
             final int macBytesCount = inMac.length();
@@ -320,16 +247,14 @@
             final byte[] received_mac = new byte[macBytesCount];
             System.arraycopy(incoming, offset + payloadLength, received_mac, 0,
                              macBytesCount);
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Got C (received MAC): "
-                           + Util.dumpString(received_mac));
-            //            inMac.update(result);
+            if (Configuration.DEBUG)
+              log.fine("Got C (received MAC): " + Util.dumpString(received_mac));
             inMac.update(incoming, offset, payloadLength);
             if (replayDetection)
               {
                 inCounter++;
-                if (DEBUG && debuglevel > 6)
-                  debug(TRACE, "inCounter=" + String.valueOf(inCounter));
+                if (Configuration.DEBUG)
+                  log.fine("inCounter=" + inCounter);
                 inMac.update(new byte[] { (byte) (inCounter >>> 24),
                                          (byte) (inCounter >>> 16),
                                          (byte) (inCounter >>> 8),
@@ -337,170 +262,106 @@
               }
 
             final byte[] computed_mac = inMac.doFinal();
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Computed MAC: " + Util.dumpString(computed_mac));
+            if (Configuration.DEBUG)
+              log.fine("Computed MAC: " + Util.dumpString(computed_mac));
             if (!Arrays.equals(received_mac, computed_mac))
-              {
                 throw new IntegrityException("engineUnwrap()");
-              }
-
             // deal with the payload, which can be either plain or encrypted
             if (inCipher != null)
-              {
                 result = inCipher.doFinal(incoming, offset, payloadLength);
-              }
             else
               {
                 result = new byte[len - macBytesCount];
                 System.arraycopy(incoming, offset, result, 0, result.length);
               }
           }
-        else
-          { // no integrity protection; just confidentiality
-          //            if (inCipher != null) {
+        else // no integrity protection; just confidentiality
             result = inCipher.doFinal(incoming, offset, len);
-            //            } else {
-            //               result = new byte[len];
-            //               System.arraycopy(incoming, offset, result, 0, len);
-            //            }
-          }
-        //         if (inCipher != null) {
-        //            result = inCipher.doFinal(result);
-        //         }
       }
     catch (IOException x)
       {
         if (x instanceof SaslException)
-          {
             throw (SaslException) x;
-          }
         throw new SaslException("engineUnwrap()", x);
       }
-
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "<== engineUnwrap()");
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "engineUnwrap");
     return result;
   }
 
   protected byte[] engineWrap(final byte[] outgoing, final int offset,
                               final int len) throws SaslException
   {
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> engineWrap()");
-
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "engineWrap");
     if (outMac == null && outCipher == null)
-      {
         throw new IllegalStateException("connection is not protected");
-      }
-
     // at this point one, or both, of confidentiality and integrity protection
     // services are active.
-
-    //      byte[] data = new byte[len];
-    //      System.arraycopy(outgoing, offset, data, 0, len);
     byte[] result;
     try
       {
-        //         OutputBuffer frameOut = new OutputBuffer();
         final ByteArrayOutputStream out = new ByteArrayOutputStream();
         // Process the data
         if (outCipher != null)
           {
-            //            data = outCipher.doFinal(data);
             result = outCipher.doFinal(outgoing, offset, len);
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Encoding c (encrypted plaintext): "
+            if (Configuration.DEBUG)
+              log.fine("Encoding c (encrypted plaintext): "
                            + Util.dumpString(result));
-
-            //            frameOut.setEOS(data);
             out.write(result);
-
             if (outMac != null)
               {
                 outMac.update(result);
                 if (replayDetection)
                   {
                     outCounter++;
-                    if (DEBUG && debuglevel > 6)
-                      debug(TRACE, "outCounter=" + String.valueOf(outCounter));
-                    outMac.update(new byte[] { (byte) (outCounter >>> 24),
-                                              (byte) (outCounter >>> 16),
-                                              (byte) (outCounter >>> 8),
+                    if (Configuration.DEBUG)
+                      log.fine("outCounter=" + outCounter);
+                    outMac.update(new byte[] { (byte)(outCounter >>> 24),
+                                               (byte)(outCounter >>> 16),
+                                               (byte)(outCounter >>> 8),
                                               (byte) outCounter });
                   }
                 final byte[] C = outMac.doFinal();
-                //               frameOut.setOS(C);
                 out.write(C);
-                if (DEBUG && debuglevel > 6)
-                  debug(TRACE, "Encoding C (integrity checksum): "
-                               + Util.dumpString(C));
-              } // else confidentiality only; do nothing
+                if (Configuration.DEBUG)
+                  log.fine("Encoding C (integrity checksum): " + Util.dumpString(C));
           }
-        else
-          { // no confidentiality; just integrity [+ replay detection]
-          //            if (DEBUG && debuglevel > 6) debug(TRACE, "Encoding p (plaintext): "+Util.dumpString(data));
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Encoding p (plaintext): "
+            // else confidentiality only; do nothing
+          }
+        else // no confidentiality; just integrity [+ replay detection]
+          {
+            if (Configuration.DEBUG)
+              log.fine("Encoding p (plaintext): "
                            + Util.dumpString(outgoing, offset, len));
-
-            //            frameOut.setEOS(data);
             out.write(outgoing, offset, len);
-
-            //            if (outMac != null) {
-            //               outMac.update(data);
             outMac.update(outgoing, offset, len);
             if (replayDetection)
               {
                 outCounter++;
-                if (DEBUG && debuglevel > 6)
-                  debug(TRACE, "outCounter=" + String.valueOf(outCounter));
-                outMac.update(new byte[] { (byte) (outCounter >>> 24),
-                                          (byte) (outCounter >>> 16),
-                                          (byte) (outCounter >>> 8),
+                if (Configuration.DEBUG)
+                  log.fine("outCounter=" + outCounter);
+                outMac.update(new byte[] { (byte)(outCounter >>> 24),
+                                           (byte)(outCounter >>> 16),
+                                           (byte)(outCounter >>> 8),
                                           (byte) outCounter });
               }
             final byte[] C = outMac.doFinal();
-            //               frameOut.setOS(C);
             out.write(C);
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Encoding C (integrity checksum): "
-                           + Util.dumpString(C));
-            //            }
-          }
-
-        //         frameOut.setEOS(data);
-        //
-        //         if (outMac != null) {
-        //            outMac.update(data);
-        //            if (replayDetection) {
-        //               outCounter++;
-        //               if (DEBUG && debuglevel > 6) debug(TRACE, "outCounter="+String.valueOf(outCounter));
-        //               outMac.update(new byte[] {
-        //                  (byte)(outCounter >>> 24),
-        //                  (byte)(outCounter >>> 16),
-        //                  (byte)(outCounter >>>  8),
-        //                  (byte) outCounter });
-        //            }
-        //            byte[] C = outMac.doFinal();
-        //            frameOut.setOS(C);
-        //            if (DEBUG && debuglevel > 6) debug(TRACE, "Encoding C (integrity checksum): "+Util.dumpString(C));
-        //         }
-
-        //         result = frameOut.wrap();
+            if (Configuration.DEBUG)
+              log.fine("Encoding C (integrity checksum): " + Util.dumpString(C));
+          }
         result = out.toByteArray();
-
       }
     catch (IOException x)
       {
         if (x instanceof SaslException)
-          {
             throw (SaslException) x;
-          }
         throw new SaslException("engineWrap()", x);
       }
-
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "<== engineWrap()");
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "engineWrap");
     return result;
   }
 
@@ -509,14 +370,10 @@
     if (inMac != null)
       {
         if (inCipher != null)
-          {
             return Registry.QOP_AUTH_CONF;
-          }
-        else
-          {
+
             return Registry.QOP_AUTH_INT;
           }
-      }
     return Registry.QOP_AUTH;
   }
 
@@ -525,14 +382,10 @@
     if (inMac != null)
       {
         if (inCipher != null)
-          {
             return Registry.STRENGTH_HIGH;
-          }
-        else
-          {
+
             return Registry.STRENGTH_MEDIUM;
           }
-      }
     return Registry.STRENGTH_LOW;
   }
 
@@ -550,19 +403,16 @@
 
   private byte[] sendIdentities() throws SaslException
   {
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> sendIdentities()");
-
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "sendIdentities");
     // If necessary, prompt the client for the username and password
     getUsernameAndPassword();
-
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Password: \"" + new String(password.getPassword()) + "\"");
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Encoding U (username): \"" + U + "\"");
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Encoding I (userid): \"" + authorizationID + "\"");
-
+    if (Configuration.DEBUG)
+      {
+        log.fine("Password: \"" + new String(password.getPassword()) + "\"");
+        log.fine("Encoding U (username): \"" + U + "\"");
+        log.fine("Encoding I (userid): \"" + authorizationID + "\"");
+      }
     // if session re-use generate new 16-byte nonce
     if (sid.length != 0)
       {
@@ -570,9 +420,7 @@
         getDefaultPRNG().nextBytes(cn);
       }
     else
-      {
         cn = new byte[0];
-      }
 
     final OutputBuffer frameOut = new OutputBuffer();
     try
@@ -586,36 +434,30 @@
     catch (IOException x)
       {
         if (x instanceof SaslException)
-          {
             throw (SaslException) x;
-          }
         throw new AuthenticationException("sendIdentities()", x);
       }
     final byte[] result = frameOut.encode();
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "<== sendIdentities()");
-    if (DEBUG && debuglevel > 2)
-      debug(INFO, "C: " + Util.dumpString(result));
-    if (DEBUG && debuglevel > 2)
-      debug(INFO, "  U = " + U);
-    if (DEBUG && debuglevel > 2)
-      debug(INFO, "  I = " + authorizationID);
-    if (DEBUG && debuglevel > 2)
-      debug(INFO, "sid = " + new String(sid));
-    if (DEBUG && debuglevel > 2)
-      debug(INFO, " cn = " + Util.dumpString(cn));
-    if (DEBUG && debuglevel > 2)
-      debug(INFO, "cCB = " + Util.dumpString(channelBinding));
+    if (Configuration.DEBUG)
+      {
+        log.fine("C: " + Util.dumpString(result));
+        log.fine("  U = " + U);
+        log.fine("  I = " + authorizationID);
+        log.fine("sid = " + new String(sid));
+        log.fine(" cn = " + Util.dumpString(cn));
+        log.fine("cCB = " + Util.dumpString(channelBinding));
+        log.exiting(this.getClass().getName(), "sendIdentities");
+      }
     return result;
   }
 
   private byte[] sendPublicKey(final byte[] input) throws SaslException
   {
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> sendPublicKey()");
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "S: " + Util.dumpString(input));
-
+    if (Configuration.DEBUG)
+      {
+        log.entering(this.getClass().getName(), "sendPublicKey");
+        log.fine("S: " + Util.dumpString(input));
+      }
     // Server sends [00], N, g, s, B, L
     // or [FF], sn, sCB
     final InputBuffer frameIn = new InputBuffer(input);
@@ -626,57 +468,47 @@
         if (ack == 0x00)
           { // new session
             N = frameIn.getMPI();
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Got N (modulus): " + Util.dump(N));
+            if (Configuration.DEBUG)
+              log.fine("Got N (modulus): " + Util.dump(N));
             g = frameIn.getMPI();
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Got g (generator): " + Util.dump(g));
+            if (Configuration.DEBUG)
+              log.fine("Got g (generator): " + Util.dump(g));
             s = frameIn.getOS();
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Got s (salt): " + Util.dumpString(s));
+            if (Configuration.DEBUG)
+              log.fine("Got s (salt): " + Util.dumpString(s));
             B = frameIn.getMPI();
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Got B (server ephermeral public key): "
-                           + Util.dump(B));
+            if (Configuration.DEBUG)
+              log.fine("Got B (server ephermeral public key): " + Util.dump(B));
             L = frameIn.getText();
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Got L (available options): \"" + L + "\"");
+            if (Configuration.DEBUG)
+              log.fine("Got L (available options): \"" + L + "\"");
           }
         else if (ack == 0xFF)
           { // session re-use
             sn = frameIn.getOS();
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Got sn (server nonce): " + Util.dumpString(sn));
+            if (Configuration.DEBUG)
+              log.fine("Got sn (server nonce): " + Util.dumpString(sn));
             sCB = frameIn.getEOS();
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "Got sCB (server channel binding): "
-                           + Util.dumpString(sCB));
+            if (Configuration.DEBUG)
+              log.fine("Got sCB (server channel binding): " + Util.dumpString(sCB));
           }
-        else
-          { // unexpected scalar
+        else // unexpected scalar
             throw new SaslException("sendPublicKey(): Invalid scalar (" + ack
                                     + ") in server's request");
           }
-      }
     catch (IOException x)
       {
         if (x instanceof SaslException)
-          {
             throw (SaslException) x;
-          }
         throw new SaslException("sendPublicKey()", x);
       }
-
     if (ack == 0x00)
       { // new session ---------------------------------------
         o = createO(L.toLowerCase()); // do this first to initialise the SRP hash
-
         final byte[] pBytes; // use ASCII encoding to inter-operate w/ non-java
         pBytes = password.getBytes();
-
         // ----------------------------------------------------------------------
         final HashMap mapA = new HashMap();
-        //         mapA.put(SRP6KeyAgreement.HASH_FUNCTION, srp.newDigest());
         mapA.put(SRP6KeyAgreement.HASH_FUNCTION, srp.getAlgorithm());
         mapA.put(SRP6KeyAgreement.USER_IDENTITY, U);
         mapA.put(SRP6KeyAgreement.USER_PASSWORD, pBytes);
@@ -689,9 +521,6 @@
           {
             throw new SaslException("sendPublicKey()", x);
           }
-
-        // ----------------------------------------------------------------------
-
         // -------------------------------------------------------------------
         try
           {
@@ -702,7 +531,6 @@
             out.writeMPI(B);
             IncomingMessage in = new IncomingMessage(out.toByteArray());
             out = clientHandler.processMessage(in);
-
             in = new IncomingMessage(out.toByteArray());
             A = in.readMPI();
             K = clientHandler.getSharedSecret();
@@ -712,13 +540,11 @@
             throw new SaslException("sendPublicKey()", x);
           }
         // -------------------------------------------------------------------
-
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "K: " + Util.dumpString(K));
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Encoding A (client ephemeral public key): "
-                       + Util.dump(A));
-
+        if (Configuration.DEBUG)
+          {
+            log.fine("K: " + Util.dumpString(K));
+            log.fine("Encoding A (client ephemeral public key): " + Util.dump(A));
+          }
         try
           {
             M1 = srp.generateM1(N, g, U, s, A, B, K, authorizationID, L, cn,
@@ -728,13 +554,11 @@
           {
             throw new AuthenticationException("sendPublicKey()", x);
           }
-
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Encoding o (client chosen options): \"" + o + "\"");
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Encoding cIV (client IV): \"" + Util.dumpString(cIV)
-                       + "\"");
-
+        if (Configuration.DEBUG)
+          {
+            log.fine("Encoding o (client chosen options): \"" + o + "\"");
+            log.fine("Encoding cIV (client IV): \"" + Util.dumpString(cIV) + "\"");
+          }
         final OutputBuffer frameOut = new OutputBuffer();
         try
           {
@@ -746,74 +570,65 @@
         catch (IOException x)
           {
             if (x instanceof SaslException)
-              {
                 throw (SaslException) x;
-              }
             throw new AuthenticationException("sendPublicKey()", x);
           }
         final byte[] result = frameOut.encode();
-        if (DEBUG && debuglevel > 8)
-          debug(TRACE, "<== sendPublicKey()");
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "New session, or session re-use rejected...");
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "C: " + Util.dumpString(result));
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "  A = 0x" + A.toString(16));
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, " M1 = " + Util.dumpString(M1));
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "  o = " + o);
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "cIV = " + Util.dumpString(cIV));
-
+        if (Configuration.DEBUG)
+          {
+            log.fine("New session, or session re-use rejected...");
+            log.fine("C: " + Util.dumpString(result));
+            log.fine("  A = 0x" + A.toString(16));
+            log.fine(" M1 = " + Util.dumpString(M1));
+            log.fine("  o = " + o);
+            log.fine("cIV = " + Util.dumpString(cIV));
+            log.exiting(this.getClass().getName(), "sendPublicKey");
+          }
         return result;
       }
-    else
-      { // session re-use accepted -------------------------------------
+    else // session re-use accepted -------------------------------------------
+      {
         setupSecurityServices(true);
-        if (DEBUG && debuglevel > 8)
-          debug(TRACE, "<== sendPublicKey()");
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "Session re-use accepted...");
+        if (Configuration.DEBUG)
+          {
+            log.fine("Session re-use accepted...");
+            log.exiting(this.getClass().getName(), "sendPublicKey");
+          }
         return null;
       }
   }
 
   private byte[] receiveEvidence(byte[] input) throws SaslException
   {
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> receiveEvidence()");
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "S: " + Util.dumpString(input));
-
+    if (Configuration.DEBUG)
+      {
+        log.entering(this.getClass().getName(), "receiveEvidence");
+        log.fine("S: " + Util.dumpString(input));
+      }
     // Server send M2, sIV, sCB, sid, ttl
     final InputBuffer frameIn = new InputBuffer(input);
     try
       {
         M2 = frameIn.getOS();
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got M2 (server evidence): " + Util.dumpString(M2));
+        if (Configuration.DEBUG)
+          log.fine("Got M2 (server evidence): " + Util.dumpString(M2));
         sIV = frameIn.getOS();
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got sIV (server IV): " + Util.dumpString(sIV));
+        if (Configuration.DEBUG)
+          log.fine("Got sIV (server IV): " + Util.dumpString(sIV));
         sid = frameIn.getEOS();
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got sid (session ID): " + new String(sid));
+        if (Configuration.DEBUG)
+          log.fine("Got sid (session ID): " + new String(sid));
         ttl = (int) frameIn.getScalar(4);
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got ttl (session time-to-live): " + ttl + "sec.");
+        if (Configuration.DEBUG)
+          log.fine("Got ttl (session time-to-live): " + ttl + "sec.");
         sCB = frameIn.getEOS();
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Got sCB (server channel binding): "
-                       + Util.dumpString(sCB));
+        if (Configuration.DEBUG)
+          log.fine("Got sCB (server channel binding): " + Util.dumpString(sCB));
       }
     catch (IOException x)
       {
         if (x instanceof SaslException)
-          {
             throw (SaslException) x;
-          }
         throw new AuthenticationException("receiveEvidence()", x);
       }
 
@@ -827,18 +642,14 @@
       {
         throw new AuthenticationException("receiveEvidence()", x);
       }
-
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Expected: " + Util.dumpString(expected));
+    if (Configuration.DEBUG)
+      log.fine("Expected: " + Util.dumpString(expected));
     if (!Arrays.equals(M2, expected))
-      {
         throw new AuthenticationException("M2 mismatch");
-      }
 
     setupSecurityServices(false);
-
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "<== receiveEvidence()");
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "receiveEvidence");
     return null;
   }
 
@@ -846,19 +657,15 @@
   {
     try
       {
-        if ((!properties.containsKey(Registry.SASL_USERNAME))
-            && (!properties.containsKey(Registry.SASL_PASSWORD)))
+        if ((! properties.containsKey(Registry.SASL_USERNAME))
+            && (! properties.containsKey(Registry.SASL_PASSWORD)))
           {
             final NameCallback nameCB;
             final String defaultName = System.getProperty("user.name");
             if (defaultName == null)
-              {
                 nameCB = new NameCallback("username: ");
-              }
             else
-              {
                 nameCB = new NameCallback("username: ", defaultName);
-              }
             final PasswordCallback pwdCB = new PasswordCallback("password: ",
                                                                 false);
             handler.handle(new Callback[] { nameCB, pwdCB });
@@ -868,21 +675,15 @@
         else
           {
             if (properties.containsKey(Registry.SASL_USERNAME))
-              {
                 this.U = (String) properties.get(Registry.SASL_USERNAME);
-              }
             else
               {
                 final NameCallback nameCB;
                 final String defaultName = System.getProperty("user.name");
                 if (defaultName == null)
-                  {
                     nameCB = new NameCallback("username: ");
-                  }
                 else
-                  {
                     nameCB = new NameCallback("username: ", defaultName);
-                  }
                 this.handler.handle(new Callback[] { nameCB });
                 this.U = nameCB.getName();
               }
@@ -897,14 +698,12 @@
                 else if (pw instanceof String)
                   password = new Password(((String) pw).toCharArray());
                 else
-                  throw new IllegalArgumentException(
-                                                     pw.getClass().getName()
+                  throw new IllegalArgumentException(pw.getClass().getName()
                                                          + "is not a valid password class");
               }
             else
               {
-                final PasswordCallback pwdCB = new PasswordCallback(
-                                                                    "password: ",
+                final PasswordCallback pwdCB = new PasswordCallback("password: ",
                                                                     false);
                 this.handler.handle(new Callback[] { pwdCB });
                 password = new Password(pwdCB.getPassword());
@@ -912,14 +711,10 @@
           }
 
         if (U == null)
-          {
             throw new AuthenticationException("null username supplied");
-          }
         if (password == null)
-          {
             throw new AuthenticationException("null password supplied");
           }
-      }
     catch (UnsupportedCallbackException x)
       {
         throw new AuthenticationException("getUsernameAndPassword()", x);
@@ -935,9 +730,8 @@
   // to us by the client.
   private String createO(final String aol) throws AuthenticationException
   {
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> createO(\"" + aol + "\")");
-
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "createO", aol);
     boolean replaydetectionAvailable = false;
     boolean integrityAvailable = false;
     boolean confidentialityAvailable = false;
@@ -945,7 +739,6 @@
     int i;
 
     String mdName = SRPRegistry.SRP_DEFAULT_DIGEST_NAME;
-
     final StringTokenizer st = new StringTokenizer(aol, ",");
     while (st.hasMoreTokens())
       {
@@ -953,8 +746,8 @@
         if (option.startsWith(SRPRegistry.OPTION_SRP_DIGEST + "="))
           {
             option = option.substring(option.indexOf('=') + 1);
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "mda: <" + option + ">");
+            if (Configuration.DEBUG)
+              log.fine("mda: <" + option + ">");
             for (i = 0; i < SRPRegistry.INTEGRITY_ALGORITHMS.length; i++)
               {
                 if (SRPRegistry.SRP_ALGORITHMS[i].equals(option))
@@ -965,14 +758,12 @@
               }
           }
         else if (option.equals(SRPRegistry.OPTION_REPLAY_DETECTION))
-          {
             replaydetectionAvailable = true;
-          }
         else if (option.startsWith(SRPRegistry.OPTION_INTEGRITY + "="))
           {
             option = option.substring(option.indexOf('=') + 1);
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "ialg: <" + option + ">");
+            if (Configuration.DEBUG)
+              log.fine("ialg: <" + option + ">");
             for (i = 0; i < SRPRegistry.INTEGRITY_ALGORITHMS.length; i++)
               {
                 if (SRPRegistry.INTEGRITY_ALGORITHMS[i].equals(option))
@@ -986,8 +777,8 @@
         else if (option.startsWith(SRPRegistry.OPTION_CONFIDENTIALITY + "="))
           {
             option = option.substring(option.indexOf('=') + 1);
-            if (DEBUG && debuglevel > 6)
-              debug(TRACE, "calg: <" + option + ">");
+            if (Configuration.DEBUG)
+              log.fine("calg: <" + option + ">");
             for (i = 0; i < SRPRegistry.CONFIDENTIALITY_ALGORITHMS.length; i++)
               {
                 if (SRPRegistry.CONFIDENTIALITY_ALGORITHMS[i].equals(option))
@@ -999,9 +790,7 @@
               }
           }
         else if (option.startsWith(SRPRegistry.OPTION_MANDATORY + "="))
-          {
             mandatory = option.substring(option.indexOf('=') + 1);
-          }
         else if (option.startsWith(SRPRegistry.OPTION_MAX_BUFFER_SIZE + "="))
           {
             final String maxBufferSize = option.substring(option.indexOf('=') + 1);
@@ -1010,32 +799,22 @@
                 rawSendSize = Integer.parseInt(maxBufferSize);
                 if (rawSendSize > Registry.SASL_BUFFER_MAX_LIMIT
                     || rawSendSize < 1)
-                  {
-                    throw new AuthenticationException(
-                                                      "Illegal value for 'maxbuffersize' option");
-                  }
+                  throw new AuthenticationException("Illegal value for 'maxbuffersize' option");
               }
             catch (NumberFormatException x)
               {
-                throw new AuthenticationException(
-                                                  SRPRegistry.OPTION_MAX_BUFFER_SIZE
-                                                      + "="
-                                                      + String.valueOf(maxBufferSize),
+                throw new AuthenticationException(SRPRegistry.OPTION_MAX_BUFFER_SIZE
+                                                  + "=" + maxBufferSize,
                                                   x);
               }
           }
       }
-
     replayDetection = replaydetectionAvailable
-                      && Boolean.valueOf(
-                                         (String) properties.get(SRPRegistry.SRP_REPLAY_DETECTION)).booleanValue();
+                      && Boolean.valueOf((String) properties.get(SRPRegistry.SRP_REPLAY_DETECTION)).booleanValue();
     boolean integrity = integrityAvailable
-                        && Boolean.valueOf(
-                                           (String) properties.get(SRPRegistry.SRP_INTEGRITY_PROTECTION)).booleanValue();
+                        && Boolean.valueOf((String) properties.get(SRPRegistry.SRP_INTEGRITY_PROTECTION)).booleanValue();
     boolean confidentiality = confidentialityAvailable
-                              && Boolean.valueOf(
-                                                 (String) properties.get(SRPRegistry.SRP_CONFIDENTIALITY)).booleanValue();
-
+                              && Boolean.valueOf((String) properties.get(SRPRegistry.SRP_CONFIDENTIALITY)).booleanValue();
     // make sure we do the right thing
     if (SRPRegistry.OPTION_REPLAY_DETECTION.equals(mandatory))
       {
@@ -1043,95 +822,67 @@
         integrity = true;
       }
     else if (SRPRegistry.OPTION_INTEGRITY.equals(mandatory))
-      {
         integrity = true;
-      }
     else if (SRPRegistry.OPTION_CONFIDENTIALITY.equals(mandatory))
-      {
         confidentiality = true;
-      }
+
     if (replayDetection)
       {
         if (chosenIntegrityAlgorithm == null)
-          {
             throw new AuthenticationException(
-                                              "Replay detection is required but no "
-                                                  + "integrity protection algorithm was chosen");
-          }
+              "Replay detection is required but no integrity protection algorithm was chosen");
       }
     if (integrity)
       {
         if (chosenIntegrityAlgorithm == null)
-          {
             throw new AuthenticationException(
-                                              "Integrity protection is required but no "
-                                                  + "algorithm was chosen");
-          }
+              "Integrity protection is required but no algorithm was chosen");
       }
     if (confidentiality)
       {
         if (chosenConfidentialityAlgorithm == null)
-          {
             throw new AuthenticationException(
-                                              "Confidentiality protection is required "
-                                                  + "but no algorithm was chosen");
-          }
+              "Confidentiality protection is required but no algorithm was chosen");
       }
-
     // 1. check if we'll be using confidentiality; if not set IV to 0-byte
     if (chosenConfidentialityAlgorithm == null)
-      {
         cIV = new byte[0];
-      }
     else
       {
         // 2. get the block size of the cipher
         final IBlockCipher cipher = CipherFactory.getInstance(chosenConfidentialityAlgorithm);
         if (cipher == null)
-          {
             throw new AuthenticationException("createO()",
                                               new NoSuchAlgorithmException());
-          }
         final int blockSize = cipher.defaultBlockSize();
         // 3. generate random iv
         cIV = new byte[blockSize];
         getDefaultPRNG().nextBytes(cIV);
       }
-
     srp = SRP.instance(mdName);
-
     // Now create the options list specifying which of the available options
     // we have chosen.
 
     // For now we just select the defaults. Later we need to add support for
     // properties (perhaps in a file) where a user can specify the list of
     // algorithms they would prefer to use.
-
     final StringBuffer sb = new StringBuffer();
-    sb.append(SRPRegistry.OPTION_SRP_DIGEST).append("=").append(mdName).append(
-                                                                               ",");
+    sb.append(SRPRegistry.OPTION_SRP_DIGEST)
+      .append("=").append(mdName).append(",");
     if (replayDetection)
-      {
         sb.append(SRPRegistry.OPTION_REPLAY_DETECTION).append(",");
-      }
     if (integrity)
-      {
-        sb.append(SRPRegistry.OPTION_INTEGRITY).append("=").append(
-                                                                   chosenIntegrityAlgorithm).append(
-                                                                                                    ",");
-      }
+      sb.append(SRPRegistry.OPTION_INTEGRITY)
+        .append("=").append(chosenIntegrityAlgorithm).append(",");
     if (confidentiality)
-      {
-        sb.append(SRPRegistry.OPTION_CONFIDENTIALITY).append("=").append(
-                                                                         chosenConfidentialityAlgorithm).append(
-                                                                                                                ",");
-      }
-    final String result = sb.append(SRPRegistry.OPTION_MAX_BUFFER_SIZE).append(
-                                                                               "=").append(
-                                                                                           Registry.SASL_BUFFER_MAX_LIMIT).toString();
+      sb.append(SRPRegistry.OPTION_CONFIDENTIALITY)
+        .append("=").append(chosenConfidentialityAlgorithm).append(",");
 
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "<== createO() --> " + result);
+    final String result = sb.append(SRPRegistry.OPTION_MAX_BUFFER_SIZE)
+                            .append("=").append(Registry.SASL_BUFFER_MAX_LIMIT)
+                            .toString();
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "createO", result);
     return result;
   }
 
@@ -1139,33 +890,30 @@
       throws SaslException
   {
     complete = true; // signal end of authentication phase
-    if (!sessionReUse)
+    if (! sessionReUse)
       {
         outCounter = inCounter = 0;
         // instantiate cipher if confidentiality protection filter is active
         if (chosenConfidentialityAlgorithm != null)
           {
-            if (DEBUG && debuglevel > 2)
-              debug(INFO, "Activating confidentiality protection filter");
+            if (Configuration.DEBUG)
+              log.fine("Activating confidentiality protection filter");
             inCipher = CALG.getInstance(chosenConfidentialityAlgorithm);
             outCipher = CALG.getInstance(chosenConfidentialityAlgorithm);
           }
         // instantiate hmacs if integrity protection filter is active
         if (chosenIntegrityAlgorithm != null)
           {
-            if (DEBUG && debuglevel > 2)
-              debug(INFO, "Activating integrity protection filter");
+            if (Configuration.DEBUG)
+              log.fine("Activating integrity protection filter");
             inMac = IALG.getInstance(chosenIntegrityAlgorithm);
             outMac = IALG.getInstance(chosenIntegrityAlgorithm);
           }
       }
-    else
-      { // same session new Keys
+    else // same session new Keys
         K = srp.generateKn(K, cn, sn);
-      }
 
     final KDF kdf = KDF.getInstance(K);
-
     // initialise in/out ciphers if confidentiality protection is used
     if (inCipher != null)
       {
@@ -1178,16 +926,13 @@
         inMac.init(kdf);
         outMac.init(kdf);
       }
-
     if (sid != null && sid.length != 0)
       { // update the security context and save in map
-        if (DEBUG && debuglevel > 2)
-          debug(INFO, "Updating security context for UID = " + uid);
-        ClientStore.instance().cacheSession(
-                                            uid,
+        if (Configuration.DEBUG)
+          log.fine("Updating security context for UID = " + uid);
+        ClientStore.instance().cacheSession(uid,
                                             ttl,
-                                            new SecurityContext(
-                                                                srp.getAlgorithm(),
+                                            new SecurityContext(srp.getAlgorithm(),
                                                                 sid,
                                                                 K,
                                                                 cIV,

Index: java/security/util/Prime2.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/util/Prime2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- java/security/util/Prime2.java	29 Jan 2006 13:54:03 -0000	1.2
+++ java/security/util/Prime2.java	11 Jun 2006 12:14:44 -0000	1.3
@@ -38,37 +38,20 @@
 
 package gnu.java.security.util;
 
-import java.io.PrintWriter;
+import gnu.classpath.Configuration;
+
 import java.lang.ref.WeakReference;
 import java.math.BigInteger;
 import java.util.Map;
 import java.util.WeakHashMap;
+import java.util.logging.Logger;
 
 /**
  * <p>A collection of prime number related utilities used in this library.</p>
  */
 public class Prime2
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "prime";
-
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 5;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(String s)
-  {
-    err.println(">>> " + NAME + ": " + s);
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(Prime2.class.getName());
   private static final int DEFAULT_CERTAINTY = 20; // XXX is this a good value?
 
   private static final BigInteger ZERO = BigInteger.ZERO;
@@ -116,7 +99,7 @@
             }
         }
       time += System.currentTimeMillis();
-      if (DEBUG && debuglevel > 8)
+      if (Configuration.DEBUG)
         {
           StringBuffer sb;
           for (int i = 0; i < (SMALL_PRIME_COUNT / 10); i++)
@@ -126,12 +109,12 @@
                 {
                   sb.append(String.valueOf(SMALL_PRIME[i * 10 + j])).append(" ");
                 }
-              debug(sb.toString());
+              log.fine(sb.toString());
             }
         }
-      if (DEBUG && debuglevel > 4)
+      if (Configuration.DEBUG)
         {
-          debug("Generating first " + String.valueOf(SMALL_PRIME_COUNT)
+          log.fine("Generating first " + String.valueOf(SMALL_PRIME_COUNT)
                 + " primes took: " + String.valueOf(time) + " ms.");
         }
     }
@@ -169,17 +152,13 @@
         prime = SMALL_PRIME[i];
         if (w.mod(prime).equals(ZERO))
           {
-            if (DEBUG && debuglevel > 4)
-              {
-                debug(prime.toString(16) + " | " + w.toString(16) + "...");
-              }
+            if (Configuration.DEBUG)
+              log.fine(prime.toString(16) + " | " + w.toString(16) + "...");
             return true;
           }
       }
-    if (DEBUG && debuglevel > 4)
-      {
-        debug(w.toString(16) + " has no small prime divisors...");
-      }
+    if (Configuration.DEBUG)
+      log.fine(w.toString(16) + " has no small prime divisors...");
     return false;
   }
 
@@ -361,8 +340,8 @@
     for (int i = 0; i < SMALL_PRIME_COUNT; i++)
         if (w.equals(SMALL_PRIME[i]))
           {
-            if (DEBUG && debuglevel > 4)
-                debug(w.toString(16) + " is a small prime");
+            if (Configuration.DEBUG)
+              log.fine(w.toString(16) + " is a small prime");
             return true;
           }
 
@@ -370,16 +349,16 @@
     WeakReference obj = (WeakReference) knownPrimes.get(w);
     if (obj != null && w.equals(obj.get()))
       {
-        if (DEBUG && debuglevel > 4)
-            debug("found in known primes");
+        if (Configuration.DEBUG)
+          log.fine("found in known primes");
         return true;
       }
 
     // trial division with first 1000 primes
     if (hasSmallPrimeDivisor(w))
       {
-        if (DEBUG && debuglevel > 4)
-            debug(w.toString(16) + " has a small prime divisor. Rejected...");
+        if (Configuration.DEBUG)
+          log.fine(w.toString(16) + " has a small prime divisor. Rejected...");
         return false;
       }
 
@@ -411,7 +390,7 @@
 
   private static final void debugBI(String msg, BigInteger bn)
   {
-    if (DEBUG && debuglevel > 4)
-      debug("*** " + msg + ": 0x" + bn.toString(16));
+    if (Configuration.DEBUG)
+      log.fine("*** " + msg + ": 0x" + bn.toString(16));
   }
 }

Index: java/security/util/Base64.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/util/Base64.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- java/security/util/Base64.java	26 Jan 2006 02:25:11 -0000	1.1
+++ java/security/util/Base64.java	11 Jun 2006 12:14:44 -0000	1.2
@@ -38,8 +38,10 @@
 
 package gnu.java.security.util;
 
-import java.io.PrintWriter;
+import gnu.classpath.Configuration;
+
 import java.io.UnsupportedEncodingException;
+import java.util.logging.Logger;
 
 /**
  * Most of this implementation is from Robert Harder's public domain Base64
@@ -47,26 +49,7 @@
  */
 public class Base64
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "Base64";
-
-  private static final boolean DEBUG = true;
-
-  private static final int debuglevel = 9;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(String s)
-  {
-    err.println(">>> " + NAME + ": " + s);
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(Base64.class.getName());
   /** Maximum line length (76) of Base64 output. */
   private static final int MAX_LINE_LENGTH = 76;
 
@@ -383,12 +366,12 @@
       }
     catch (Exception x)
       {
-        if (DEBUG && debuglevel > 8)
+        if (Configuration.DEBUG)
           {
-            debug("" + src[sOffset] + ": " + (DECODABET[src[sOffset]]));
-            debug("" + src[sOffset + 1] + ": " + (DECODABET[src[sOffset + 1]]));
-            debug("" + src[sOffset + 2] + ": " + (DECODABET[src[sOffset + 2]]));
-            debug("" + src[sOffset + 3] + ": " + (DECODABET[src[sOffset + 3]]));
+            log.fine("" + src[sOffset    ] + ": " + (DECODABET[src[sOffset    ]]));
+            log.fine("" + src[sOffset + 1] + ": " + (DECODABET[src[sOffset + 1]]));
+            log.fine("" + src[sOffset + 2] + ": " + (DECODABET[src[sOffset + 2]]));
+            log.fine("" + src[sOffset + 3] + ": " + (DECODABET[src[sOffset + 3]]));
           }
         return -1;
       }

Index: javax/crypto/key/srp6/SRPKeyPairGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/key/srp6/SRPKeyPairGenerator.java	3 Feb 2006 19:29:01 -0000	1.2
+++ javax/crypto/key/srp6/SRPKeyPairGenerator.java	11 Jun 2006 12:14:44 -0000	1.3
@@ -38,16 +38,17 @@
 
 package gnu.javax.crypto.key.srp6;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.key.IKeyPairGenerator;
 import gnu.java.security.util.PRNG;
 import gnu.java.security.util.Prime2;
 
-import java.io.PrintWriter;
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.security.SecureRandom;
 import java.util.Map;
+import java.util.logging.Logger;
 
 /**
  *
@@ -60,26 +61,7 @@
  */
 public class SRPKeyPairGenerator implements IKeyPairGenerator
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "srp";
-
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 5;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(String s)
-  {
-    err.println(">>> " + NAME + ": " + s);
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(SRPKeyPairGenerator.class.getName());
   private static final BigInteger ZERO = BigInteger.ZERO;
 
   private static final BigInteger ONE = BigInteger.ONE;
@@ -235,11 +217,11 @@
         BigInteger q = params[0];
         N = params[1];
         g = params[2];
-        if (DEBUG && debuglevel > 0)
+        if (Configuration.DEBUG)
           {
-            debug("q: " + q.toString(16));
-            debug("N: " + N.toString(16));
-            debug("g: " + g.toString(16));
+            log.fine("q: " + q.toString(16));
+            log.fine("N: " + N.toString(16));
+            log.fine("g: " + g.toString(16));
           }
       }
 

Index: java/security/sig/rsa/EMSA_PSS.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- java/security/sig/rsa/EMSA_PSS.java	26 Mar 2006 22:57:46 -0000	1.2
+++ java/security/sig/rsa/EMSA_PSS.java	11 Jun 2006 12:14:44 -0000	1.3
@@ -38,12 +38,13 @@
 
 package gnu.java.security.sig.rsa;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.hash.HashFactory;
 import gnu.java.security.hash.IMessageDigest;
 import gnu.java.security.util.Util;
 
-import java.io.PrintWriter;
 import java.util.Arrays;
+import java.util.logging.Logger;
 
 /**
  * <p>An implementation of the EMSA-PSS encoding/decoding scheme.</p>
@@ -70,26 +71,7 @@
  */
 public class EMSA_PSS implements Cloneable
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "emsa-pss";
-
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 5;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(String s)
-  {
-    err.println(">>> " + NAME + ": " + s);
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(EMSA_PSS.class.getName());
   /** The underlying hash function to use with this instance. */
   private IMessageDigest hash;
 
@@ -202,10 +184,10 @@
     System.arraycopy(salt, 0, DB, emLen - sLen - hLen - 1, sLen);
     // 9. Let dbMask = MGF(H, emLen - hLen - 1).
     byte[] dbMask = MGF(H, emLen - hLen - 1);
-    if (DEBUG && debuglevel > 8)
+    if (Configuration.DEBUG)
       {
-        debug("dbMask (encode): " + Util.toString(dbMask));
-        debug("DB (encode): " + Util.toString(DB));
+        log.fine("dbMask (encode): " + Util.toString(dbMask));
+        log.fine("DB (encode): " + Util.toString(DB));
       }
     // 10. Let maskedDB = DB XOR dbMask.
     for (i = 0; i < DB.length; i++)
@@ -244,12 +226,12 @@
    */
   public boolean decode(byte[] mHash, byte[] EM, int emBits, int sLen)
   {
-    if (DEBUG && debuglevel > 8)
+    if (Configuration.DEBUG)
       {
-        debug("mHash: " + Util.toString(mHash));
-        debug("EM: " + Util.toString(EM));
-        debug("emBits: " + String.valueOf(emBits));
-        debug("sLen: " + String.valueOf(sLen));
+        log.fine("mHash: " + Util.toString(mHash));
+        log.fine("EM: " + Util.toString(EM));
+        log.fine("emBits: " + String.valueOf(emBits));
+        log.fine("sLen: " + String.valueOf(sLen));
       }
     if (sLen < 0)
       {
@@ -262,19 +244,15 @@
     // 2. Let mHash = Hash(M), an octet string of length hLen.
     if (hLen != mHash.length)
       {
-        if (DEBUG && debuglevel > 8)
-          {
-            debug("hLen != mHash.length; hLen: " + String.valueOf(hLen));
-          }
+        if (Configuration.DEBUG)
+          log.fine("hLen != mHash.length; hLen: " + String.valueOf(hLen));
         throw new IllegalArgumentException("wrong hash");
       }
     // 3. If emBits < 8.hLen + 8.sLen + 9, output 'decoding error' and stop.
     if (emBits < (8 * hLen + 8 * sLen + 9))
       {
-        if (DEBUG && debuglevel > 8)
-          {
-            debug("emBits < (8hLen + 8sLen + 9); sLen: " + String.valueOf(sLen));
-          }
+        if (Configuration.DEBUG)
+          log.fine("emBits < (8hLen + 8sLen + 9); sLen: " + String.valueOf(sLen));
         throw new IllegalArgumentException("decoding error");
       }
     int emLen = (emBits + 7) / 8;
@@ -282,10 +260,8 @@
     //    output 'inconsistent' and stop.
     if ((EM[EM.length - 1] & 0xFF) != 0xBC)
       {
-        if (DEBUG && debuglevel > 8)
-          {
-            debug("EM does not end with 0xBC");
-          }
+        if (Configuration.DEBUG)
+          log.fine("EM does not end with 0xBC");
         return false;
       }
     // 5. Let maskedDB be the leftmost emLen ? hLen ? 1 octets of EM, and let
@@ -294,10 +270,8 @@
     //    maskedDB are not all equal to zero, output 'inconsistent' and stop.
     if ((EM[0] & (0xFF << (8 - (8 * emLen - emBits)))) != 0)
       {
-        if (DEBUG && debuglevel > 8)
-          {
-            debug("Leftmost 8emLen - emBits bits of EM are not 0s");
-          }
+        if (Configuration.DEBUG)
+          log.fine("Leftmost 8emLen - emBits bits of EM are not 0s");
         return false;
       }
     byte[] DB = new byte[emLen - hLen - 1];
@@ -314,10 +288,10 @@
       }
     // 9. Set the leftmost 8.emLen ? emBits bits of DB to zero.
     DB[0] &= (0xFF >>> (8 * emLen - emBits));
-    if (DEBUG && debuglevel > 8)
+    if (Configuration.DEBUG)
       {
-        debug("dbMask (decode): " + Util.toString(dbMask));
-        debug("DB (decode): " + Util.toString(DB));
+        log.fine("dbMask (decode): " + Util.toString(dbMask));
+        log.fine("DB (decode): " + Util.toString(DB));
       }
     // 10. If the emLen -hLen -sLen -2 leftmost octets of DB are not zero or
     //     if the octet at position emLen -hLen -sLen -1 is not equal to 0x01,
@@ -329,20 +303,16 @@
       {
         if (DB[i] != 0)
           {
-            if (DEBUG && debuglevel > 8)
-              {
-                debug("DB[" + String.valueOf(i) + "] != 0x00");
-              }
+            if (Configuration.DEBUG)
+              log.fine("DB[" + String.valueOf(i) + "] != 0x00");
             return false;
           }
       }
     if (DB[i] != 0x01)
       { // i == emLen -hLen -sLen -2
-        if (DEBUG && debuglevel > 8)
-          {
-            debug("DB's byte at position (emLen -hLen -sLen -2); i.e. "
+        if (Configuration.DEBUG)
+          log.fine("DB's byte at position (emLen -hLen -sLen -2); i.e. "
                   + String.valueOf(i) + " is not 0x01");
-          }
         return false;
       }
     // 11. Let salt be the last sLen octets of DB.

Index: java/security/sig/rsa/RSAPSSSignature.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- java/security/sig/rsa/RSAPSSSignature.java	26 Mar 2006 22:57:46 -0000	1.3
+++ java/security/sig/rsa/RSAPSSSignature.java	11 Jun 2006 12:14:44 -0000	1.4
@@ -38,18 +38,19 @@
 
 package gnu.java.security.sig.rsa;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.hash.HashFactory;
 import gnu.java.security.hash.IMessageDigest;
 import gnu.java.security.sig.BaseSignature;
 import gnu.java.security.util.Util;
 
-import java.io.PrintWriter;
 import java.math.BigInteger;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
+import java.util.logging.Logger;
 
 /**
  * <p>The RSA-PSS signature scheme is a public-key encryption scheme combining
@@ -73,26 +74,7 @@
  */
 public class RSAPSSSignature extends BaseSignature
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "rsa-pss";
-
-  private static final boolean DEBUG = false;
-
-  private static final int debuglevel = 1;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(String s)
-  {
-    err.println(">>> " + NAME + ": " + s);
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(RSAPSSSignature.class.getName());
   /** The underlying EMSA-PSS instance for this object. */
   private EMSA_PSS pss;
 
@@ -201,10 +183,8 @@
     byte[] salt = new byte[sLen];
     this.nextRandomBytes(salt);
     byte[] EM = pss.encode(md.digest(), modBits - 1, salt);
-    if (DEBUG && debuglevel > 8)
-      {
-        debug("EM (sign): " + Util.toString(EM));
-      }
+    if (Configuration.DEBUG)
+      log.fine("EM (sign): " + Util.toString(EM));
     // 2. Convert the encoded message EM to an integer message representative
     //    m (see Section 1.2.2): m = OS2IP(EM).
     BigInteger m = new BigInteger(1, EM);
@@ -262,10 +242,8 @@
     int emBits = modBits - 1;
     int emLen = (emBits + 7) / 8;
     byte[] EM = m.toByteArray();
-    if (DEBUG && debuglevel > 8)
-      {
-        debug("EM (verify): " + Util.toString(EM));
-      }
+    if (Configuration.DEBUG)
+      log.fine("EM (verify): " + Util.toString(EM));
     if (EM.length > emLen)
       {
         return false;

Index: java/security/pkcs/PKCS7SignedData.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/pkcs/PKCS7SignedData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- java/security/pkcs/PKCS7SignedData.java	25 Mar 2006 11:19:17 -0000	1.4
+++ java/security/pkcs/PKCS7SignedData.java	11 Jun 2006 12:14:44 -0000	1.5
@@ -37,6 +37,7 @@
 
 package gnu.java.security.pkcs;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.ber.BER;
 import gnu.java.security.ber.BEREncodingException;
@@ -52,9 +53,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-
 import java.math.BigInteger;
-
 import java.security.cert.CRL;
 import java.security.cert.CRLException;
 import java.security.cert.Certificate;
@@ -62,7 +61,6 @@
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509CRL;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -174,21 +172,22 @@
     if (!val.isConstructed())
       throw new BEREncodingException("malformed SignedData");
 
-    log.finest("SignedData: " + val);
+    if (Configuration.DEBUG)
+      log.fine("SignedData: " + val);
 
     val = ber.read();
     if (val.getTag() != BER.INTEGER)
       throw new BEREncodingException("expecting Version");
     version = (BigInteger) val.getValue();
-
-    log.finest("  Version: " + version);
+    if (Configuration.DEBUG)
+      log.fine("  Version: " + version);
 
     digestAlgorithms = new HashSet();
     val = ber.read();
     if (!val.isConstructed())
       throw new BEREncodingException("malformed DigestAlgorithmIdentifiers");
-
-    log.finest("  DigestAlgorithmIdentifiers: " + val);
+    if (Configuration.DEBUG)
+      log.fine("  DigestAlgorithmIdentifiers: " + val);
     int count = 0;
     DERValue val2 = ber.read();
     while (val2 != BER.END_OF_SEQUENCE &&
@@ -196,14 +195,14 @@
       {
         if (!val2.isConstructed())
           throw new BEREncodingException("malformed AlgorithmIdentifier");
-
-        log.finest("    AlgorithmIdentifier: " + val2);
+        if (Configuration.DEBUG)
+          log.fine("    AlgorithmIdentifier: " + val2);
         count += val2.getEncodedLength();
         val2 = ber.read();
         if (val2.getTag() != BER.OBJECT_IDENTIFIER)
           throw new BEREncodingException("malformed AlgorithmIdentifier");
-
-        log.finest("      digestAlgorithmIdentifiers OID: " + val2.getValue());
+        if (Configuration.DEBUG)
+          log.fine("      digestAlgorithmIdentifiers OID: " + val2.getValue());
         List algId = new ArrayList(2);
         algId.add(val2.getValue());
         val2 = ber.read();
@@ -224,23 +223,27 @@
         else
           algId.add(null);
 
-        log.finest("      digestAlgorithmIdentifiers params: ");
-        log.finest(Util.dumpString((byte[]) algId.get(1),
+        if (Configuration.DEBUG)
+          {
+            log.fine("      digestAlgorithmIdentifiers params: ");
+            log.fine(Util.dumpString((byte[]) algId.get(1),
                                    "      digestAlgorithmIdentifiers params: "));
+          }
         digestAlgorithms.add(algId);
       }
 
     val = ber.read();
     if (!val.isConstructed())
       throw new BEREncodingException("malformed ContentInfo");
-
-    log.finest("  ContentInfo: " + val);
+    if (Configuration.DEBUG)
+      log.fine("  ContentInfo: " + val);
     val2 = ber.read();
     if (val2.getTag() != BER.OBJECT_IDENTIFIER)
       throw new BEREncodingException("malformed ContentType");
 
     contentType = (OID) val2.getValue();
-    log.finest("    ContentType OID: " + contentType);
+    if (Configuration.DEBUG)
+      log.fine("    ContentType OID: " + contentType);
     if (BERValue.isIndefinite(val)
         || (val.getLength() > 0 && val.getLength() > val2.getEncodedLength()))
       {
@@ -252,17 +255,18 @@
               val2 = ber.read();
           }
       }
-
-    log.finest("    Content: ");
-    log.finest(Util.dumpString(content, "    Content: "));
-
+    if (Configuration.DEBUG)
+      {
+        log.fine("    Content: ");
+        log.fine(Util.dumpString(content, "    Content: "));
+      }
     val = ber.read();
     if (val.getTag() == 0)
       {
         if (!val.isConstructed())
           throw new BEREncodingException("malformed ExtendedCertificatesAndCertificates");
-
-        log.finest("  ExtendedCertificatesAndCertificates: " + val);
+        if (Configuration.DEBUG)
+          log.fine("  ExtendedCertificatesAndCertificates: " + val);
         count = 0;
         val2 = ber.read();
         List certs = new LinkedList();
@@ -271,7 +275,8 @@
           {
             Certificate cert =
               x509.generateCertificate(new ByteArrayInputStream(val2.getEncoded()));
-            log.finest("    Certificate: " + cert);
+            if (Configuration.DEBUG)
+              log.fine("    Certificate: " + cert);
             certs.add(cert);
             count += val2.getEncodedLength();
             ber.skip(val2.getLength());
@@ -286,8 +291,8 @@
       {
         if (!val.isConstructed())
           throw new BEREncodingException("malformed CertificateRevocationLists");
-
-        log.finest("  CertificateRevocationLists: " + val);
+        if (Configuration.DEBUG)
+          log.fine("  CertificateRevocationLists: " + val);
         count = 0;
         val2 = ber.read();
         List crls = new LinkedList();
@@ -295,7 +300,8 @@
                (val.getLength() > 0 && val.getLength() > count))
           {
             CRL crl = x509.generateCRL(new ByteArrayInputStream(val2.getEncoded()));
-            log.finest("    CRL: " + crl);
+            if (Configuration.DEBUG)
+              log.fine("    CRL: " + crl);
             crls.add(crl);
             count += val2.getEncodedLength();
             ber.skip(val2.getLength());
@@ -309,8 +315,8 @@
     signerInfos = new HashSet();
     if (!val.isConstructed())
       throw new BEREncodingException("malformed SignerInfos");
-
-    log.finest("  SignerInfos: " + val);
+    if (Configuration.DEBUG)
+      log.fine("  SignerInfos: " + val);
 
     // FIXME read this more carefully.
     // Since we are just reading a file (probably) we just read until we

Index: java/security/pkcs/SignerInfo.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/pkcs/SignerInfo.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- java/security/pkcs/SignerInfo.java	25 Mar 2006 11:19:26 -0000	1.5
+++ java/security/pkcs/SignerInfo.java	11 Jun 2006 12:14:44 -0000	1.6
@@ -37,6 +37,7 @@
 
 package gnu.java.security.pkcs;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.ber.BER;
 import gnu.java.security.ber.BEREncodingException;
@@ -50,7 +51,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.logging.Logger;
@@ -101,7 +101,8 @@
   public SignerInfo(BERReader ber) throws IOException
   {
     DERValue val = ber.read();
-    log.finest("SignerInfo: " + val);
+    if (Configuration.DEBUG)
+      log.fine("SignerInfo: " + val);
     if (!val.isConstructed())
       throw new BEREncodingException("malformed SignerInfo");
 
@@ -110,13 +111,13 @@
       throw new BEREncodingException("malformed Version");
 
     version = (BigInteger) val.getValue();
-    log.finest("  Version: " + version);
+    log.fine("  Version: " + version);
 
     val = ber.read();
     if (!val.isConstructed())
       throw new BEREncodingException("malformed IssuerAndSerialNumber");
-
-    log.finest("  IssuerAndSerialNumber: " + val);
+    if (Configuration.DEBUG)
+      log.fine("  IssuerAndSerialNumber: " + val);
 
     val = ber.read();
     if (!val.isConstructed())
@@ -124,20 +125,22 @@
 
     issuer = new X500Principal(val.getEncoded());
     ber.skip(val.getLength());
-    log.finest("    Issuer: " + issuer);
+    if (Configuration.DEBUG)
+      log.fine("    Issuer: " + issuer);
 
     val = ber.read();
     if (val.getTag() != BER.INTEGER)
       throw new BEREncodingException("malformed SerialNumber");
 
     serialNumber = (BigInteger) val.getValue();
-    log.finest("    SerialNumber: " + serialNumber);
+    if (Configuration.DEBUG)
+      log.fine("    SerialNumber: " + serialNumber);
 
     val = ber.read();
     if (!val.isConstructed())
       throw new BEREncodingException("malformed DigestAlgorithmIdentifier");
-
-    log.finest("  DigestAlgorithmIdentifier: " + val);
+    if (Configuration.DEBUG)
+      log.fine("  DigestAlgorithmIdentifier: " + val);
 
     int count = 0;
     DERValue val2 = ber.read();
@@ -145,7 +148,8 @@
       throw new BEREncodingException("malformed AlgorithmIdentifier");
 
     digestAlgorithmId = (OID) val2.getValue();
-    log.finest("    digestAlgorithm OID: " + digestAlgorithmId);
+    if (Configuration.DEBUG)
+      log.fine("    digestAlgorithm OID: " + digestAlgorithmId);
 
     if (BERValue.isIndefinite(val))
       {
@@ -170,10 +174,12 @@
     else
       digestAlgorithmParams = null;
 
-    log.finest("    digestAlgorithm params: ");
-    log.finest(Util.dumpString(digestAlgorithmParams,
+    if (Configuration.DEBUG)
+      {
+        log.fine("    digestAlgorithm params: ");
+        log.fine(Util.dumpString(digestAlgorithmParams,
                                "    digestAlgorithm params: "));
-
+      }
     val = ber.read();
     if (val.getTag() == 0)
       {
@@ -187,21 +193,24 @@
     else
       authenticatedAttributes = null;
 
-    log.finest("  AuthenticatedAttributes: ");
-    log.finest(Util.dumpString(authenticatedAttributes,
+    if (Configuration.DEBUG)
+      {
+        log.fine("  AuthenticatedAttributes: ");
+        log.fine(Util.dumpString(authenticatedAttributes,
                                "  AuthenticatedAttributes: "));
-
+      }
     if (!val.isConstructed())
       throw new BEREncodingException("malformed DigestEncryptionAlgorithmIdentifier");
-
-    log.finest("  DigestEncryptionAlgorithmIdentifier: " + val);
+    if (Configuration.DEBUG)
+      log.fine("  DigestEncryptionAlgorithmIdentifier: " + val);
     count = 0;
     val2 = ber.read();
     if (val2.getTag() != BER.OBJECT_IDENTIFIER)
       throw new BEREncodingException("malformed AlgorithmIdentifier");
 
     digestEncryptionAlgorithmId = (OID) val2.getValue();
-    log.finest("    digestEncryptionAlgorithm OID: " + digestEncryptionAlgorithmId);
+    if (Configuration.DEBUG)
+      log.fine("    digestEncryptionAlgorithm OID: " + digestEncryptionAlgorithmId);
 
     if (BERValue.isIndefinite(val))
       {
@@ -226,27 +235,33 @@
     else
       digestEncryptionAlgorithmParams = null;
 
-    log.finest("    digestEncryptionAlgorithm params: ");
-    log.finest(Util.dumpString(digestEncryptionAlgorithmParams,
+    if (Configuration.DEBUG)
+      {
+        log.fine("    digestEncryptionAlgorithm params: ");
+        log.fine(Util.dumpString(digestEncryptionAlgorithmParams,
                                "    digestEncryptionAlgorithm params: "));
-
+      }
     val = ber.read();
     if (val.getTag() != BER.OCTET_STRING)
       throw new BEREncodingException("malformed EncryptedDigest");
 
     encryptedDigest = (byte[]) val.getValue();
-    log.finest("  EncryptedDigest: ");
-    log.finest(Util.dumpString(encryptedDigest, "  EncryptedDigest: "));
-
+    if (Configuration.DEBUG)
+      {
+        log.fine("  EncryptedDigest: ");
+        log.fine(Util.dumpString(encryptedDigest, "  EncryptedDigest: "));
+      }
     if (ber.peek() == 1)
       unauthenticatedAttributes = ber.read().getEncoded();
     else
       unauthenticatedAttributes = null;
 
-    log.finest("  UnauthenticatedAttributes: ");
-    log.finest(Util.dumpString(unauthenticatedAttributes,
+    if (Configuration.DEBUG)
+      {
+        log.fine("  UnauthenticatedAttributes: ");
+        log.fine(Util.dumpString(unauthenticatedAttributes,
                                "  UnauthenticatedAttributes: "));
-
+      }
     if (ber.peek() == 0)
       ber.read();
   }

Index: java/security/jce/sig/SignatureAdapter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/jce/sig/SignatureAdapter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- java/security/jce/sig/SignatureAdapter.java	26 Mar 2006 22:57:46 -0000	1.3
+++ java/security/jce/sig/SignatureAdapter.java	11 Jun 2006 12:14:44 -0000	1.4
@@ -38,6 +38,7 @@
 
 package gnu.java.security.jce.sig;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.sig.BaseSignature;
 import gnu.java.security.sig.ISignature;
 import gnu.java.security.sig.ISignatureCodec;
@@ -223,7 +224,8 @@
 
   public boolean engineVerify(byte[] sigBytes) throws SignatureException
   {
-    log.entering("SignatureAdapter", "engineVerify");
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "engineVerify");
 
     Object signature = codec.decodeSignature(sigBytes);
     boolean result = false;
@@ -235,8 +237,8 @@
       {
         throw new SignatureException(String.valueOf(x));
       }
-
-    log.exiting("SignatureAdapter", "engineVerify", new Boolean(result));
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "engineVerify", Boolean.valueOf(result));
     return result;
   }
 

Index: java/security/jce/sig/EncodedKeyFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/jce/sig/EncodedKeyFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- java/security/jce/sig/EncodedKeyFactory.java	26 Feb 2006 04:10:38 -0000	1.5
+++ java/security/jce/sig/EncodedKeyFactory.java	11 Jun 2006 12:14:44 -0000	1.6
@@ -38,6 +38,7 @@
 
 package gnu.java.security.jce.sig;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.key.dss.DSSPrivateKey;
 import gnu.java.security.key.dss.DSSPublicKey;
@@ -196,6 +197,7 @@
   protected PublicKey engineGeneratePublic(KeySpec keySpec)
       throws InvalidKeySpecException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineGeneratePublic()", keySpec);
 
     PublicKey result = null;
@@ -220,6 +222,7 @@
           }
         catch (InvalidParameterException ignored)
           {
+            if (Configuration.DEBUG)
             log.log(Level.FINE, "Exception in DSSPublicKey.valueOf(). Ignore",
                     ignored);
           }
@@ -232,6 +235,7 @@
             }
           catch (InvalidParameterException ignored)
             {
+              if (Configuration.DEBUG)
               log.log(Level.FINE,
                       "Exception in GnuRSAPublicKey.valueOf(). Ignore",
                       ignored);
@@ -240,7 +244,7 @@
           if (! ok) // try DH
             result = decodeDHPublicKey(input);
       }
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineGeneratePublic()", result);
     return result;
   }
@@ -248,6 +252,7 @@
   protected PrivateKey engineGeneratePrivate(KeySpec keySpec)
       throws InvalidKeySpecException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "engineGeneratePrivate()", keySpec);
 
     PrivateKey result = null;
@@ -272,6 +277,7 @@
           }
         catch (InvalidParameterException ignored)
           {
+            if (Configuration.DEBUG)
             log.log(Level.FINE, "Exception in DSSPrivateKey.valueOf(). Ignore",
                     ignored);
           }
@@ -284,6 +290,7 @@
             }
           catch (InvalidParameterException ignored)
             {
+              if (Configuration.DEBUG)
               log.log(Level.FINE,
                       "Exception in GnuRSAPrivateKey.valueOf(). Ignore",
                       ignored);
@@ -292,7 +299,7 @@
         if (! ok) // try DH
           result = decodeDHPrivateKey(input);
       }
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "engineGeneratePrivate()", result);
     return result;
   }

Index: java/security/Properties.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/Properties.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- java/security/Properties.java	21 Apr 2006 10:09:26 -0000	1.2
+++ java/security/Properties.java	11 Jun 2006 12:14:44 -0000	1.3
@@ -38,13 +38,15 @@
 
 package gnu.java.security;
 
+import gnu.classpath.Configuration;
+
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.HashMap;
 import java.util.PropertyPermission;
+import java.util.logging.Logger;
 
 /**
  * <p>A global object containing build-specific properties that affect the
@@ -52,25 +54,7 @@
  */
 public final class Properties
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "Properties";
-
-  private static final boolean DEBUG = false;
-
-  //   private static final int debuglevel = 9;
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(final String s)
-  {
-    err.println(">>> " + NAME + ": " + s);
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(Properties.class.getName());
   public static final String VERSION = "gnu.crypto.version";
 
   public static final String PROPERTIES_FILE = "gnu.crypto.properties.file";
@@ -300,9 +284,8 @@
       }
     catch (SecurityException se)
       {
-        if (DEBUG)
-          debug("Reading property " + PROPERTIES_FILE
-                + " not allowed. Ignored.");
+        if (Configuration.DEBUG)
+          log.fine("Reading property " + PROPERTIES_FILE + " not allowed. Ignored.");
       }
     if (propFile != null)
       {
@@ -316,13 +299,13 @@
           }
         catch (IOException ioe)
           {
-            if (DEBUG)
-              debug("IO error reading " + propFile + ": " + ioe.getMessage());
+            if (Configuration.DEBUG)
+              log.fine("IO error reading " + propFile + ": " + ioe.getMessage());
           }
         catch (SecurityException se)
           {
-            if (DEBUG)
-              debug("Security error reading " + propFile + ": "
+            if (Configuration.DEBUG)
+              log.fine("Security error reading " + propFile + ": "
                     + se.getMessage());
           }
       }
@@ -350,8 +333,8 @@
       }
     catch (SecurityException x)
       {
-        if (DEBUG)
-          debug("SecurityManager forbids reading system properties. Ignored");
+        if (Configuration.DEBUG)
+          log.fine("SecurityManager forbids reading system properties. Ignored");
       }
     if (s != null)
       {
@@ -360,14 +343,14 @@
         // hide valid value set previously
         if (s.equals(TRUE) || s.equals(FALSE))
           {
-            if (DEBUG)
-              debug("Setting " + name + " to '" + s + "'");
+            if (Configuration.DEBUG)
+              log.fine("Setting " + name + " to '" + s + "'");
             props.put(name, s);
           }
         else
           {
-            if (DEBUG)
-              debug("Invalid value for -D" + name + ": " + s + ". Ignored");
+            if (Configuration.DEBUG)
+              log.fine("Invalid value for -D" + name + ": " + s + ". Ignored");
           }
       }
   }

Index: java/security/provider/PKIXCertPathValidatorImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- java/security/provider/PKIXCertPathValidatorImpl.java	4 Jun 2006 05:29:44 -0000	1.7
+++ java/security/provider/PKIXCertPathValidatorImpl.java	11 Jun 2006 12:14:44 -0000	1.8
@@ -38,6 +38,7 @@
 
 package gnu.java.security.provider;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.Registry;
 import gnu.java.security.key.dss.DSSPublicKey;
@@ -81,6 +82,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import java.util.logging.Logger;
 
 /**
  * An implementation of the Public Key Infrastructure's X.509
@@ -94,17 +96,7 @@
  */
 public class PKIXCertPathValidatorImpl extends CertPathValidatorSpi
 {
-
-  // Constants.
-  // -------------------------------------------------------------------------
-
-  private static final boolean DEBUG = false;
-  private static void debug (String msg)
-  {
-    System.err.print (">> PKIXCertPathValidatorImpl: ");
-    System.err.println (msg);
-  }
-
+  private static final Logger log = Logger.getLogger(PKIXCertPathValidatorImpl.class.getName());
   public static final String ANY_POLICY = "2.5.29.32.0";
 
   // Constructor.
@@ -603,7 +595,8 @@
                                        boolean explicitPolicy)
     throws CertPathValidatorException
   {
-    if (DEBUG) debug("updatePolicyTree depth == " + depth);
+    if (Configuration.DEBUG)
+      log.fine("updatePolicyTree depth == " + depth);
     Set nodes = new HashSet();
     LinkedList stack = new LinkedList();
     Iterator current = null;
@@ -614,15 +607,18 @@
         while (current.hasNext())
           {
             PolicyNodeImpl p = (PolicyNodeImpl) current.next();
-            if (DEBUG) debug("visiting node == " + p);
+            if (Configuration.DEBUG)
+              log.fine("visiting node == " + p);
             if (p.getDepth() == depth - 1)
               {
-                if (DEBUG) debug("added node");
+                if (Configuration.DEBUG)
+                  log.fine("added node");
                 nodes.add(p);
               }
             else
               {
-                if (DEBUG) debug("skipped node");
+                if (Configuration.DEBUG)
+                  log.fine("skipped node");
                 stack.addLast(current);
                 current = p.getChildren();
               }
@@ -646,16 +642,21 @@
     else
       cp = Collections.EMPTY_LIST;
     boolean match = false;
-    if (DEBUG) debug("nodes are == " + nodes);
-    if (DEBUG) debug("cert policies are == " + cp);
+    if (Configuration.DEBUG)
+      {
+        log.fine("nodes are == " + nodes);
+        log.fine("cert policies are == " + cp);
+      }
     for (Iterator it = nodes.iterator(); it.hasNext(); )
       {
         PolicyNodeImpl parent = (PolicyNodeImpl) it.next();
-        if (DEBUG) debug("adding policies to " + parent);
+        if (Configuration.DEBUG)
+          log.fine("adding policies to " + parent);
         for (Iterator it2 = cp.iterator(); it2.hasNext(); )
           {
             OID policy = (OID) it2.next();
-            if (DEBUG) debug("trying to add policy == " + policy);
+            if (Configuration.DEBUG)
+              log.fine("trying to add policy == " + policy);
             if (policy.toString().equals(ANY_POLICY) &&
                 params.isAnyPolicyInhibited())
               continue;
@@ -691,13 +692,15 @@
 
   private boolean checkExplicitPolicy (int depth, List explicitPolicies)
   {
-    if (DEBUG) debug ("checkExplicitPolicy depth=" + depth);
+    if (Configuration.DEBUG)
+      log.fine("checkExplicitPolicy depth=" + depth);
     for (Iterator it = explicitPolicies.iterator(); it.hasNext(); )
       {
         int[] i = (int[]) it.next();
         int caDepth = i[0];
         int limit = i[1];
-        if (DEBUG) debug ("  caDepth=" + caDepth + " limit=" + limit);
+        if (Configuration.DEBUG)
+          log.fine("  caDepth=" + caDepth + " limit=" + limit);
         if (depth - caDepth >= limit)
           return true;
       }

Index: javax/crypto/sasl/SaslInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/sasl/SaslInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- javax/crypto/sasl/SaslInputStream.java	26 Jan 2006 02:25:09 -0000	1.1
+++ javax/crypto/sasl/SaslInputStream.java	11 Jun 2006 12:14:44 -0000	1.2
@@ -38,12 +38,13 @@
 
 package gnu.javax.crypto.sasl;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.util.Util;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InterruptedIOException;
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.util.logging.Logger;
 
 import javax.security.sasl.Sasl;
 import javax.security.sasl.SaslClient;
@@ -55,41 +56,11 @@
  */
 public class SaslInputStream extends InputStream
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "SaslOutputStream";
-
-  private static final String ERROR = "ERROR";
-
-  private static final String WARN = " WARN";
-
-  //   private static final String INFO =  " INFO";
-  private static final String TRACE = "DEBUG";
-
-  private static final boolean DEBUG = true;
-
-  private static final int debuglevel = 3;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(String level, Object obj)
-  {
-    err.println("[" + level + "] " + NAME + ": " + String.valueOf(obj));
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(SaslInputStream.class.getName());
   private SaslClient client;
-
   private SaslServer server;
-
   private int maxRawSendSize;
-
   private InputStream source;
-
   private byte[] internalBuf;
 
   // Constructor(s)
@@ -168,7 +139,6 @@
         else
           {
             byte[] tmp = new byte[internalBuf.length - 1];
-            //            System.arraycopy(internalBuf, 0, tmp, 0, tmp.length);
             System.arraycopy(internalBuf, 1, tmp, 0, tmp.length);
             internalBuf = tmp;
           }
@@ -241,32 +211,22 @@
    */
   public int read(byte[] b, int off, int len) throws IOException
   {
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> read(b, " + String.valueOf(off) + ", "
-                   + String.valueOf(len) + ")");
-
-    if (b == null)
-      {
-        throw new NullPointerException("b");
-      }
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "read",
+                   new Object[] { b, Integer.valueOf(off), Integer.valueOf(len) });
     if ((off < 0) || (off > b.length) || (len < 0) || ((off + len) > b.length)
         || ((off + len) < 0))
-      {
-        throw new IndexOutOfBoundsException("off=" + String.valueOf(off)
-                                            + ", len=" + String.valueOf(len)
-                                            + ", b.length="
-                                            + String.valueOf(b.length));
-      }
+      throw new IndexOutOfBoundsException("off=" + off
+                                          + ", len=" + len
+                                          + ", b.length=" + b.length);
     if (len == 0)
       {
-        if (DEBUG && debuglevel > 8)
-          debug(TRACE, "<== read() --> 0");
+        if (Configuration.DEBUG)
+          log.exiting(this.getClass().getName(), "read", Integer.valueOf(0));
         return 0;
       }
-
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Available: " + String.valueOf(available()));
-
+    if (Configuration.DEBUG)
+      log.finer("Available: " + available());
     int result = 0;
     if (internalBuf == null || internalBuf.length < 1)
       try
@@ -274,21 +234,24 @@
           internalBuf = readSaslBuffer();
           if (internalBuf == null)
             {
-              if (DEBUG && debuglevel > 4)
-                debug(WARN, "Underlying stream empty. Returning -1");
-              if (DEBUG && debuglevel > 8)
-                debug(TRACE, "<== read() --> -1");
+              if (Configuration.DEBUG)
+                {
+                  log.finer("Underlying stream empty. Returning -1");
+                  log.exiting(this.getClass().getName(), "read",
+                              Integer.valueOf(-1));
+                }
               return -1;
             }
         }
       catch (InterruptedIOException x)
         {
-          if (DEBUG && debuglevel > 6)
-            debug(TRACE, x);
-          if (DEBUG && debuglevel > 4)
-            debug(WARN, "Reading thread was interrupted. Returning -1");
-          if (DEBUG && debuglevel > 8)
-            debug(TRACE, "<== read() --> -1");
+          if (Configuration.DEBUG)
+            {
+              log.finer("Reading thread was interrupted. Returning -1");
+              log.throwing(this.getClass().getName(), "read", x);
+              log.exiting(this.getClass().getName(), "read",
+                          Integer.valueOf(-1));
+            }
           return -1;
         }
 
@@ -328,8 +291,8 @@
               data = readSaslBuffer();
               if (data == null)
                 {
-                  if (DEBUG && debuglevel > 4)
-                    debug(WARN, "Underlying stream exhausted. Breaking...");
+                  if (Configuration.DEBUG)
+                    log.finer("Underlying stream exhausted. Breaking...");
                   break;
                 }
 
@@ -352,18 +315,16 @@
             }
           else
             { // nothing much we can do except return what we have
-              if (DEBUG && debuglevel > 4)
-                debug(WARN,
-                      "Not enough bytes in source to read a buffer. Breaking...");
+              if (Configuration.DEBUG)
+                log.finer("Not enough bytes in source to read a buffer. Breaking...");
               break;
             }
       }
-
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Remaining: "
-                   + (internalBuf == null ? 0 : internalBuf.length));
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "<== read() --> " + String.valueOf(result));
+    if (Configuration.DEBUG)
+      {
+        log.finer("Remaining: " + (internalBuf == null ? 0 : internalBuf.length));
+        log.exiting(this.getClass().getName(), "read()", String.valueOf(result));
+      }
     return result;
   }
 
@@ -379,9 +340,8 @@
    */
   private byte[] readSaslBuffer() throws IOException
   {
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> readSaslBuffer()");
-
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "readSaslBuffer()");
     int realLength; // check if we read as many bytes as we're supposed to
     byte[] result = new byte[4];
     try
@@ -389,32 +349,27 @@
         realLength = source.read(result);
         if (realLength == -1)
           {
-            if (DEBUG && debuglevel > 8)
-              debug(TRACE, "<== readSaslBuffer() --> null");
+            if (Configuration.DEBUG)
+              log.exiting(this.getClass().getName(), "readSaslBuffer");
             return null;
           }
       }
     catch (IOException x)
       {
-        if (DEBUG && debuglevel > 0)
-          debug(ERROR, x);
+        if (Configuration.DEBUG)
+          log.throwing(this.getClass().getName(), "readSaslBuffer", x);
         throw x;
       }
 
     if (realLength != 4)
-      {
-        throw new IOException("Was expecting 4 but found "
-                              + String.valueOf(realLength));
-      }
+      throw new IOException("Was expecting 4 but found " + realLength);
     int bufferLength = result[0] << 24 | (result[1] & 0xFF) << 16
                        | (result[2] & 0xFF) << 8 | (result[3] & 0xFF);
 
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "SASL buffer size: " + bufferLength);
+    if (Configuration.DEBUG)
+      log.finer("SASL buffer size: " + bufferLength);
     if (bufferLength > maxRawSendSize || bufferLength < 0)
-      {
         throw new SaslEncodingException("SASL buffer (security layer) too long");
-      }
 
     result = new byte[bufferLength];
     try
@@ -423,37 +378,34 @@
       }
     catch (IOException x)
       {
-        if (DEBUG && debuglevel > 0)
-          debug(ERROR, x);
+        if (Configuration.DEBUG)
+          log.throwing(this.getClass().getName(), "readSaslBuffer", x);
         throw x;
       }
 
     if (realLength != bufferLength)
-      throw new IOException("Was expecting " + String.valueOf(bufferLength)
-                            + " but found " + String.valueOf(realLength));
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Incoming buffer (before security) (hex): "
+      throw new IOException("Was expecting " + bufferLength
+                            + " but found " + realLength);
+    if (Configuration.DEBUG)
+      {
+        log.finer("Incoming buffer (before security) (hex): "
                    + Util.dumpString(result));
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Incoming buffer (before security) (str): \""
+        log.finer("Incoming buffer (before security) (str): \""
                    + new String(result) + "\"");
-
+      }
     if (client != null)
-      {
         result = client.unwrap(result, 0, realLength);
-      }
     else
-      {
         result = server.unwrap(result, 0, realLength);
-      }
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Incoming buffer (after security) (hex): "
+
+    if (Configuration.DEBUG)
+      {
+        log.finer("Incoming buffer (after security) (hex): "
                    + Util.dumpString(result));
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "Incoming buffer (after security) (str): \""
+        log.finer("Incoming buffer (after security) (str): \""
                    + new String(result) + "\"");
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "<== readSaslBuffer()");
+        log.exiting(this.getClass().getName(), "readSaslBuffer");
+      }
     return result;
   }
 }
\ No newline at end of file

Index: javax/crypto/sasl/SaslOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- javax/crypto/sasl/SaslOutputStream.java	26 Jan 2006 02:25:09 -0000	1.1
+++ javax/crypto/sasl/SaslOutputStream.java	11 Jun 2006 12:14:44 -0000	1.2
@@ -38,11 +38,12 @@
 
 package gnu.javax.crypto.sasl;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.util.Util;
 
-import java.io.OutputStream;
 import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.OutputStream;
+import java.util.logging.Logger;
 
 import javax.security.sasl.Sasl;
 import javax.security.sasl.SaslClient;
@@ -54,37 +55,10 @@
  */
 public class SaslOutputStream extends OutputStream
 {
-
-  // Debugging methods and variables
-  // -------------------------------------------------------------------------
-
-  private static final String NAME = "SaslOutputStream";
-
-  //   private static final String ERROR = "ERROR";
-  //   private static final String WARN =  " WARN";
-  //   private static final String INFO =  " INFO";
-  private static final String TRACE = "DEBUG";
-
-  private static final boolean DEBUG = true;
-
-  private static final int debuglevel = 3;
-
-  private static final PrintWriter err = new PrintWriter(System.out, true);
-
-  private static void debug(String level, Object obj)
-  {
-    err.println("[" + level + "] " + NAME + ": " + String.valueOf(obj));
-  }
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
+  private static final Logger log = Logger.getLogger(SaslOutputStream.class.getName());
   private SaslClient client;
-
   private SaslServer server;
-
   private int maxRawSendSize;
-
   private OutputStream dest;
 
   // Constructor(s)
@@ -148,52 +122,45 @@
    */
   public void write(byte[] b, int off, int len) throws IOException
   {
-    if (b == null)
-      {
-        throw new NullPointerException("b");
-      }
+    if (Configuration.DEBUG)
+      log.entering(this.getClass().getName(), "write");
     if ((off < 0) || (off > b.length) || (len < 0) || ((off + len) > b.length)
         || ((off + len) < 0))
-      {
-        throw new IndexOutOfBoundsException("off=" + String.valueOf(off)
-                                            + ", len=" + String.valueOf(len)
-                                            + ", b.length="
-                                            + String.valueOf(b.length));
-      }
+      throw new IndexOutOfBoundsException("off=" + off
+                                          + ", len=" + len
+                                          + ", b.length=" + b.length);
     if (len == 0)
       {
+        if (Configuration.DEBUG)
+          log.exiting(this.getClass().getName(), "write");
         return;
       }
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "==> write()");
-
     int chunckSize, length, chunck = 1;
     byte[] output = null, result;
-    if (DEBUG && debuglevel > 6)
-      debug(TRACE, "About to wrap " + String.valueOf(len) + " byte(s)...");
+    if (Configuration.DEBUG)
+      log.finer("About to wrap " + len + " byte(s)...");
     while (len > 0)
       {
         chunckSize = (len > maxRawSendSize ? maxRawSendSize : len);
-
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Outgoing buffer (before security) (hex): "
+        if (Configuration.DEBUG)
+          {
+            log.finer("Outgoing buffer (before security) (hex): "
                        + Util.dumpString(b, off, chunckSize));
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Outgoing buffer (before security) (str): \""
+            log.finer("Outgoing buffer (before security) (str): \""
                        + new String(b, off, chunckSize) + "\"");
-
+          }
         if (client != null)
           output = client.wrap(b, off, chunckSize);
         else
           output = server.wrap(b, off, chunckSize);
 
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Outgoing buffer (after security) (hex): "
+        if (Configuration.DEBUG)
+          {
+            log.finer("Outgoing buffer (after security) (hex): "
                        + Util.dumpString(output));
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Outgoing buffer (after security) (str): \""
+            log.finer("Outgoing buffer (after security) (str): \""
                        + new String(output) + "\"");
-
+          }
         length = output.length;
         result = new byte[length + 4];
         result[0] = (byte) (length >>> 24);
@@ -206,13 +173,12 @@
 
         off += chunckSize;
         len -= chunckSize;
-        if (DEBUG && debuglevel > 6)
-          debug(TRACE, "Wrapped chunck #" + String.valueOf(chunck));
+        if (Configuration.DEBUG)
+          log.finer("Wrapped chunck #" + chunck);
         chunck++;
       }
-
     dest.flush();
-    if (DEBUG && debuglevel > 8)
-      debug(TRACE, "<== write()");
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "write");
   }
 }
\ No newline at end of file


Index: javax/crypto/mac/OMAC.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mac/OMAC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/mac/OMAC.java	4 Jun 2006 06:57:26 -0000	1.2
+++ javax/crypto/mac/OMAC.java	11 Jun 2006 12:14:46 -0000	1.3
@@ -38,6 +38,7 @@
 
 package gnu.javax.crypto.mac;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.Registry;
 import gnu.java.security.util.Util;
 import gnu.javax.crypto.cipher.CipherFactory;
@@ -48,6 +49,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Logger;
 
 /**
  * <p>The One-Key CBC MAC, OMAC. This message authentication code is based on
@@ -62,18 +64,7 @@
  */
 public class OMAC implements IMac
 {
-
-  // Constants and fields.
-  // ------------------------------------------------------------------------
-
-  private static final boolean DEBUG = false;
-
-  private static void debug(String msg)
-  {
-    System.out.print(">>> OMAC: ");
-    System.out.println(msg);
-  }
-
+  private static final Logger log = Logger.getLogger(OMAC.class.getName());
   private static final byte C1 = (byte) 0x87;
 
   private static final byte C2 = 0x1b;
@@ -157,12 +148,8 @@
 
     byte[] L = new byte[blockSize];
     cipher.encryptBlock(L, 0, L, 0);
-
-    if (DEBUG)
-      {
-        debug("L = " + Util.toString(L).toLowerCase());
-      }
-
+    if (Configuration.DEBUG)
+      log.fine("L = " + Util.toString(L).toLowerCase());
     if (Lu != null)
       {
         Arrays.fill(Lu, (byte) 0);
@@ -214,11 +201,8 @@
                                                    + blockSize);
           }
       }
-    if (DEBUG)
-      {
-        debug("Lu = " + Util.toString(Lu).toLowerCase());
-      }
-
+    if (Configuration.DEBUG)
+      log.fine("Lu = " + Util.toString(Lu).toLowerCase());
     msb = (Lu[0] & 0x80) != 0;
     for (int i = 0; i < blockSize; i++)
       {
@@ -239,11 +223,8 @@
             Lu2[Lu2.length - 1] ^= C2;
           }
       }
-    if (DEBUG)
-      {
-        debug("Lu2 = " + Util.toString(Lu2).toLowerCase());
-      }
-
+    if (Configuration.DEBUG)
+      log.fine("Lu2 = " + Util.toString(Lu2).toLowerCase());
     if (M != null)
       {
         Arrays.fill(M, (byte) 0);



From MAILER-DAEMON Sun Jun 11 15:53:30 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpW02-00040V-No
	for mharc-commit-classpath@gnu.org; Sun, 11 Jun 2006 15:53:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpW00-00040P-GK
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 15:53:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpVzx-00040C-SM
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 15:53:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpVzx-000409-NO
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 15:53:25 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpW8W-00083c-M1
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 16:02:16 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpVzx-0003Ny-00
	for <commit-classpath@gnu.org>; Sun, 11 Jun 2006 15:53:25 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FpVzx-0003Nv-09
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 19:53:25 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpVzx-0003Nv-09@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 11 Jun 2006 19:53:25 +0000
Subject: [commit-cp] classpath/vm/reference/gnu/java/lang/management
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jun 2006 19:53:29 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/11 19:53:24

New directory:
	vm/reference/gnu/java/lang/management

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/gnu/java/lang/management/?cvsroot=classpath



From MAILER-DAEMON Sun Jun 11 17:57:20 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpXvs-0007kF-NY
	for mharc-commit-classpath@gnu.org; Sun, 11 Jun 2006 17:57:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpXvq-0007jO-SI
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 17:57:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpXvp-0007jC-T9
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 17:57:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpXvp-0007j6-Nu
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 17:57:17 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpY4P-0006V9-Is
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 18:06:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpXvo-000083-00
	for <commit-classpath@gnu.org>; Sun, 11 Jun 2006 17:57:16 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FpXvn-000080-Io
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 21:57:16 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpXvn-000080-Io@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 11 Jun 2006 21:57:15 +0000
Subject: [commit-cp] classpath ChangeLog NEWS doc/vmintegration.texi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jun 2006 21:57:19 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/11 21:57:15

Modified files:
	.              : ChangeLog NEWS 
	doc            : vmintegration.texinfo 
	java/lang/management: ManagementFactory.java RuntimeMXBean.java 
Added files:
	gnu/java/lang/management: RuntimeMXBeanImpl.java 
	vm/reference/gnu/java/lang/management: VMRuntimeMXBeanImpl.java 

Log message:
	2006-06-11  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* NEWS:
		Mention new VM interface and use of properties.
		* doc/vmintegration.texinfo:
		Update with new gnu.java.lang.management section.
		* gnu/java/lang/management/RuntimeMXBeanImpl.java:
		New file.
		* java/lang/management/ManagementFactory.java:
		(getRuntimeMXBean()): Implemented.
		* vm/reference/gnu/java/lang/management/RuntimeMXBeanImpl.java:
		New VM interface file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7771&r2=1.7772
http://cvs.savannah.gnu.org/viewcvs/classpath/NEWS?cvsroot=classpath&r1=1.148&r2=1.149
http://cvs.savannah.gnu.org/viewcvs/classpath/doc/vmintegration.texinfo?cvsroot=classpath&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/lang/management/RuntimeMXBeanImpl.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ManagementFactory.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/RuntimeMXBean.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/gnu/java/lang/management/VMRuntimeMXBeanImpl.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7771
retrieving revision 1.7772
diff -u -b -r1.7771 -r1.7772
--- ChangeLog	11 Jun 2006 12:14:45 -0000	1.7771
+++ ChangeLog	11 Jun 2006 21:57:14 -0000	1.7772
@@ -1,3 +1,16 @@
+2006-06-11  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* NEWS:
+	Mention new VM interface and use of properties.
+	* doc/vmintegration.texinfo:
+	Update with new gnu.java.lang.management section.
+	* gnu/java/lang/management/RuntimeMXBeanImpl.java:
+	New file.
+	* java/lang/management/ManagementFactory.java:
+	(getRuntimeMXBean()): Implemented.
+	* vm/reference/gnu/java/lang/management/RuntimeMXBeanImpl.java:
+	New VM interface file.
+	
 2006-06-11  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	PR Classpath/26065

Index: NEWS
===================================================================
RCS file: /cvsroot/classpath/classpath/NEWS,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- NEWS	7 Jun 2006 15:09:40 -0000	1.148
+++ NEWS	11 Jun 2006 21:57:14 -0000	1.149
@@ -30,6 +30,12 @@
 * The method gnu.java.io.PlatformHelper.toCanonicalForm() has been
   replaced with a JNI implementation of VMFile.toCanonicalForm() for
   GNU/Posix systems.
+* An new class, VMRuntimeMXBeanImpl, is used to implement
+  the low-level support of the runtime management bean.
+  VMs should use it to supply the input arguments and start
+  time of the VM.  In addition, one of sun.boot.class.path
+  or java.boot.class.path should be defined by the VM to
+  support the optional boot class path access functionality.
 
 New in release 0.91 (May 15, 2006)
 

Index: doc/vmintegration.texinfo
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/vmintegration.texinfo,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- doc/vmintegration.texinfo	22 Apr 2006 21:52:18 -0000	1.28
+++ doc/vmintegration.texinfo	11 Jun 2006 21:57:15 -0000	1.29
@@ -202,6 +202,7 @@
 * gnu.java.nio::
 * java.lang.reflect::
 * gnu.java.lang::
+* gnu.java.lang.management::
 * Classpath Callbacks::
 @end menu
 
@@ -1206,7 +1207,7 @@
 particular class and size.  The default implementation simply passes
 the job down to the standard JNI function, @code{NewObjectArray}.
 
-@node gnu.java.lang, Classpath Callbacks, java.lang.reflect, Classpath Hooks
+@node gnu.java.lang, gnu.java.lang.management, java.lang.reflect, Classpath Hooks
 @section @code{gnu.java.lang}
 
 @code{gnu.java.lang} provides VM interfaces for the GNU
@@ -1258,7 +1259,59 @@
 which must be implemented by the VM. The implementation should call the
 @code{InstrumentationImpl.callTransformers} method.
 
-@node Classpath Callbacks, , gnu.java.lang, Classpath Hooks
+@node gnu.java.lang.management, Classpath Callbacks, gnu.java.lang, Classpath Hooks
+@section @code{gnu.java.lang.management}
+
+@code{gnu.java.lang.management} provides the VM interfaces for the GNU
+implementations of the management beans.  
+
+@menu
+* gnu.java.lang.management.VMRuntimeMXBeanImpl::
+@end menu
+
+@node gnu.java.lang.management.VMRuntimeMXBeanImpl,,,gnu.java.lang.management
+@subsection @code{gnu.java.lang.management.VMRuntimeMXBeanImpl}
+
+The @code{gnu.java.lang.management.RuntimeMXBeanImpl} provides an
+implementation of the @code{java.lang.management.RuntimeMXBean} interface,
+and is supported by VM functionality in the form of
+@code{gnu.java.lang.management.VMRuntimeMXBeanImpl}.  This provides a
+series of methods, which should be implemented by the virtual machine
+in order to provide the required information for the bean.  The VM
+methods are generally representative of information that is only
+available from the virtual machine, such as the command-line arguments
+it was given at startup.
+
+The methods are as follows:
+
+@itemize @bullet
+@item @code{(getInputArguments())} -- The VM should supply
+a @code{String} array containing each of the command-line
+arguments, excluding those that are directed at the
+@code{main()} method.  The reference implementation expects
+this to be a native method.
+@item @code{(getName())} -- The VM developer should choose
+an appropriate name for the virtual machine.  This name can
+be instance-specific e.g. it can include things like the
+process identifier or host name of the machine, which only
+apply to the current running instance.  Thus, the intention is
+that this name refers to the entity that the other information
+refers to, rather than the VM in general.  The reference
+implementation supplies a default concatenation of the VM
+name and version.
+@item @code{(getStartTime())} -- This should return the number
+of milliseconds at which the virtual machine was started.
+The uptime property of the bean is provided relative to this
+value.  Again, the reference implementation also expects
+this method to be native.
+@end itemize
+
+The virtual machine also needs to provide either the
+@code{sun.boot.class.path} or @code{java.boot.class.path}
+property in order to support the optional boot class path
+retrieval functionality.
+
+@node Classpath Callbacks, , gnu.java.lang.management, Classpath Hooks
 Some of the classes you implement for the VM will need to call back to
 package-private methods in Classpath:
 

Index: java/lang/management/ManagementFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/management/ManagementFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- java/lang/management/ManagementFactory.java	28 May 2006 15:04:15 -0000	1.1
+++ java/lang/management/ManagementFactory.java	11 Jun 2006 21:57:15 -0000	1.2
@@ -38,6 +38,7 @@
 package java.lang.management;
 
 import gnu.java.lang.management.OperatingSystemMXBeanImpl;
+import gnu.java.lang.management.RuntimeMXBeanImpl;
 
 /**
  * <p>
@@ -65,6 +66,11 @@
   private static OperatingSystemMXBean osBean;
 
   /**
+   * The runtime management bean.
+   */
+  private static RuntimeMXBean runtimeBean;
+
+  /**
    * Returns the operating system management bean for the
    * operating system on which the virtual machine is running.
    *
@@ -78,4 +84,18 @@
     return osBean;
   }
 
+  /**
+   * Returns the runtime management bean for the
+   * running virtual machine.
+   *
+   * @return an instance of {@link RuntimeMXBean} for
+   *         this virtual machine.
+   */
+  public static RuntimeMXBean getRuntimeMXBean()
+  {
+    if (runtimeBean == null)
+      runtimeBean = new RuntimeMXBeanImpl();
+    return runtimeBean;
+  }
+
 }

Index: java/lang/management/RuntimeMXBean.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/management/RuntimeMXBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- java/lang/management/RuntimeMXBean.java	8 Jun 2006 23:11:58 -0000	1.1
+++ java/lang/management/RuntimeMXBean.java	11 Jun 2006 21:57:15 -0000	1.2
@@ -140,7 +140,11 @@
    * virtual machine.  It may include a number of system
    * attributes and may differ between instances of the
    * same virtual machine (for example, it might include
-   * the process identifier).
+   * the process identifier or the host name of the machine
+   * on which it is running).  The intention is that this
+   * name refers to the precise entity that the other data 
+   * supplied by this bean refers to, rather than the VM
+   * in general.
    *
    * @return the name of this virtual machine.
    */

Index: gnu/java/lang/management/RuntimeMXBeanImpl.java
===================================================================
RCS file: gnu/java/lang/management/RuntimeMXBeanImpl.java
diff -N gnu/java/lang/management/RuntimeMXBeanImpl.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/lang/management/RuntimeMXBeanImpl.java	11 Jun 2006 21:57:15 -0000	1.1
@@ -0,0 +1,188 @@
+/* RuntimeMXBeanImpl.java - Implementation of an runtime bean
+   Copyright (C) 2006 Free Software Foundation
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.java.lang.management;
+
+import gnu.classpath.SystemProperties;
+
+import java.lang.management.ManagementPermission;
+import java.lang.management.RuntimeMXBean;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Provides access to information about the virtual machine.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public final class RuntimeMXBeanImpl
+  implements RuntimeMXBean
+{
+
+  private static final String SUN_BOOT_CLASS_PATH = "sun.boot.class.path";
+  private static final String JAVA_BOOT_CLASS_PATH = "java.boot.class.path";
+
+  private long startTime = -1;
+
+  private String bootClassPath = null;
+
+  private boolean bootClassPathSupported = true;
+
+  void checkMonitorPermissions()
+  {
+    SecurityManager sm = System.getSecurityManager();
+    if (sm != null)
+      sm.checkPermission(new ManagementPermission("monitor"));
+  }
+
+  public String getBootClassPath()
+  {
+    checkMonitorPermissions();
+    if (isBootClassPathSupported())
+      return bootClassPath;
+    else
+      throw
+	new UnsupportedOperationException("Retrieving the boot " +
+					  "classpath is not supported.");
+  }
+
+  public String getClassPath()
+  {
+    return System.getProperty("java.class.path");
+  }
+
+  public List getInputArguments()
+  {
+    checkMonitorPermissions();
+    return Arrays.asList(VMRuntimeMXBeanImpl.getInputArguments());
+  }
+
+  public String getLibraryPath()
+  {
+    return System.getProperty("java.library.path");
+  }
+
+  public String getManagementSpecVersion()
+  {
+    return "1.0";
+  }
+
+  public String getName()
+  {
+    return VMRuntimeMXBeanImpl.getName();
+  }
+
+  public String getSpecName()
+  {
+    return System.getProperty("java.vm.specification.name");
+  }
+
+  public String getSpecVendor()
+  {
+    return System.getProperty("java.vm.specification.vendor");
+  }
+
+  public String getSpecVersion()
+  {
+    return System.getProperty("java.vm.specification.version");
+  }
+
+  public long getStartTime()
+  {
+    if (startTime == -1)
+      startTime = VMRuntimeMXBeanImpl.getStartTime();
+    return startTime;
+  }
+
+  public Map getSystemProperties()
+  {
+    Map map = new HashMap();
+    Properties props = System.getProperties();
+    Iterator entries = props.entrySet().iterator();
+    while (entries.hasNext())
+      {
+	Map.Entry next = (Map.Entry) entries.next();
+	Object key = next.getKey();
+	Object value = next.getValue();
+	if (key instanceof String &&
+	    value instanceof String)
+	  map.put(key, value);
+      }
+    return map;
+  }
+  
+  public long getUptime()
+  {
+    return new Date().getTime() - getStartTime();
+  }
+
+  public String getVmName()
+  {
+    return System.getProperty("java.vm.name");
+  }
+
+  public String getVmVendor()
+  {
+    return System.getProperty("java.vm.vendor");
+  }
+
+  public String getVmVersion()
+  {
+    return System.getProperty("java.vm.version");
+  }
+
+  public boolean isBootClassPathSupported()
+  {
+    if (bootClassPath == null)
+      {
+	bootClassPath = System.getProperty(JAVA_BOOT_CLASS_PATH);
+	if (bootClassPath == null)
+	  bootClassPath = System.getProperty(SUN_BOOT_CLASS_PATH);
+	if (bootClassPath == null)
+	  bootClassPathSupported = false;
+      }
+    return bootClassPathSupported;
+  }
+
+}

Index: vm/reference/gnu/java/lang/management/VMRuntimeMXBeanImpl.java
===================================================================
RCS file: vm/reference/gnu/java/lang/management/VMRuntimeMXBeanImpl.java
diff -N vm/reference/gnu/java/lang/management/VMRuntimeMXBeanImpl.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ vm/reference/gnu/java/lang/management/VMRuntimeMXBeanImpl.java	11 Jun 2006 21:57:15 -0000	1.1
@@ -0,0 +1,89 @@
+/* VMRuntimeMXBeanImpl.java - VM implementation of an runtime bean
+   Copyright (C) 2006 Free Software Foundation
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.java.lang.management;
+
+import gnu.classpath.SystemProperties;
+
+/**
+ * Provides access to information about the virtual machine.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+final class VMRuntimeMXBeanImpl
+{
+
+  /**
+   * Returns the command-line arguments supplied
+   * to the virtual machine, excluding those supplied
+   * to <code>main()</code>.
+   *
+   * @return the command-line arguments.
+   */
+  static native String[] getInputArguments();
+
+  /**
+   * Returns a developer-chosen name for the virtual
+   * machine, which may differ over different running
+   * instances of the same virtual machine binary.
+   * For example, this may include the particular
+   * process identifier used by this instance or
+   * the host name of the machine on which it is
+   * running.  The intention is that this name refers
+   * to the precise entity that the other data supplied
+   * by the bean refers to, rather than the VM in general.
+   *
+   * @return the custom name of the VM.
+   */
+  static String getName()
+  {
+    return SystemProperties.getProperty("java.vm.name") + " " +
+      SystemProperties.getProperty("java.vm.version");
+  }
+
+  /**
+   * The time in milliseconds at which the virtual
+   * machine was started.  This method is only executed
+   * once (for efficency), as the value is not expected
+   * to change.
+   *
+   * @return the VM start time.
+   */
+  static native long getStartTime();
+
+}



From MAILER-DAEMON Sun Jun 11 18:02:20 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpY0i-0000Y5-5b
	for mharc-commit-classpath@gnu.org; Sun, 11 Jun 2006 18:02:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpY0g-0000XG-ER
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 18:02:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpY0e-0000X0-Ja
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 18:02:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpY0e-0000Wx-Gz
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 18:02:16 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpY9E-0006lf-I1
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 18:11:08 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpY0d-0000DZ-00
	for <commit-classpath@gnu.org>; Sun, 11 Jun 2006 18:02:15 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FpY0c-0000DV-K9
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 22:02:15 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpY0c-0000DV-K9@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Sun, 11 Jun 2006 22:02:14 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/GdkPi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jun 2006 22:02:18 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/11 22:02:14

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: GdkPixbufDecoder.java 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_GdkPixbufDecoder.c 

Log message:
	       * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (streamImage):
	       Takes GdkPixbufWriter.
	       (GdkPixbufWriter): Implements Runnable.
	       (write(IIOMetadata,IIOImage,ImageWriteParam)): Start Thread for
	       data processing.
	       (DATADONE): New static final field.
	       (data): New field.
	       (write(byte[])): New method.
	       (run): Likewise.
	       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
	       (Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initStaticState):
	       Get dataOutputWriteID from writeClass.
	       (stream_save_request): Change stream field to writer.
	       (save_to_stream): Remove FIXME, call writer.
	       (Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_streamImage):
	       Store writer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7772&r2=1.7773
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java?cvsroot=classpath&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c?cvsroot=classpath&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7772
retrieving revision 1.7773
diff -u -b -r1.7772 -r1.7773
--- ChangeLog	11 Jun 2006 21:57:14 -0000	1.7772
+++ ChangeLog	11 Jun 2006 22:02:13 -0000	1.7773
@@ -1,3 +1,22 @@
+2006-06-11  Mark Wielaard  <mark@klomp.org>
+
+	* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (streamImage):
+	Takes GdkPixbufWriter.
+	(GdkPixbufWriter): Implements Runnable.
+	(write(IIOMetadata,IIOImage,ImageWriteParam)): Start Thread for
+	data processing.
+	(DATADONE): New static final field.
+	(data): New field.
+	(write(byte[])): New method.
+	(run): Likewise.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
+	(Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initStaticState):
+	Get dataOutputWriteID from writeClass.
+	(stream_save_request): Change stream field to writer.
+	(save_to_stream): Remove FIXME, call writer.
+	(Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_streamImage):
+	Store writer.
+
 2006-06-11  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* NEWS:

Index: gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gnu/java/awt/peer/gtk/GdkPixbufDecoder.java	30 May 2006 22:36:32 -0000	1.22
+++ gnu/java/awt/peer/gtk/GdkPixbufDecoder.java	11 Jun 2006 22:02:14 -0000	1.23
@@ -103,7 +103,14 @@
   native void pumpBytes (byte[] bytes, int len) throws IOException;
   native void pumpDone () throws IOException;
   native void finish (boolean needsClose);
-  static native void streamImage(int[] bytes, String format, int width, int height, boolean hasAlpha, DataOutput sink);
+
+  /**
+   * Converts given image to bytes.
+   * Will call the GdkPixbufWriter for each chunk.
+   */
+  static native void streamImage(int[] bytes, String format,
+                                 int width, int height,
+                                 boolean hasAlpha, GdkPixbufWriter writer);
   
   // gdk-pixbuf provids data in RGBA format
   static final ColorModel cm = new DirectColorModel (32, 0xff000000, 
@@ -461,7 +468,7 @@
   }
 
   private static class GdkPixbufWriter
-    extends ImageWriter
+    extends ImageWriter implements Runnable
   {
     String ext;
     public GdkPixbufWriter(GdkPixbufWriterSpi ownerSpi, Object ext)
@@ -519,11 +526,77 @@
           model = img.getColorModel();
         }
 
+      new Thread(this, "GdkPixbufWriter").start();
       processImageStarted(1);
       synchronized(pixbufLock)
 	{
 	  streamImage(pixels, this.ext, width, height, model.hasAlpha(), 
-		      (DataOutput) this.getOutput());
+		      this);
+	}
+      synchronized(data)
+        {
+          data.add(DATADONE);
+        }
+    }    
+
+    /**
+     * Object marking end of data from native streamImage code.
+     */
+    private static final Object DATADONE = new Object();
+
+    /**
+     * Holds the data gotten from the native streamImage code.
+     * A worker thread will pull data out.
+     * Needs to be synchronized for access.
+     * The special object DATADONE is added when all data has been delivered.
+     */
+    private ArrayList data = new ArrayList();
+
+    /** Callback for streamImage native code. **/
+    private void write(byte[] bs)
+    {
+      synchronized(data)
+        {
+          data.add(bs);
+          data.notifyAll();
+        }
+    }
+
+    public void run()
+    {
+      boolean done = false;
+      while (!done)
+        {
+          synchronized(data)
+            {
+              while (data.isEmpty())
+                {
+                  try
+                    {
+                      data.wait();
+                    }
+                  catch (InterruptedException ie)
+                    {
+                      /* ignore */
+                    }
+                }
+
+              Object o = data.remove(0);
+              if (o == DATADONE)
+                done = true;
+              else
+                {
+                  DataOutput out = (DataOutput) getOutput();
+                  try
+                    {
+                      out.write((byte[]) o);
+                    }
+                  catch (IOException ioe)
+                    {
+                      // Not much we can do now...
+                    }
+                }
+            }
 	}
       processImageComplete();
     }    

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c	20 Mar 2006 14:42:37 -0000	1.22
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c	11 Jun 2006 22:02:14 -0000	1.23
@@ -278,7 +278,7 @@
 Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initStaticState 
   (JNIEnv *env, jclass clazz)
 {
-  jclass dataOutputClass;
+  jclass writerClass;
 
   (*env)->GetJavaVM(env, &vm);
 
@@ -296,9 +296,9 @@
      "(Ljava/lang/String;Z)"
      "Lgnu/java/awt/peer/gtk/GdkPixbufDecoder$ImageFormatSpec;");
 
-  
-  dataOutputClass = (*env)->FindClass(env, "java/io/DataOutput");
-  dataOutputWriteID = (*env)->GetMethodID (env, dataOutputClass,
+  writerClass = (*env)->FindClass
+    (env, "gnu/java/awt/peer/gtk/GdkPixbufDecoder$GdkPixbufWriter");
+  dataOutputWriteID = (*env)->GetMethodID (env, writerClass,
 					     "write", "([B)V");
 
   query_formats (env, clazz);
@@ -344,7 +344,7 @@
 struct stream_save_request
 {
   JNIEnv *env;
-  jobject *stream;
+  jobject *writer;
 };
 
 static gboolean
@@ -358,21 +358,14 @@
   jbyteArray jbuf;
   jbyte *cbuf;
 
-  /* FIXME. Don't call user code directly on this thread.
-     Store bytes and signal a "pump" thread to deliver to user code.
-     Then we don't have to drop/acquire any locks. */
-  gdk_threads_leave ();
-
   jbuf = (*(ssr->env))->NewByteArray ((ssr->env), count);
   cbuf = (*(ssr->env))->GetByteArrayElements ((ssr->env), jbuf, NULL);
   memcpy (cbuf, buf, count);
   (*(ssr->env))->ReleaseByteArrayElements ((ssr->env), jbuf, cbuf, 0);
-  (*(ssr->env))->CallVoidMethod ((ssr->env), *(ssr->stream), 
+  (*(ssr->env))->CallVoidMethod ((ssr->env), *(ssr->writer), 
 				 dataOutputWriteID, jbuf);  
   (*(ssr->env))->DeleteLocalRef((ssr->env), jbuf);
 
-  gdk_threads_enter ();
-
   return TRUE;
 }
 
@@ -381,7 +374,7 @@
 Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_streamImage
 (JNIEnv *env, jclass clazz __attribute__((unused)), 
  jintArray jarr, jstring jenctype, jint width, jint height, 
- jboolean hasAlpha, jobject stream)
+ jboolean hasAlpha, jobject writer) 
 {
   GdkPixbuf* pixbuf;  
   jint *ints;
@@ -391,7 +384,7 @@
   int i;
   struct stream_save_request ssr;
 
-  ssr.stream = &stream;
+  ssr.writer = &writer;
   ssr.env = env;
 
   ints = (*env)->GetIntArrayElements (env, jarr, NULL);



From MAILER-DAEMON Sun Jun 11 20:58:44 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpalQ-0005gr-9c
	for mharc-commit-classpath@gnu.org; Sun, 11 Jun 2006 20:58:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpalO-0005gm-3k
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 20:58:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpalM-0005ga-Jj
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 20:58:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpalM-0005gX-DQ
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 20:58:40 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fpaty-0003u1-5z
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 21:07:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpalG-0005i0-00
	for <commit-classpath@gnu.org>; Sun, 11 Jun 2006 20:58:34 -0400
Received: from fitzsim by savannah.gnu.org with local (Exim 4.50)
	id 1FpalF-0005hx-7y
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 00:58:34 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpalF-0005hx-7y@savannah.gnu.org>
From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Mon, 12 Jun 2006 00:58:33 +0000
Subject: [commit-cp] classpath ChangeLog doc/tools.texinfo
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 00:58:42 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Thomas Fitzsimmons <fitzsim>	06/06/12 00:58:33

Modified files:
	.              : ChangeLog 
	doc            : tools.texinfo 

Log message:
	2006-06-11  Thomas Fitzsimmons  <fitzsim@redhat.com>
	
	        * doc/tools.texinfo
	        (Applet Tools): New chapter.
	        (appletviewer Tool): New section.
	        (gcjwebplugin): New section.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7773&r2=1.7774
http://cvs.savannah.gnu.org/viewcvs/classpath/doc/tools.texinfo?cvsroot=classpath&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7773
retrieving revision 1.7774
diff -u -b -r1.7773 -r1.7774
--- ChangeLog	11 Jun 2006 22:02:13 -0000	1.7773
+++ ChangeLog	12 Jun 2006 00:58:31 -0000	1.7774
@@ -1,3 +1,10 @@
+2006-06-11  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* doc/tools.texinfo
+	(Applet Tools): New chapter.
+	(appletviewer Tool): New section.
+	(gcjwebplugin): New section.
+
 2006-06-11  Mark Wielaard  <mark@klomp.org>
 
 	* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (streamImage):

Index: doc/tools.texinfo
===================================================================
RCS file: /sources/classpath/classpath/doc/tools.texinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/tools.texinfo	11 Jun 2006 10:40:51 -0000	1.3
+++ doc/tools.texinfo	12 Jun 2006 00:58:32 -0000	1.4
@@ -40,7 +40,7 @@
 @contents
 
 @ifinfo
-@node Top, Security Tools, (dir), (dir)
+@node Top, Applet Tools, (dir), (dir)
 @top GNU Classpath Tools Guide
 
 This document contains important information you need to know in order to use
@@ -53,12 +53,18 @@
 @end ifinfo
 
 @menu
+* Applet Tools::               Work with applets
 * Security Tools::             Work securely with Java applications
 * I18N Issues::                How to add support for non-English languages
 
 @detailmenu
  --- The Detailed Node Listing ---
 
+Applet Tools
+
+* appletviewer Tool::          Load applets
+* gcjwebplugin::               Load applets in a web browser
+
 Security Tools
 
 * jarsigner Tool::             Sign and verify .JAR files
@@ -115,7 +121,150 @@
 
 @comment ----------------------------------------------------------------------
 
-@node Security Tools, I18N Issues, Top, Top
+@node Applet Tools, Security Tools, Top, Top
+@comment node-name, next, previous, up
+@chapter Applet Tools
+
+Two Applet Tools are available with GNU Classpath: @b{appletviewer}
+and @b{gcjwebplugin}.
+
+@menu
+* appletviewer Tool::          Load applets
+* gcjwebplugin::               Load applets in a web browser
+@end menu
+
+If while using these tools you think you found a bug, then please report it at @uref{http://www.gnu.org/software/classpath/bugs.html,classpath-bugs}.
+
+@comment ----------------------------------------------------------------------
+
+@node appletviewer Tool, gcjwebplugin, Applet Tools, Applet Tools
+@comment node-name, next, previous, up
+@section The @code{appletviewer} Tool
+
+@table @b
+
+@item SYNOPSIS
+@code{appletviewer [OPTION]... URL...}@*
+@code{appletviewer [OPTION]... -code CODE}@*
+@code{appletviewer [OPTION]... -plugin INPUT,OUTPUT}
+
+@item DESCRIPTION
+The @code{appletviewer} tool loads and runs an applet.
+
+Use the first form to test applets specified by tag.  The URL should
+resolve to an HTML document from which the @code{appletviewer} will
+extract applet tags.  The APPLET, EMBED and OBJECT tags are supported.
+If a given document contains multiple applet tags, all the applets
+will be loaded, with each applet appearing in its own window.
+Likewise, when multiple URLs are specified, each applet tag instance
+is given its own window.  If a given document contains no recognized
+tags the @code{appletviewer} does nothing.
+
+@example
+@code{appletviewer http://www.gnu.org/software/classpath/}
+@end example
+
+Use the second form to test an applet in development.  This form
+allows applet tag attributes to be supplied on the command line.  Only
+one applet may be specified using the @code{-code} option.  The
+@code{-code} option overrides the URL form -- any URLs specified will
+be ignored.
+
+@example
+@code{appletviewer -code Test.class -param datafile,data.txt}
+@end example
+
+@code{gcjwebplugin} uses the third form to communicate with the
+@code{appletviewer} through named pipes.
+
+@item URL OPTIONS
+@table @b
+@item -debug
+This option is not yet implemented but is provided for compatibility.
+
+@item -encoding CHARSET
+Use this option to specify an alternate character encoding for the
+specified HTML page.
+
+@end table
+
+@item APPLET TAG OPTIONS
+@table @b
+@item -code CODE
+Use the @code{-code} option to specify the value of the applet tag
+CODE attribute.
+
+@item -codebase CODEBASE
+Use the @code{-codebase} option to specify the value of the applet tag
+CODEBASE attribute.
+
+@item -archive ARCHIVE
+Use the @code{-archive} option to specify the value of the applet tag
+ARCHIVE attribute.
+
+@item -width WIDTH
+Use the @code{-width} option to specify the value of the applet tag
+WIDTH attribute.
+
+@item -height HEIGHT
+Use the @code{-height} option to specify the value of the applet tag
+HEIGHT attribute.
+
+@item -param NAME,VALUE
+Use the @code{-param} option to specify values for the NAME and VALUE
+attributes of an applet PARAM tag.
+
+@end table
+
+@item PLUGIN OPTION
+@table @b
+@item -plugin INPUT,OUTPUT
+@code{gcjwebplugin} uses the @code{-plugin} option to specify the
+named pipe the @code{appletviewer} should use for receiving commands
+(INPUT) and the one it should use for sending commands to
+@code{gcjwebplugin} (OUTPUT).
+
+@end table
+
+@item DEBUGGING OPTION
+@table @b
+@item -verbose
+Use the @code{-verbose} option to have the @code{appletviewer} print
+debugging messages.
+
+@end table
+
+@item STANDARD OPTIONS
+@table @b
+@item -help
+Use the @code{-help} option to have the @code{appletviewer} print a
+usage message, then exit.
+
+@item -version
+Use the @code{-version} option to have the @code{appletviewer} print
+its version, then exit.
+
+@item -JOPTION
+Use the @code{-J} option to pass OPTION to the virtual machine that
+will run the @code{appletviewer}.  Unlike other options, there must
+not be a space between the -J and OPTION.
+
+@end table
+@end table
+
+@comment ----------------------------------------------------------------------
+
+@node gcjwebplugin, , appletviewer Tool, Applet Tools
+@comment node-name, next, previous, up
+@section The @code{gcjwebplugin} Tool
+
+@code{gcjwebplugin} is a plugin that adds applet support to web
+browsers.  Currently @code{gcjwebplugin} only supports Mozilla-based
+browsers (e.g., Firefox, Galeon, Mozilla).
+
+@comment ----------------------------------------------------------------------
+
+@node Security Tools, I18N Issues, Applet Tools, Top
 @comment node-name, next, previous, up
 @chapter Security Tools
 



From MAILER-DAEMON Sun Jun 11 23:59:45 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fpdab-0002YC-N4
	for mharc-commit-classpath@gnu.org; Sun, 11 Jun 2006 23:59:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fpdaa-0002Y0-Mi
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 23:59:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpdaZ-0002Xo-6e
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 23:59:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpdaZ-0002Xl-39
	for commit-classpath@gnu.org; Sun, 11 Jun 2006 23:59:43 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpdjC-0006T0-Ky
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 00:08:38 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpdaR-0002ss-00
	for <commit-classpath@gnu.org>; Sun, 11 Jun 2006 23:59:35 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FpdaQ-0002sp-G4
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 03:59:34 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpdaQ-0002sp-G4@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Mon, 12 Jun 2006 03:59:34 +0000
Subject: [commit-cp] classpath ChangeLog gnu/javax/security/auth/log...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 03:59:44 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/12 03:59:34

Modified files:
	.              : ChangeLog 
	gnu/javax/security/auth/login: ConfigFileParser.java 

Log message:
	2006-06-12  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/javax/security/auth/login/ConfigFileParser.java (validateClassName):
		Use String.charAt().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7774&r2=1.7775
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/login/ConfigFileParser.java?cvsroot=classpath&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7774
retrieving revision 1.7775
diff -u -b -r1.7774 -r1.7775
--- ChangeLog	12 Jun 2006 00:58:31 -0000	1.7774
+++ ChangeLog	12 Jun 2006 03:59:33 -0000	1.7775
@@ -1,3 +1,8 @@
+2006-06-12  Raif S. Naffah  <raif@swiftdsl.com.au>
+
+	* gnu/javax/security/auth/login/ConfigFileParser.java (validateClassName):
+	Use String.charAt().
+
 2006-06-11  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* doc/tools.texinfo

Index: gnu/javax/security/auth/login/ConfigFileParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/security/auth/login/ConfigFileParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/javax/security/auth/login/ConfigFileParser.java	11 Jun 2006 12:14:43 -0000	1.4
+++ gnu/javax/security/auth/login/ConfigFileParser.java	12 Jun 2006 03:59:34 -0000	1.5
@@ -267,7 +267,7 @@
     for (int i = 0; i < tokens.length; i++)
       {
         String t = tokens[i];
-        if (! Character.isJavaIdentifierStart(t.toCharArray()[0]))
+        if (! Character.isJavaIdentifierStart(t.charAt(0)))
           abort("Class name [" + cn
                 + "] contains an invalid sub-package identifier: " + t);
 



From MAILER-DAEMON Mon Jun 12 00:04:46 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpdfS-0003Lc-5N
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 00:04:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpdfP-0003L4-UG
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 00:04:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpdfP-0003Kh-7m
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 00:04:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpdfP-0003Ke-6E
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 00:04:43 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fpdo2-0006nl-So
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 00:13:38 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpdfO-0003AR-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 00:04:42 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FpdfN-0003AO-1J
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 04:04:42 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpdfN-0003AO-1J@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Mon, 12 Jun 2006 04:04:41 +0000
Subject: [commit-cp] classpath/doc tools.texinfo ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 04:04:44 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/12 04:04:40

Modified files:
	doc            : tools.texinfo 
	.              : ChangeLog 

Log message:
	2006-06-12  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* doc/tools.texinfo: Replaced original author with "The GNU Classpath Team".

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/doc/tools.texinfo?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7775&r2=1.7776

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7775
retrieving revision 1.7776
diff -u -b -r1.7775 -r1.7776
--- ChangeLog	12 Jun 2006 03:59:33 -0000	1.7775
+++ ChangeLog	12 Jun 2006 04:04:40 -0000	1.7776
@@ -1,5 +1,9 @@
 2006-06-12  Raif S. Naffah  <raif@swiftdsl.com.au>
 
+	* doc/tools.texinfo: Replaced original author with "The GNU Classpath Team".
+
+2006-06-12  Raif S. Naffah  <raif@swiftdsl.com.au>
+
 	* gnu/javax/security/auth/login/ConfigFileParser.java (validateClassName):
 	Use String.charAt().
 



From MAILER-DAEMON Mon Jun 12 01:14:23 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fpekp-0005C3-E8
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 01:14:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fpekn-0005By-9p
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 01:14:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fpekc-00059L-LX
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 01:14:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fpekc-00059I-HI
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 01:14:10 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpetG-0002YW-6E
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 01:23:07 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpekZ-0006Cl-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 01:14:07 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FpekZ-0006Ci-Mi
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 05:14:07 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpekZ-0006Ci-Mi@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Mon, 12 Jun 2006 05:14:07 +0000
Subject: [commit-cp] classpath/tools/gnu/classpath/tools jarsignerMe...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 05:14:21 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/12 05:14:07

Modified files:
	tools/gnu/classpath/tools/jarsigner: Messages.java SFHelper.java 
	                                     Main.java JarVerifier.java 
	                                     HashUtils.java 
	                                     JarSigner.java 
	tools/gnu/classpath/tools/keytool: IdentityDBCmd.java 
	                                   KeyCloneCmd.java 
	                                   KeyPasswdCmd.java 
	                                   PrintCertCmd.java 
	                                   ListCmd.java 
	                                   StorePasswdCmd.java 
	                                   DeleteCmd.java 
	                                   CertReqCmd.java Messages.java 
	                                   CACertCmd.java GenKeyCmd.java 
	                                   ImportCmd.java ExportCmd.java 
	                                   SelfCertCmd.java Command.java 
	                                   Main.java 

Log message:
	2006-06-12  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* tools/gnu/classpath/tools/keytool/StorePasswdCmd.java: Condition all
		trace/debug code based on Configuration.DEBUG.
		* tools/gnu/classpath/tools/keytool/SelfCertCmd.java: Likewise.
		* tools/gnu/classpath/tools/keytool/PrintCertCmd.java: Likewise.
		* tools/gnu/classpath/tools/keytool/Messages.java: Likewise.
		* tools/gnu/classpath/tools/keytool/Main.java: Likewise.
		* tools/gnu/classpath/tools/keytool/ListCmd.java: Likewise.
		* tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java: Likewise.
		* tools/gnu/classpath/tools/keytool/KeyCloneCmd.java: Likewise.
		* tools/gnu/classpath/tools/keytool/ImportCmd.java: Likewise.
		* tools/gnu/classpath/tools/keytool/IdentityDBCmd.java: Likewise.
		* tools/gnu/classpath/tools/keytool/GenKeyCmd.java: Likewise.
		* tools/gnu/classpath/tools/keytool/ExportCmd.java: Likewise.
		* tools/gnu/classpath/tools/keytool/DeleteCmd.java: Likewise.
		* tools/gnu/classpath/tools/keytool/Command.java: Likewise.
		* tools/gnu/classpath/tools/keytool/CertReqCmd.java: Likewise.
		* tools/gnu/classpath/tools/keytool/CACertCmd.java: Likewise.
		* tools/gnu/classpath/tools/jarsigner/SFHelper.java: Likewise.
		* tools/gnu/classpath/tools/jarsigner/Messages.java: Likewise.
		* tools/gnu/classpath/tools/jarsigner/Main.java: Likewise.
		* tools/gnu/classpath/tools/jarsigner/JarVerifier.java: Likewise.
		* tools/gnu/classpath/tools/jarsigner/JarSigner.java: Likewise.
		* tools/gnu/classpath/tools/jarsigner/HashUtils.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/jarsigner/Messages.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/jarsigner/SFHelper.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/jarsigner/Main.java?cvsroot=classpath&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/jarsigner/JarVerifier.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/jarsigner/HashUtils.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/jarsigner/JarSigner.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/PrintCertCmd.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/ListCmd.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/DeleteCmd.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/Messages.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/CACertCmd.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/SelfCertCmd.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/Command.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/keytool/Main.java?cvsroot=classpath&r1=1.3&r2=1.4

Patches:
Index: jarsigner/Messages.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/jarsigner/Messages.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- jarsigner/Messages.java	21 May 2006 01:49:03 -0000	1.2
+++ jarsigner/Messages.java	12 Jun 2006 05:14:06 -0000	1.3
@@ -38,6 +38,8 @@
 
 package gnu.classpath.tools.jarsigner;
 
+import gnu.classpath.Configuration;
+
 import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Map;
@@ -99,6 +101,7 @@
       }
     catch (IllegalArgumentException x)
       {
+        if (Configuration.DEBUG)
         log.fine("Exception while rendering a message format keyed by ["
                  + key + "]: " + mf.toPattern());
         return constructMessage(mf.toPattern(), args);

Index: jarsigner/SFHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/jarsigner/SFHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- jarsigner/SFHelper.java	2 May 2006 01:00:22 -0000	1.5
+++ jarsigner/SFHelper.java	12 Jun 2006 05:14:06 -0000	1.6
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.jarsigner;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.Registry;
 import gnu.java.security.der.DER;
@@ -142,7 +143,8 @@
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     JarUtils.writeSFManifest(sfMainAttributes, sfEntries, baos);
     sfBytes = baos.toByteArray();
-    log.finest("\n" + Util.dumpString(sfBytes, "+++ sfBytes ")); //$NON-NLS-1$ //$NON-NLS-2$
+    if (Configuration.DEBUG)
+      log.fine("\n" + Util.dumpString(sfBytes, "+++ sfBytes ")); //$NON-NLS-1$ //$NON-NLS-2$
     jar.write(sfBytes);
     jar.flush();
 
@@ -216,7 +218,8 @@
     if (this.state != SF_GENERATED)
       throw new IllegalStateException(Messages.getString("SFHelper.4")); //$NON-NLS-1$
 
-    log.finest("+++ signer private key = " + signerKey); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine("+++ signer private key = " + signerKey); //$NON-NLS-1$
     ISignature signatureAlgorithm;
     ISignatureCodec signatureCodec;
     OID digestEncryptionAlgorithmOID;
@@ -241,7 +244,8 @@
     signatureAlgorithm.update(sfBytes, 0, sfBytes.length);
     Object signature = signatureAlgorithm.sign();
     byte[] signedSFBytes = signatureCodec.encodeSignature(signature);
-    log.finest("\n" + Util.dumpString(signedSFBytes, "+++ signedSFBytes ")); //$NON-NLS-1$ //$NON-NLS-2$
+    if (Configuration.DEBUG)
+      log.fine("\n" + Util.dumpString(signedSFBytes, "+++ signedSFBytes ")); //$NON-NLS-1$ //$NON-NLS-2$
 
     Set digestAlgorithms = new HashSet();
     List digestAlgorithm = new ArrayList(2);
@@ -322,7 +326,8 @@
     String name = entry.getName();
     InputStream jeis = jar.getInputStream(entry);
     String hash = util.hashStream(jeis);
-    log.finer("Hash of " + name + " = " + hash); //$NON-NLS-1$ //$NON-NLS-2$
+    if (Configuration.DEBUG)
+      log.fine("Hash of " + name + " = " + hash); //$NON-NLS-1$ //$NON-NLS-2$
 
     Attributes mainfestAttributes = manifest.getAttributes(name);
     if (mainfestAttributes == null)
@@ -344,9 +349,12 @@
       }
 
     sfAttributes.putValue(Main.DIGEST, sfHash);
-    log.finest("Name: " + name); //$NON-NLS-1$
-    log.finest(Main.DIGEST + ": " + sfHash); //$NON-NLS-1$
-    log.finest(""); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("Name: " + name); //$NON-NLS-1$
+        log.fine(Main.DIGEST + ": " + sfHash); //$NON-NLS-1$
+        log.fine(""); //$NON-NLS-1$
+      }
   }
 
   /**
@@ -365,6 +373,7 @@
     manifest.write(baos);
     baos.flush();
     String manifestHash = util.hashByteArray(baos.toByteArray());
+    if (Configuration.DEBUG)
     log.fine("Hashed Manifest " + manifestHash); //$NON-NLS-1$
     sfMainAttributes.putValue(Main.DIGEST_MANIFEST, manifestHash);
 

Index: jarsigner/Main.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/jarsigner/Main.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- jarsigner/Main.java	15 May 2006 11:47:08 -0000	1.12
+++ jarsigner/Main.java	12 Jun 2006 05:14:06 -0000	1.13
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.jarsigner;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.SystemProperties;
 import gnu.classpath.tools.common.CallbackUtil;
 import gnu.classpath.tools.common.ProviderUtil;
@@ -131,8 +132,8 @@
 
   public static final void main(String[] args)
   {
+    if (Configuration.DEBUG)
     log.entering(Main.class.getName(), "main", args); //$NON-NLS-1$
-
     Main tool = new Main();
     int result = 1;
     try
@@ -143,11 +144,13 @@
       }
     catch (SecurityException x)
       {
+        if (Configuration.DEBUG)
         log.throwing(Main.class.getName(), "main", x); //$NON-NLS-1$
         System.err.println(Messages.getString("Main.7") + x.getMessage()); //$NON-NLS-1$
       }
     catch (Exception x)
       {
+        if (Configuration.DEBUG)
         log.throwing(Main.class.getName(), "main", x); //$NON-NLS-1$
         System.err.println(Messages.getString("Main.9") + x); //$NON-NLS-1$
       }
@@ -155,7 +158,7 @@
       {
         tool.teardown();
       }
-
+    if (Configuration.DEBUG)
     log.exiting(Main.class.getName(), "main", Integer.valueOf(result)); //$NON-NLS-1$
     System.exit(result);
   }
@@ -171,8 +174,8 @@
    */
   private void processArgs(String[] args) throws Exception
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "processArgs", args); //$NON-NLS-1$
-
     cmdLineParser = new ToolParser();
     cmdLineParser.initializeParser();
     cmdLineParser.parse(args, new ToolParserCallback());
@@ -180,35 +183,40 @@
     setupCommonParams();
     if (verify)
       {
-        log.finer("Will verify with the following parameters:"); //$NON-NLS-1$
-        log.finer("     jar-file = '" + jarFileName + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-        log.finer("Options:"); //$NON-NLS-1$
-        log.finer("     provider = '" + providerClassName + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-        log.finer("      verbose ? " + verbose); //$NON-NLS-1$
-        log.finer("        certs ? " + certs); //$NON-NLS-1$
-        log.finer("   internalsf ? " + internalSF); //$NON-NLS-1$
-        log.finer(" sectionsonly ? " + sectionsOnly); //$NON-NLS-1$
+        if (Configuration.DEBUG)
+          {
+            log.fine("Will verify with the following parameters:"); //$NON-NLS-1$
+            log.fine("     jar-file = '" + jarFileName + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+            log.fine("Options:"); //$NON-NLS-1$
+            log.fine("     provider = '" + providerClassName + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+            log.fine("      verbose ? " + verbose); //$NON-NLS-1$
+            log.fine("        certs ? " + certs); //$NON-NLS-1$
+            log.fine("   internalsf ? " + internalSF); //$NON-NLS-1$
+            log.fine(" sectionsonly ? " + sectionsOnly); //$NON-NLS-1$
+          }
       }
     else // sign
       {
         setupSigningParams();
-
-        log.finer("Will sign with the following parameters:"); //$NON-NLS-1$
-        log.finer("     jar-file = '" + jarFileName + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-        log.finer("        alias = '" + alias + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-        log.finer("Options:"); //$NON-NLS-1$
-        log.finer("     keystore = '" + ksURL + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-        log.finer("    storetype = '" + ksType + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-        log.finer("    storepass = '" + ksPassword + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-        log.finer("      keypass = '" + password + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-        log.finer("      sigfile = '" + sigFileName + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-        log.finer("    signedjar = '" + signedJarFileName + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-        log.finer("     provider = '" + providerClassName + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-        log.finer("      verbose ? " + verbose); //$NON-NLS-1$
-        log.finer("   internalsf ? " + internalSF); //$NON-NLS-1$
-        log.finer(" sectionsonly ? " + sectionsOnly); //$NON-NLS-1$
+        if (Configuration.DEBUG)
+          {
+            log.fine("Will sign with the following parameters:"); //$NON-NLS-1$
+            log.fine("     jar-file = '" + jarFileName + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+            log.fine("        alias = '" + alias + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+            log.fine("Options:"); //$NON-NLS-1$
+            log.fine("     keystore = '" + ksURL + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+            log.fine("    storetype = '" + ksType + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+            log.fine("    storepass = '" + ksPassword + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+            log.fine("      keypass = '" + password + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+            log.fine("      sigfile = '" + sigFileName + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+            log.fine("    signedjar = '" + signedJarFileName + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+            log.fine("     provider = '" + providerClassName + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+            log.fine("      verbose ? " + verbose); //$NON-NLS-1$
+            log.fine("   internalsf ? " + internalSF); //$NON-NLS-1$
+            log.fine(" sectionsonly ? " + sectionsOnly); //$NON-NLS-1$
       }
-
+      }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "processArgs"); //$NON-NLS-1$
   }
 
@@ -222,8 +230,8 @@
    */
   private void start() throws Exception
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
-
     if (verify)
       {
         JarVerifier jv = new JarVerifier(this);
@@ -234,7 +242,7 @@
         JarSigner js = new JarSigner(this);
         js.start();
       }
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -249,11 +257,12 @@
    */
   private void teardown()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "teardown"); //$NON-NLS-1$
-
     if (providerInstalled)
       ProviderUtil.removeProvider(provider.getName());
 
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "teardown"); //$NON-NLS-1$
   }
 
@@ -279,8 +288,8 @@
   private void setupCommonParams() throws InstantiationException,
       IllegalAccessException, ClassNotFoundException, IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "setupCommonParams"); //$NON-NLS-1$
-
     File jar = new File(jarFileName);
     if (! jar.exists())
       throw new FileNotFoundException(jarFileName);
@@ -298,17 +307,22 @@
         String providerName = provider.getName();
         Provider installedProvider = Security.getProvider(providerName);
         if (installedProvider != null)
+          {
+            if (Configuration.DEBUG)
           log.finer("Provider " + providerName + " is already installed"); //$NON-NLS-1$ //$NON-NLS-2$
+          }
         else // install it
           installNewProvider();
       }
 
     if (! verbose && certs)
       {
+        if (Configuration.DEBUG)
         log.fine("Option <certs> is set but <verbose> is not. Ignored"); //$NON-NLS-1$
         certs = false;
       }
 
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "setupCommonParams"); //$NON-NLS-1$
   }
 
@@ -319,10 +333,10 @@
    */
   private void installNewProvider()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "installNewProvider"); //$NON-NLS-1$
-
     providerInstalled = ProviderUtil.addProvider(provider) != -1;
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "installNewProvider"); //$NON-NLS-1$
   }
 
@@ -349,8 +363,8 @@
       NoSuchAlgorithmException, CertificateException,
       UnsupportedCallbackException, UnrecoverableKeyException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "setupSigningParams"); //$NON-NLS-1$
-
     if (ksURL == null || ksURL.trim().length() == 0)
       {
         String userHome = SystemProperties.getProperty("user.home"); //$NON-NLS-1$
@@ -424,7 +438,8 @@
 
     signerPrivateKey = (PrivateKey) key;
     signerCertificateChain = store.getCertificateChain(alias);
-    log.finest(String.valueOf(signerCertificateChain));
+    if (Configuration.DEBUG)
+      log.fine(String.valueOf(signerCertificateChain));
 
     if (sigFileName == null)
       sigFileName = alias;
@@ -449,6 +464,7 @@
     if (signedJarFileName == null)
       signedJarFileName = jarFileName;
 
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "setupSigningParams"); //$NON-NLS-1$
   }
 
@@ -547,7 +563,8 @@
       if (! verify) // must have an ALIAS. use "mykey" if undefined
         if (fileAndAlias.size() < 2)
           {
-            log.finer("Missing ALIAS argument. Will use [mykey] instead"); //$NON-NLS-1$
+            if (Configuration.DEBUG)
+              log.fine("Missing ALIAS argument. Will use [mykey] instead"); //$NON-NLS-1$
             alias = "mykey"; //$NON-NLS-1$
           }
         else

Index: jarsigner/JarVerifier.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/jarsigner/JarVerifier.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- jarsigner/JarVerifier.java	2 May 2006 01:00:22 -0000	1.5
+++ jarsigner/JarVerifier.java	12 Jun 2006 05:14:06 -0000	1.6
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.jarsigner;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.OID;
 import gnu.java.security.Registry;
 import gnu.java.security.pkcs.PKCS7SignedData;
@@ -94,8 +95,8 @@
 
   void start() throws Exception
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
-
     String jarFileName = main.getJarFileName();
     jarFile = new JarFile(jarFileName);
 
@@ -144,7 +145,7 @@
           System.out.println(Messages.getFormattedString("JarVerifier.7", //$NON-NLS-1$
                                                          Integer.valueOf(limit)));
       }
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -162,9 +163,11 @@
   private boolean verifySF(String sigFileName) throws CRLException,
       CertificateException, ZipException, IOException
   {
+    if (Configuration.DEBUG)
+      {
     log.entering(this.getClass().getName(), "verifySF"); //$NON-NLS-1$
-    log.finest("About to verify signature of " + sigFileName + "..."); //$NON-NLS-1$ //$NON-NLS-2$
-
+        log.fine("About to verify signature of " + sigFileName + "..."); //$NON-NLS-1$ //$NON-NLS-2$
+      }
     // 1. find the corresponding .DSA file for this .SF file
     JarEntry dsaEntry = jarFile.getJarEntry(JarUtils.META_INF + sigFileName
                                             + JarUtils.DSA_SUFFIX);
@@ -186,12 +189,14 @@
     if (encryptedDigest == null)
       throw new SecurityException(Messages.getString("JarVerifier.16")); //$NON-NLS-1$
 
-    log.finest("\n" + Util.dumpString(encryptedDigest, "--- signedSFBytes ")); //$NON-NLS-1$ //$NON-NLS-2$
+    if (Configuration.DEBUG)
+      log.fine("\n" + Util.dumpString(encryptedDigest, "--- signedSFBytes ")); //$NON-NLS-1$ //$NON-NLS-2$
 
     // 5. get the signer public key
     Certificate cert = pkcs7SignedData.getCertificates()[0];
     PublicKey verifierKey = cert.getPublicKey();
-    log.finest("--- verifier public key = " + verifierKey); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine("--- verifier public key = " + verifierKey); //$NON-NLS-1$
 
     // 6. verify the signature file signature
     OID digestEncryptionAlgorithmOID = signerInfo.getDigestEncryptionAlgorithmId();
@@ -225,10 +230,12 @@
         signatureAlgorithm.update(buffer, 0, n);
 
     boolean result = signatureAlgorithm.verify(herSignature);
-    log.finer("Signature block [" + sigFileName + "] is " //$NON-NLS-1$ //$NON-NLS-2$
+    if (Configuration.DEBUG)
+      {
+        log.fine("Signature block [" + sigFileName + "] is " //$NON-NLS-1$ //$NON-NLS-2$
               + (result ? "" : "NOT ") + "OK"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
     log.exiting(this.getClass().getName(), "verifySF", Boolean.valueOf(result)); //$NON-NLS-1$
+      }
     return result;
   }
 
@@ -250,8 +257,8 @@
    */
   private boolean verifySFEntries(String alias) throws IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "verifySFEntries"); //$NON-NLS-1$
-
     // 1. read the signature file
     JarEntry jarEntry = jarFile.getJarEntry(JarUtils.META_INF + alias
                                             + JarUtils.SF_SUFFIX);
@@ -291,8 +298,9 @@
             break;
         }
 
-    log.exiting(this.getClass().getName(), "verifySFEntries",
-                Boolean.valueOf(result)); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "verifySFEntries", //$NON-NLS-1$
+                  Boolean.valueOf(result));
     return result;
   }
 
@@ -319,7 +327,8 @@
   {
     String expectedValue = getEntryHash(JarFile.MANIFEST_NAME);
     boolean result = expectedValue.equalsIgnoreCase(hash);
-    log.finest("Is " + name + " OK? " + result); //$NON-NLS-1$ //$NON-NLS-2$
+    if (Configuration.DEBUG)
+      log.fine("Is " + name + " OK? " + result); //$NON-NLS-1$ //$NON-NLS-2$
     return result;
   }
 

Index: jarsigner/HashUtils.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/jarsigner/HashUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- jarsigner/HashUtils.java	29 Apr 2006 07:39:19 -0000	1.4
+++ jarsigner/HashUtils.java	12 Jun 2006 05:14:06 -0000	1.5
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.jarsigner;
 
+import gnu.classpath.Configuration;
 import gnu.java.security.hash.Sha160;
 import gnu.java.security.util.Base64;
 import gnu.java.util.jar.JarUtils;
@@ -76,8 +77,8 @@
           sha.update(buffer, 0, n);
           count += n;
         }
-
     byte[] hash = sha.digest();
+    if (Configuration.DEBUG)
     log.finest("Hashed " + count + " byte(s)");
     String result = Base64.encode(hash);
     return result;
@@ -92,6 +93,7 @@
   {
     sha.update(ba);
     byte[] hash = sha.digest();
+    if (Configuration.DEBUG)
     log.finest("Hashed " + ba.length + " byte(s)");
     String result = Base64.encode(hash);
     return result;

Index: jarsigner/JarSigner.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/jarsigner/JarSigner.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- jarsigner/JarSigner.java	13 May 2006 00:34:57 -0000	1.6
+++ jarsigner/JarSigner.java	12 Jun 2006 05:14:06 -0000	1.7
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.jarsigner;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.SystemProperties;
 import gnu.java.util.jar.JarUtils;
 
@@ -69,8 +70,8 @@
 
   void start() throws Exception
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
-
     JarFile jarFile = new JarFile(main.getJarFileName());
     SFHelper sfHelper = new SFHelper(jarFile);
 
@@ -119,19 +120,22 @@
     String signaturesFileName = main.getSigFileName();
     String sfFileName = JarUtils.META_INF + signaturesFileName
                         + JarUtils.SF_SUFFIX;
-    log.finest("Processing " + sfFileName); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine("Processing " + sfFileName); //$NON-NLS-1$
     JarEntry sfEntry = new JarEntry(sfFileName);
     sfEntry.setTime(System.currentTimeMillis());
     outSignedJarFile.putNextEntry(sfEntry);
     sfHelper.writeSF(outSignedJarFile);
-    log.finer("Created .SF file"); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine("Created .SF file"); //$NON-NLS-1$
     if (main.isVerbose())
       System.out.println(Messages.getString("JarSigner.8") + sfFileName); //$NON-NLS-1$
 
     // 4. create the .DSA file
     String dsaFileName = JarUtils.META_INF + signaturesFileName
                          + JarUtils.DSA_SUFFIX;
-    log.finest("Processing " + dsaFileName); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine("Processing " + dsaFileName); //$NON-NLS-1$
     JarEntry dsaEntry = new JarEntry(dsaFileName);
     dsaEntry.setTime(System.currentTimeMillis());
     outSignedJarFile.putNextEntry(dsaEntry);
@@ -139,7 +143,8 @@
                       main.getSignerPrivateKey(),
                       main.getSignerCertificateChain(),
                       main.isInternalSF());
-    log.finer("Created .DSA file"); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine("Created .DSA file"); //$NON-NLS-1$
     if (main.isVerbose())
       System.out.println(Messages.getString("JarSigner.8") + dsaFileName); //$NON-NLS-1$
 
@@ -147,11 +152,12 @@
     outSignedJarFile.close();
     fos.close();
     signedJarFile.renameTo(new File(main.getSignedJarFileName()));
-    log.finer("Renamed signed JAR file"); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine("Renamed signed JAR file"); //$NON-NLS-1$
     if (main.isVerbose())
       System.out.println(SystemProperties.getProperty("line.separator") //$NON-NLS-1$
                          + Messages.getString("JarSigner.14")); //$NON-NLS-1$
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
   }
 

Index: keytool/IdentityDBCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- keytool/IdentityDBCmd.java	1 Jun 2006 19:50:36 -0000	1.4
+++ keytool/IdentityDBCmd.java	12 Jun 2006 05:14:07 -0000	1.5
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
@@ -149,21 +150,23 @@
   {
     setInputStreamParam(_idbFileName);
     setKeyStoreParams(_providerClassName, _ksType, _ksPassword, _ksURL);
-
-    log.finer("-identitydb handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -file=" + _idbFileName); //$NON-NLS-1$
-    log.finer("  -storetype=" + storeType); //$NON-NLS-1$
-    log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -provider=" + provider); //$NON-NLS-1$
-    log.finer("  -v=" + verbose); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("-identitydb handler will use the following options:"); //$NON-NLS-1$
+        log.fine("  -file=" + _idbFileName); //$NON-NLS-1$
+        log.fine("  -storetype=" + storeType); //$NON-NLS-1$
+        log.fine("  -keystore=" + storeURL); //$NON-NLS-1$
+        log.fine("  -provider=" + provider); //$NON-NLS-1$
+        log.fine("  -v=" + verbose); //$NON-NLS-1$
+      }
   }
 
   // own methods --------------------------------------------------------------
 
   Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
-
     Parser result = new ClasspathToolParser(Main.IDENTITYDB_CMD, true);
     result.setHeader(Messages.getString("IdentityDBCmd.7")); //$NON-NLS-1$
     result.setFooter(Messages.getString("IdentityDBCmd.8")); //$NON-NLS-1$
@@ -222,7 +225,7 @@
       }
     });
     result.add(options);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }

Index: keytool/KeyCloneCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- keytool/KeyCloneCmd.java	1 Jun 2006 19:50:36 -0000	1.4
+++ keytool/KeyCloneCmd.java	12 Jun 2006 05:14:07 -0000	1.5
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
@@ -209,22 +210,24 @@
     setAliasParam(_alias);
     setKeyPasswordNoPrompt(_password);
     setDestinationAlias(_destAlias);
-
-    log.finer("-keyclone handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -alias=" + alias); //$NON-NLS-1$
-    log.finer("  -dest=" + destinationAlias); //$NON-NLS-1$
-    log.finer("  -storetype=" + storeType); //$NON-NLS-1$
-    log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -provider=" + provider); //$NON-NLS-1$
-    log.finer("  -v=" + verbose); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("-keyclone handler will use the following options:"); //$NON-NLS-1$
+        log.fine("  -alias=" + alias); //$NON-NLS-1$
+        log.fine("  -dest=" + destinationAlias); //$NON-NLS-1$
+        log.fine("  -storetype=" + storeType); //$NON-NLS-1$
+        log.fine("  -keystore=" + storeURL); //$NON-NLS-1$
+        log.fine("  -provider=" + provider); //$NON-NLS-1$
+        log.fine("  -v=" + verbose); //$NON-NLS-1$
+      }
   }
 
   void start() throws KeyStoreException, NoSuchAlgorithmException, IOException,
       UnsupportedCallbackException, UnrecoverableKeyException,
       CertificateException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
-
     if (store.containsAlias(destinationAlias))
       throw new SecurityException(Messages.getString("KeyCloneCmd.23")); //$NON-NLS-1$
 
@@ -236,7 +239,7 @@
     store.setKeyEntry(destinationAlias, privateKey, newKeyPasswordChars, chain);
 
     saveKeyStore();
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -244,8 +247,8 @@
 
   Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
-
     Parser result = new ClasspathToolParser(Main.KEYCLONE_CMD, true);
     result.setHeader(Messages.getString("KeyCloneCmd.22")); //$NON-NLS-1$
     result.setFooter(Messages.getString("KeyCloneCmd.21")); //$NON-NLS-1$
@@ -331,7 +334,7 @@
       }
     });
     result.add(options);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }

Index: keytool/KeyPasswdCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- keytool/KeyPasswdCmd.java	1 Jun 2006 19:50:36 -0000	1.4
+++ keytool/KeyPasswdCmd.java	12 Jun 2006 05:14:07 -0000	1.5
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.SystemProperties;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
@@ -195,22 +196,24 @@
     setKeyStoreParams(_providerClassName, _ksType, _ksPassword, _ksURL);
     setAliasParam(_alias);
     setKeyPasswordNoPrompt(_password);
-
-    log.finer("-keypasswd handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -alias=" + alias); //$NON-NLS-1$
-    log.finer("  -new=" + _newPassword); //$NON-NLS-1$
-    log.finer("  -storetype=" + storeType); //$NON-NLS-1$
-    log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -provider=" + provider); //$NON-NLS-1$
-    log.finer("  -v=" + verbose); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("-keypasswd handler will use the following options:"); //$NON-NLS-1$
+        log.fine("  -alias=" + alias); //$NON-NLS-1$
+        log.fine("  -new=" + _newPassword); //$NON-NLS-1$
+        log.fine("  -storetype=" + storeType); //$NON-NLS-1$
+        log.fine("  -keystore=" + storeURL); //$NON-NLS-1$
+        log.fine("  -provider=" + provider); //$NON-NLS-1$
+        log.fine("  -v=" + verbose); //$NON-NLS-1$
+      }
   }
 
   void start() throws KeyStoreException, NoSuchAlgorithmException, IOException,
       UnsupportedCallbackException, UnrecoverableKeyException,
       CertificateException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
-
     // 1. get the key entry and certificate chain associated to alias
     Key privateKey = getAliasPrivateKey();
     Certificate[] chain = store.getCertificateChain(alias);
@@ -221,7 +224,7 @@
 
     // 3. persist the key store
     saveKeyStore();
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -229,8 +232,8 @@
 
   Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
-
     Parser result = new ClasspathToolParser(Main.KEYPASSWD_CMD, true);
     result.setHeader(Messages.getString("KeyPasswdCmd.23")); //$NON-NLS-1$
     result.setFooter(Messages.getString("KeyPasswdCmd.22")); //$NON-NLS-1$
@@ -307,7 +310,7 @@
       }
     });
     result.add(options);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }

Index: keytool/PrintCertCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/PrintCertCmd.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- keytool/PrintCertCmd.java	14 May 2006 08:20:18 -0000	1.2
+++ keytool/PrintCertCmd.java	12 Jun 2006 05:14:07 -0000	1.3
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
@@ -86,22 +87,24 @@
   void setup() throws Exception
   {
     setInputStreamParam(_certFileName);
-
-    log.finer("-printcert handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -file=" + _certFileName); //$NON-NLS-1$
-    log.finer("  -v=" + verbose); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("-printcert handler will use the following options:"); //$NON-NLS-1$
+        log.fine("  -file=" + _certFileName); //$NON-NLS-1$
+        log.fine("  -v=" + verbose); //$NON-NLS-1$
+      }
   }
 
   void start() throws CertificateException
   {
+    if (Configuration.DEBUG)
     log.entering(getClass().getName(), "start"); //$NON-NLS-1$
-
     CertificateFactory x509Factory = CertificateFactory.getInstance(Main.X_509);
     Certificate certificate = x509Factory.generateCertificate(inStream);
     PrintWriter writer = new PrintWriter(System.out, true);
     writer.println();
     printVerbose(certificate, writer);
-
+    if (Configuration.DEBUG)
     log.exiting(getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -109,8 +112,8 @@
 
   Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
-
     Parser result = new ClasspathToolParser(Main.PRINTCERT_CMD, true);
     result.setHeader(Messages.getString("PrintCertCmd.5")); //$NON-NLS-1$
     result.setFooter(Messages.getString("PrintCertCmd.6")); //$NON-NLS-1$
@@ -133,7 +136,7 @@
       }
     });
     result.add(options);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }

Index: keytool/ListCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/ListCmd.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- keytool/ListCmd.java	1 Jun 2006 19:50:36 -0000	1.4
+++ keytool/ListCmd.java	12 Jun 2006 05:14:07 -0000	1.5
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
@@ -181,32 +182,36 @@
 
     if (verbose & rfc)
       {
-        log.warning("Both -v and -rfc options were found on the command line. " //$NON-NLS-1$
+        if (Configuration.DEBUG)
+          log.fine("Both -v and -rfc options were found on the command line. " //$NON-NLS-1$
                     + "Only the former will be considered"); //$NON-NLS-1$
         rfc = false;
       }
-
-    log.finer("-list handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -alias=" + alias); //$NON-NLS-1$
-    log.finer("  -storetype=" + storeType); //$NON-NLS-1$
-    log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -provider=" + provider); //$NON-NLS-1$
-    log.finer("  -v=" + verbose); //$NON-NLS-1$
-    log.finer("  -rfc=" + rfc); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("-list handler will use the following options:"); //$NON-NLS-1$
+        log.fine("  -alias=" + alias); //$NON-NLS-1$
+        log.fine("  -storetype=" + storeType); //$NON-NLS-1$
+        log.fine("  -keystore=" + storeURL); //$NON-NLS-1$
+        log.fine("  -provider=" + provider); //$NON-NLS-1$
+        log.fine("  -v=" + verbose); //$NON-NLS-1$
+        log.fine("  -rfc=" + rfc); //$NON-NLS-1$
+      }
   }
 
   void start() throws KeyStoreException, CertificateEncodingException,
       IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
-
     PrintWriter writer = new PrintWriter(outStream, true);
     writer.println(Messages.getFormattedString("ListCmd.21", store.getType())); //$NON-NLS-1$
     writer.println(Messages.getFormattedString("ListCmd.22", //$NON-NLS-1$
                                                store.getProvider().getName()));
     if (all)
       {
-        log.finest("About to list all aliases in key store..."); //$NON-NLS-1$
+        if (Configuration.DEBUG)
+          log.fine("About to list all aliases in key store..."); //$NON-NLS-1$
         writer.println();
         writer.println(Messages.getFormattedString("ListCmd.24", //$NON-NLS-1$
                                                    Integer.valueOf(store.size())));
@@ -219,7 +224,7 @@
       }
     else
       list1Alias(alias, writer);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -227,8 +232,8 @@
 
   Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
-
     Parser result = new ClasspathToolParser(Main.LIST_CMD, true);
     result.setHeader(Messages.getString("ListCmd.20")); //$NON-NLS-1$
     result.setFooter(Messages.getString("ListCmd.19")); //$NON-NLS-1$
@@ -295,7 +300,7 @@
       }
     });
     result.add(options);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }
@@ -314,12 +319,12 @@
   private void list1Alias(String anAlias, PrintWriter writer)
       throws KeyStoreException, CertificateEncodingException, IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "list1Alias", anAlias); //$NON-NLS-1$
-
     writer.println();
     writer.println(Messages.getFormattedString("ListCmd.30", anAlias)); //$NON-NLS-1$
-    writer.println(Messages.getFormattedString("ListCmd.31", store.getCreationDate(anAlias))); //$NON-NLS-1$
-
+    writer.println(Messages.getFormattedString("ListCmd.31", //$NON-NLS-1$
+                                               store.getCreationDate(anAlias)));
     if (store.isCertificateEntry(anAlias))
       {
         writer.println(Messages.getString("ListCmd.32")); //$NON-NLS-1$
@@ -335,6 +340,7 @@
     else
       throw new IllegalArgumentException(Messages.getFormattedString("ListCmd.34", //$NON-NLS-1$
                                                                      anAlias));
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "list1Alias"); //$NON-NLS-1$
   }
 

Index: keytool/StorePasswdCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- keytool/StorePasswdCmd.java	1 Jun 2006 19:50:36 -0000	1.4
+++ keytool/StorePasswdCmd.java	12 Jun 2006 05:14:07 -0000	1.5
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.SystemProperties;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
@@ -159,21 +160,23 @@
   {
     setKeyStoreParams(_providerClassName, _ksType, _ksPassword, _ksURL);
     setNewKeystorePassword(_newPassword);
-
-    log.finer("-storepasswd handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -storetype=" + storeType); //$NON-NLS-1$
-    log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -provider=" + provider); //$NON-NLS-1$
-    log.finer("  -v=" + verbose); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("-storepasswd handler will use the following options:"); //$NON-NLS-1$
+        log.fine("  -storetype=" + storeType); //$NON-NLS-1$
+        log.fine("  -keystore=" + storeURL); //$NON-NLS-1$
+        log.fine("  -provider=" + provider); //$NON-NLS-1$
+        log.fine("  -v=" + verbose); //$NON-NLS-1$
+      }
   }
 
   void start() throws KeyStoreException, NoSuchAlgorithmException,
       CertificateException, IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
-
     saveKeyStore(newStorePasswordChars);
-
+    if (Configuration.DEBUG)
     log.exiting(getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -181,8 +184,8 @@
 
   Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
-
     Parser result = new ClasspathToolParser(Main.STOREPASSWD_CMD, true);
     result.setHeader(Messages.getString("StorePasswdCmd.18")); //$NON-NLS-1$
     result.setFooter(Messages.getString("StorePasswdCmd.17")); //$NON-NLS-1$
@@ -241,7 +244,7 @@
       }
     });
     result.add(options);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }

Index: keytool/DeleteCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/DeleteCmd.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- keytool/DeleteCmd.java	1 Jun 2006 19:50:36 -0000	1.4
+++ keytool/DeleteCmd.java	12 Jun 2006 05:14:07 -0000	1.5
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
@@ -158,24 +159,26 @@
   {
     setKeyStoreParams(_providerClassName, _ksType, _ksPassword, _ksURL);
     setTheAlias(_alias);
-
-    log.finer("-delete handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -alias=" + alias); //$NON-NLS-1$
-    log.finer("  -storetype=" + storeType); //$NON-NLS-1$
-    log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -provider=" + provider); //$NON-NLS-1$
-    log.finer("  -v=" + verbose); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("-delete handler will use the following options:"); //$NON-NLS-1$
+        log.fine("  -alias=" + alias); //$NON-NLS-1$
+        log.fine("  -storetype=" + storeType); //$NON-NLS-1$
+        log.fine("  -keystore=" + storeURL); //$NON-NLS-1$
+        log.fine("  -provider=" + provider); //$NON-NLS-1$
+        log.fine("  -v=" + verbose); //$NON-NLS-1$
+      }
   }
 
   void start() throws KeyStoreException, NoSuchAlgorithmException,
       CertificateException, IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
-
     ensureStoreContainsAlias();
     store.deleteEntry(alias);
     saveKeyStore();
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -183,8 +186,8 @@
 
   Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
-
     Parser result = new ClasspathToolParser(Main.DELETE_CMD, true);
     result.setHeader(Messages.getString("DeleteCmd.18")); //$NON-NLS-1$
     result.setFooter(Messages.getString("DeleteCmd.17")); //$NON-NLS-1$
@@ -243,7 +246,7 @@
       }
     });
     result.add(options);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }

Index: keytool/CertReqCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- keytool/CertReqCmd.java	1 Jun 2006 19:50:36 -0000	1.4
+++ keytool/CertReqCmd.java	12 Jun 2006 05:14:07 -0000	1.5
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
@@ -258,24 +259,26 @@
     setKeyStoreParams(_providerClassName, _ksType, _ksPassword, _ksURL);
     setAliasParam(_alias);
     setKeyPasswordNoPrompt(_password);
-
-    log.finer("-certreq handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -alias=" + alias); //$NON-NLS-1$
-    log.finer("  -sigalg=" + _sigAlgorithm); //$NON-NLS-1$
-    log.finer("  -file=" + _certReqFileName); //$NON-NLS-1$
-    log.finer("  -storetype=" + storeType); //$NON-NLS-1$
-    log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -provider=" + provider); //$NON-NLS-1$
-    log.finer("  -v=" + verbose); //$NON-NLS-1$
-    log.finer("  -attributes=" + nullAttributes); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("-certreq handler will use the following options:"); //$NON-NLS-1$
+        log.fine("  -alias=" + alias); //$NON-NLS-1$
+        log.fine("  -sigalg=" + _sigAlgorithm); //$NON-NLS-1$
+        log.fine("  -file=" + _certReqFileName); //$NON-NLS-1$
+        log.fine("  -storetype=" + storeType); //$NON-NLS-1$
+        log.fine("  -keystore=" + storeURL); //$NON-NLS-1$
+        log.fine("  -provider=" + provider); //$NON-NLS-1$
+        log.fine("  -v=" + verbose); //$NON-NLS-1$
+        log.fine("  -attributes=" + nullAttributes); //$NON-NLS-1$
+      }
   }
 
   void start() throws KeyStoreException, NoSuchAlgorithmException, IOException,
       UnsupportedCallbackException, UnrecoverableKeyException,
       InvalidKeyException, SignatureException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
-
     // 1. get the key entry and certificate chain associated to alias
     Key privateKey = getAliasPrivateKey();
     Certificate[] chain = store.getCertificateChain(alias);
@@ -305,7 +308,7 @@
       }
 
     writer.close();
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -313,8 +316,8 @@
 
   Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
-
     Parser result = new ClasspathToolParser(Main.CERTREQ_CMD, true);
     result.setHeader(Messages.getString("CertReqCmd.25")); //$NON-NLS-1$
     result.setFooter(Messages.getString("CertReqCmd.24")); //$NON-NLS-1$
@@ -408,7 +411,7 @@
       }
     });
     result.add(options);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }

Index: keytool/Messages.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/Messages.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- keytool/Messages.java	21 May 2006 01:49:04 -0000	1.2
+++ keytool/Messages.java	12 Jun 2006 05:14:07 -0000	1.3
@@ -38,6 +38,8 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
+
 import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Map;
@@ -99,6 +101,7 @@
       }
     catch (IllegalArgumentException x)
       {
+        if (Configuration.DEBUG)
         log.fine("Exception while rendering a message format keyed by ["
                  + key + "]: " + mf.toPattern());
         return constructMessage(mf.toPattern(), args);

Index: keytool/CACertCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/CACertCmd.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- keytool/CACertCmd.java	11 Jun 2006 10:40:51 -0000	1.1
+++ keytool/CACertCmd.java	12 Jun 2006 05:14:07 -0000	1.2
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
@@ -164,17 +165,21 @@
   {
     setInputStreamParam(_certFileName);
     setKeyStoreParams(_providerClassName, _ksType, _ksPassword, _ksURL);
-    log.finer("-cacert handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -file=" + _certFileName); //$NON-NLS-1$
-    log.finer("  -storetype=" + storeType); //$NON-NLS-1$
-    log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -provider=" + provider); //$NON-NLS-1$
-    log.finer("  -v=" + verbose); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("-cacert handler will use the following options:"); //$NON-NLS-1$
+        log.fine("  -file=" + _certFileName); //$NON-NLS-1$
+        log.fine("  -storetype=" + storeType); //$NON-NLS-1$
+        log.fine("  -keystore=" + storeURL); //$NON-NLS-1$
+        log.fine("  -provider=" + provider); //$NON-NLS-1$
+        log.fine("  -v=" + verbose); //$NON-NLS-1$
+      }
   }
 
   void start() throws CertificateException, KeyStoreException,
       NoSuchAlgorithmException, IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
     alias = getAliasFromFileName(_certFileName);
     if (store.containsAlias(alias))
@@ -182,13 +187,15 @@
                                                                      alias));
     x509Factory = CertificateFactory.getInstance("X.509"); //$NON-NLS-1$
     Certificate certificate = x509Factory.generateCertificate(inStream);
-    log.finest("certificate = " + certificate); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine("certificate = " + certificate); //$NON-NLS-1$
     store.setCertificateEntry(alias, certificate);
     saveKeyStore();
     if (verbose)
       System.out.println(Messages.getFormattedString("CACertCmd.1", //$NON-NLS-1$
                                                      new Object[] { _certFileName,
                                                                     alias }));
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -199,6 +206,7 @@
    */
   Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
     Parser result = new ClasspathToolParser(Main.CACERT_CMD, true);
     result.setHeader(Messages.getString("CACertCmd.2")); //$NON-NLS-1$
@@ -258,6 +266,7 @@
       }
     });
     result.add(options);
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }
@@ -276,6 +285,7 @@
    */
   private String getAliasFromFileName(String fileName)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getAliasFromFileName", fileName); //$NON-NLS-1$
     // get the basename
     fileName = new File(fileName).getName();
@@ -296,6 +306,7 @@
           chars[i] = '_';
       }
     String result = new String(chars);
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getAliasFromFileName", result); //$NON-NLS-1$
     return result;
   }

Index: keytool/GenKeyCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- keytool/GenKeyCmd.java	1 Jun 2006 19:50:36 -0000	1.4
+++ keytool/GenKeyCmd.java	12 Jun 2006 05:14:07 -0000	1.5
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
@@ -309,52 +310,60 @@
     setKeySize(_keySizeStr);
     setDName(_dName);
     setValidityParam(_validityStr);
-
-    log.finer("-genkey handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -alias=" + alias); //$NON-NLS-1$
-    log.finer("  -keyalg=" + keyPairGenerator.getAlgorithm()); //$NON-NLS-1$
-    log.finer("  -keysize=" + keySize); //$NON-NLS-1$
-    log.finer("  -sigalg=" + signatureAlgorithm.getAlgorithm()); //$NON-NLS-1$
-    log.finer("  -dname=" + distinguishedName); //$NON-NLS-1$
-    log.finer("  -validity=" + validityInDays); //$NON-NLS-1$
-    log.finer("  -storetype=" + storeType); //$NON-NLS-1$
-    log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -provider=" + provider); //$NON-NLS-1$
-    log.finer("  -v=" + verbose); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("-genkey handler will use the following options:"); //$NON-NLS-1$
+        log.fine("  -alias=" + alias); //$NON-NLS-1$
+        log.fine("  -keyalg=" + keyPairGenerator.getAlgorithm()); //$NON-NLS-1$
+        log.fine("  -keysize=" + keySize); //$NON-NLS-1$
+        log.fine("  -sigalg=" + signatureAlgorithm.getAlgorithm()); //$NON-NLS-1$
+        log.fine("  -dname=" + distinguishedName); //$NON-NLS-1$
+        log.fine("  -validity=" + validityInDays); //$NON-NLS-1$
+        log.fine("  -storetype=" + storeType); //$NON-NLS-1$
+        log.fine("  -keystore=" + storeURL); //$NON-NLS-1$
+        log.fine("  -provider=" + provider); //$NON-NLS-1$
+        log.fine("  -v=" + verbose); //$NON-NLS-1$
+      }
   }
 
   void start() throws CertificateException, KeyStoreException,
       InvalidKeyException, SignatureException, IOException,
       NoSuchAlgorithmException
   {
+    if (Configuration.DEBUG)
+      {
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
-
+        log.fine("About to generate key-pair..."); //$NON-NLS-1$
+      }
     // 1. generate a new key-pair
-    log.finer("About to generate key-pair..."); //$NON-NLS-1$
     keyPairGenerator.initialize(keySize);
     KeyPair kp = keyPairGenerator.generateKeyPair();
     PublicKey publicKey = kp.getPublic();
     PrivateKey privateKey = kp.getPrivate();
 
     // 2. generate a self-signed certificate
-    log.finer("About to generate a self-signed certificate..."); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine("About to generate a self-signed certificate..."); //$NON-NLS-1$
     byte[] derBytes = getSelfSignedCertificate(distinguishedName,
                                                publicKey,
                                                privateKey);
-    log.finest(Util.dumpString(derBytes, "derBytes ")); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine(Util.dumpString(derBytes, "derBytes ")); //$NON-NLS-1$
     CertificateFactory x509Factory = CertificateFactory.getInstance(Main.X_509);
     ByteArrayInputStream bais = new ByteArrayInputStream(derBytes);
     Certificate certificate = x509Factory.generateCertificate(bais);
-    log.finest("certificate = " + certificate); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine("certificate = " + certificate); //$NON-NLS-1$
 
     // 3. store it, w/ its private key, associating them to alias
     Certificate[] chain = new Certificate[] { certificate };
-    log.finest("About to store newly generated material in key store..."); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine("About to store newly generated material in key store..."); //$NON-NLS-1$
     store.setKeyEntry(alias, privateKey, keyPasswordChars, chain);
 
     // 4. persist the key store
     saveKeyStore();
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -362,8 +371,8 @@
 
   Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
-
     Parser result = new ClasspathToolParser(Main.GENKEY_CMD, true);
     result.setHeader(Messages.getString("GenKeyCmd.57")); //$NON-NLS-1$
     result.setFooter(Messages.getString("GenKeyCmd.58")); //$NON-NLS-1$
@@ -476,7 +485,7 @@
       }
     });
     result.add(options);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }
@@ -574,7 +583,7 @@
 
         name = sb.toString().trim();
       }
-
+    if (Configuration.DEBUG)
     log.fine("dName=[" + name + "]"); //$NON-NLS-1$ //$NON-NLS-2$
     distinguishedName = new X500DistinguishedName(name);
   }

Index: keytool/ImportCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- keytool/ImportCmd.java	1 Jun 2006 19:50:36 -0000	1.5
+++ keytool/ImportCmd.java	12 Jun 2006 05:14:07 -0000	1.6
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.SystemProperties;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
@@ -294,24 +295,26 @@
     setKeyStoreParams(_providerClassName, _ksType, _ksPassword, _ksURL);
     setAliasParam(_alias);
     setKeyPasswordNoPrompt(_password);
-
-    log.finer("-import handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -alias=" + alias); //$NON-NLS-1$
-    log.finer("  -file=" + _certFileName); //$NON-NLS-1$
-    log.finer("  -noprompt=" + noPrompt); //$NON-NLS-1$
-    log.finer("  -trustcacerts=" + trustCACerts); //$NON-NLS-1$
-    log.finer("  -storetype=" + storeType); //$NON-NLS-1$
-    log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -provider=" + provider); //$NON-NLS-1$
-    log.finer("  -v=" + verbose); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("-import handler will use the following options:"); //$NON-NLS-1$
+        log.fine("  -alias=" + alias); //$NON-NLS-1$
+        log.fine("  -file=" + _certFileName); //$NON-NLS-1$
+        log.fine("  -noprompt=" + noPrompt); //$NON-NLS-1$
+        log.fine("  -trustcacerts=" + trustCACerts); //$NON-NLS-1$
+        log.fine("  -storetype=" + storeType); //$NON-NLS-1$
+        log.fine("  -keystore=" + storeURL); //$NON-NLS-1$
+        log.fine("  -provider=" + provider); //$NON-NLS-1$
+        log.fine("  -v=" + verbose); //$NON-NLS-1$
+      }
   }
 
   void start() throws CertificateException, KeyStoreException, IOException,
       UnsupportedCallbackException, NoSuchAlgorithmException,
       CertPathValidatorException, UnrecoverableKeyException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
-
     if (trustCACerts)
       {
         String fs = SystemProperties.getProperty("file.separator"); //$NON-NLS-1$
@@ -336,7 +339,7 @@
         ensureAliasIsKeyEntry();
         importCertificateReply();
       }
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -344,8 +347,8 @@
 
   Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
-
     Parser result = new ClasspathToolParser(Main.IMPORT_CMD, true);
     result.setHeader(Messages.getString("ImportCmd.27")); //$NON-NLS-1$
     result.setFooter(Messages.getString("ImportCmd.26")); //$NON-NLS-1$
@@ -438,7 +441,7 @@
       }
     });
     result.add(options);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }
@@ -480,10 +483,11 @@
       UnsupportedCallbackException, CertPathValidatorException,
       UnrecoverableKeyException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "importNewTrustedCertificate"); //$NON-NLS-1$
-
     Certificate certificate = x509Factory.generateCertificate(inStream);
-    log.finest("certificate = " + certificate); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine("certificate = " + certificate); //$NON-NLS-1$
     LinkedList orderedReply = new LinkedList();
     orderedReply.addLast(certificate);
 
@@ -495,7 +499,7 @@
       }
     else
       System.out.println(Messages.getString("ImportCmd.28")); //$NON-NLS-1$
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "importNewTrustedCertificate"); //$NON-NLS-1$
   }
 
@@ -525,8 +529,8 @@
       NoSuchAlgorithmException, CertPathValidatorException,
       UnrecoverableKeyException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "importCertificateReply"); //$NON-NLS-1$
-
     Collection certificates = x509Factory.generateCertificates(inStream);
     ensureReplyIsOurs(certificates);
     // we now have established that the public keys are the same.
@@ -535,7 +539,7 @@
       importCertificate((Certificate) certificates.iterator().next());
     else
       importChain(certificates);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "importCertificateReply"); //$NON-NLS-1$
   }
 
@@ -564,8 +568,8 @@
       KeyStoreException, UnrecoverableKeyException, IOException,
       UnsupportedCallbackException, CertificateException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "importCertificate", certificate); //$NON-NLS-1$
-
     LinkedList reply = new LinkedList();
     reply.addLast(certificate);
 
@@ -576,7 +580,7 @@
     Key privateKey = getAliasPrivateKey();
     store.setKeyEntry(alias, privateKey, keyPasswordChars, newChain);
     saveKeyStore();
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "importCertificate"); //$NON-NLS-1$
   }
 
@@ -608,8 +612,8 @@
       CertPathValidatorException, KeyStoreException, UnrecoverableKeyException,
       IOException, UnsupportedCallbackException, CertificateException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "importChain", chain); //$NON-NLS-1$
-
     LinkedList reply = orderChain(chain);
     if (findTrustAndUpdate(reply, ! noPrompt))
       {
@@ -618,7 +622,7 @@
         store.setKeyEntry(alias, privateKey, keyPasswordChars, newChain);
         saveKeyStore();
       }
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "importChain"); //$NON-NLS-1$
   }
 
@@ -638,10 +642,11 @@
   private void ensureReplyIsOurs(Collection certificates) throws IOException,
       UnsupportedCallbackException, KeyStoreException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "ensureReplyIsOurs"); //$NON-NLS-1$
-
     Certificate certificate = (Certificate) certificates.iterator().next();
-    log.finest("certificate = " + certificate); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.fine("certificate = " + certificate); //$NON-NLS-1$
     Certificate[] chain = store.getCertificateChain(alias);
     if (chain == null)
       throw new IllegalArgumentException(Messages.getFormattedString("ImportCmd.37", //$NON-NLS-1$
@@ -673,7 +678,7 @@
                                                      anchorPublicKey.getClass().getName() }));
     if (! sameKey)
       throw new IllegalArgumentException(Messages.getString("ImportCmd.41")); //$NON-NLS-1$
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "ensureReplyIsOurs"); //$NON-NLS-1$
   }
 
@@ -726,6 +731,7 @@
    */
   private LinkedList orderChain(Collection chain)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "orderChain"); //$NON-NLS-1$
     LinkedList in = new LinkedList(chain);
     int initialCount = in.size();
@@ -750,7 +756,8 @@
                                         new Object[] { Integer.valueOf(result.size()),
                                                        Integer.valueOf(initialCount) }));
       }
-    log.entering(this.getClass().getName(), "orderChain", result); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "orderChain", result); //$NON-NLS-1$
     return result;
   }
 
@@ -786,6 +793,7 @@
       KeyStoreException, UnrecoverableKeyException, UnsupportedCallbackException,
       CertificateEncodingException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "findTrustAndUpdate"); //$NON-NLS-1$
     CertPathValidator validator = CertPathValidator.getInstance("PKIX"); //$NON-NLS-1$
     X509CertPath certPath = new X509CertPath(reply);
@@ -824,7 +832,8 @@
         reply.addLast(trustedCert);
         result = true;
       }
-    log.entering(this.getClass().getName(), "findTrustAndUpdate", //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      log.exiting(this.getClass().getName(), "findTrustAndUpdate", //$NON-NLS-1$
                  Boolean.valueOf(result));
     return result;
   }
@@ -832,8 +841,8 @@
   private PKIXCertPathValidatorResult findTrustInStore(X509CertPath certPath,
                                                        CertPathValidator validator)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "findTrustInStore"); //$NON-NLS-1$
-
     PKIXCertPathValidatorResult result;
     try
       {
@@ -847,7 +856,7 @@
                 x);
         result = null;
       }
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "findTrustInStore", result); //$NON-NLS-1$
     return result;
   }
@@ -864,6 +873,7 @@
    */
   private PKIXParameters getCertPathParameters(String type, String pathName)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getCertPathParameters", //$NON-NLS-1$
                  new Object[] { type, pathName });
     FileInputStream stream = null;
@@ -877,6 +887,7 @@
       }
     catch (Exception x)
       {
+        if (Configuration.DEBUG)
         log.log(Level.FINE, "Exception in getCertPathParameters(). Ignore", x); //$NON-NLS-1$
       }
     finally
@@ -890,6 +901,7 @@
             {
             }
       }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getCertPathParameters", result); //$NON-NLS-1$
     return result;
   }
@@ -898,6 +910,7 @@
                                                X509CertPath certPath,
                                                PKIXParameters params)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "validate"); //$NON-NLS-1$
     PKIXCertPathValidatorResult result = null;
     if (params != null)
@@ -908,8 +921,10 @@
         }
       catch (Exception x)
         {
+          if (Configuration.DEBUG)
           log.log(Level.FINE, "Exception in validate(). Ignore", x); //$NON-NLS-1$
         }
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "validate", result); //$NON-NLS-1$
     return result;
   }

Index: keytool/ExportCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- keytool/ExportCmd.java	1 Jun 2006 19:50:36 -0000	1.5
+++ keytool/ExportCmd.java	12 Jun 2006 05:14:07 -0000	1.6
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
@@ -188,32 +189,36 @@
     setOutputStreamParam(_certFileName);
     setKeyStoreParams(_providerClassName, _ksType, _ksPassword, _ksURL);
     setAliasParam(_alias);
-
-    log.finer("-export handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -alias=" + alias); //$NON-NLS-1$
-    log.finer("  -file=" + _certFileName); //$NON-NLS-1$
-    log.finer("  -storetype=" + storeType); //$NON-NLS-1$
-    log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -provider=" + provider); //$NON-NLS-1$
-    log.finer("  -rfc=" + rfc); //$NON-NLS-1$
-    log.finer("  -v=" + verbose); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("-export handler will use the following options:"); //$NON-NLS-1$
+        log.fine("  -alias=" + alias); //$NON-NLS-1$
+        log.fine("  -file=" + _certFileName); //$NON-NLS-1$
+        log.fine("  -storetype=" + storeType); //$NON-NLS-1$
+        log.fine("  -keystore=" + storeURL); //$NON-NLS-1$
+        log.fine("  -provider=" + provider); //$NON-NLS-1$
+        log.fine("  -rfc=" + rfc); //$NON-NLS-1$
+        log.fine("  -v=" + verbose); //$NON-NLS-1$
+      }
   }
 
   void start() throws KeyStoreException, CertificateEncodingException,
       IOException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
-
     ensureStoreContainsAlias();
     Certificate certificate;
     if (store.isCertificateEntry(alias))
       {
-        log.finer("Alias [" + alias + "] is a trusted certificate"); //$NON-NLS-1$ //$NON-NLS-2$
+        if (Configuration.DEBUG)
+          log.fine("Alias [" + alias + "] is a trusted certificate"); //$NON-NLS-1$ //$NON-NLS-2$
         certificate = store.getCertificate(alias);
       }
     else
       {
-        log.finer("Alias [" + alias + "] is a key entry"); //$NON-NLS-1$ //$NON-NLS-2$
+        if (Configuration.DEBUG)
+          log.fine("Alias [" + alias + "] is a key entry"); //$NON-NLS-1$ //$NON-NLS-2$
         Certificate[] chain = store.getCertificateChain(alias);
         certificate = chain[0];
       }
@@ -231,6 +236,7 @@
       outStream.write(derBytes);
 
     // stream is closed in Command.teardown()
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -238,8 +244,8 @@
 
   Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
-
     Parser result = new ClasspathToolParser(Main.EXPORT_CMD, true);
     result.setHeader(Messages.getString("ExportCmd.17")); //$NON-NLS-1$
     result.setFooter(Messages.getString("ExportCmd.18")); //$NON-NLS-1$
@@ -315,7 +321,7 @@
       }
     });
     result.add(options);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }

Index: keytool/SelfCertCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/SelfCertCmd.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- keytool/SelfCertCmd.java	1 Jun 2006 19:50:36 -0000	1.4
+++ keytool/SelfCertCmd.java	12 Jun 2006 05:14:07 -0000	1.5
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
 import gnu.classpath.tools.getopt.OptionException;
@@ -264,24 +265,26 @@
     setAliasParam(_alias);
     setKeyPasswordNoPrompt(_password);
     setValidityParam(_validityStr);
-
-    log.finer("-selfcert handler will use the following options:"); //$NON-NLS-1$
-    log.finer("  -alias=" + alias); //$NON-NLS-1$
-    log.finer("  -sigalg=" + _sigAlgorithm); //$NON-NLS-1$
-    log.finer("  -dname=" + _dName); //$NON-NLS-1$
-    log.finer("  -validity=" + validityInDays); //$NON-NLS-1$
-    log.finer("  -storetype=" + storeType); //$NON-NLS-1$
-    log.finer("  -keystore=" + storeURL); //$NON-NLS-1$
-    log.finer("  -provider=" + provider); //$NON-NLS-1$
-    log.finer("  -v=" + verbose); //$NON-NLS-1$
+    if (Configuration.DEBUG)
+      {
+        log.fine("-selfcert handler will use the following options:"); //$NON-NLS-1$
+        log.fine("  -alias=" + alias); //$NON-NLS-1$
+        log.fine("  -sigalg=" + _sigAlgorithm); //$NON-NLS-1$
+        log.fine("  -dname=" + _dName); //$NON-NLS-1$
+        log.fine("  -validity=" + validityInDays); //$NON-NLS-1$
+        log.fine("  -storetype=" + storeType); //$NON-NLS-1$
+        log.fine("  -keystore=" + storeURL); //$NON-NLS-1$
+        log.fine("  -provider=" + provider); //$NON-NLS-1$
+        log.fine("  -v=" + verbose); //$NON-NLS-1$
+      }
   }
 
   void start() throws KeyStoreException, NoSuchAlgorithmException,
       UnrecoverableKeyException, IOException, UnsupportedCallbackException,
       InvalidKeyException, SignatureException, CertificateException
   {
+    if (Configuration.DEBUG)
     log.entering(getClass().getName(), "start"); //$NON-NLS-1$
-
     // 1. get the key entry and certificate chain associated to alias
     Key privateKey = getAliasPrivateKey();
     Certificate[] chain = store.getCertificateChain(alias);
@@ -310,7 +313,7 @@
 
     // 7. persist the key store
     saveKeyStore();
-
+    if (Configuration.DEBUG)
     log.exiting(getClass().getName(), "start"); //$NON-NLS-1$
   }
 
@@ -318,8 +321,8 @@
 
   Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
-
     Parser result = new ClasspathToolParser(Main.SELFCERT_CMD, true);
     result.setHeader(Messages.getString("SelfCertCmd.14")); //$NON-NLS-1$
     result.setFooter(Messages.getString("SelfCertCmd.15")); //$NON-NLS-1$
@@ -414,7 +417,7 @@
       }
     });
     result.add(options);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }

Index: keytool/Command.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/Command.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- keytool/Command.java	1 Jun 2006 19:31:46 -0000	1.5
+++ keytool/Command.java	12 Jun 2006 05:14:07 -0000	1.6
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.SystemProperties;
 import gnu.classpath.tools.common.CallbackUtil;
 import gnu.classpath.tools.common.ProviderUtil;
@@ -242,11 +243,11 @@
    */
   String[] processArgs(String[] args)
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "processArgs", args); //$NON-NLS-1$
-
     Parser cmdOptionsParser = getParser();
     String[] result = cmdOptionsParser.parse(args);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "processArgs", result); //$NON-NLS-1$
     return result;
   }
@@ -312,8 +313,8 @@
    */
   void teardown()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "teardown"); //$NON-NLS-1$
-
     if (storeStream != null)
       try
         {
@@ -321,6 +322,7 @@
         }
       catch (IOException ignored)
         {
+          if (Configuration.DEBUG)
           log.fine("Exception while closing key store URL stream. Ignored: " //$NON-NLS-1$
                    + ignored);
         }
@@ -357,6 +359,7 @@
     if (providerNdx > 0)
       ProviderUtil.removeProvider(provider.getName());
 
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "teardown"); //$NON-NLS-1$
   }
 
@@ -401,15 +404,18 @@
    */
   protected void setProviderClassNameParam(String className)
   {
-    log.finest("setProviderClassNameParam(" + className + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+    if (Configuration.DEBUG)
+      log.fine("setProviderClassNameParam(" + className + ")"); //$NON-NLS-1$ //$NON-NLS-2$
     if (className != null && className.trim().length() > 0)
       {
         className = className.trim();
         SecurityProviderInfo spi = ProviderUtil.addProvider(className);
         provider = spi.getProvider();
         if (provider == null)
+          {
+            if (Configuration.DEBUG)
           log.fine("Was unable to add provider from class " + className);
-
+          }
         providerNdx = spi.getPosition();
       }
   }
@@ -426,7 +432,8 @@
    */
   protected void setKeystoreTypeParam(String type)
   {
-    log.finest("setKeystoreTypeParam(" + type + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+    if (Configuration.DEBUG)
+      log.fine("setKeystoreTypeParam(" + type + ")"); //$NON-NLS-1$ //$NON-NLS-2$
     if (type == null || type.trim().length() == 0)
       storeType = KeyStore.getDefaultType();
     else
@@ -525,7 +532,8 @@
       KeyStoreException, UnsupportedCallbackException, NoSuchAlgorithmException,
       CertificateException
   {
-    log.finest("setKeystoreURLParam(" + url + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+    if (Configuration.DEBUG)
+      log.fine("setKeystoreURLParam(" + url + ")"); //$NON-NLS-1$ //$NON-NLS-2$
     if (url == null || url.trim().length() == 0)
       {
         String userHome = SystemProperties.getProperty("user.home"); //$NON-NLS-1$
@@ -551,6 +559,7 @@
     storeStream = storeURL.openStream();
     if (storeStream.available() == 0)
       {
+        if (Configuration.DEBUG)
         log.fine("Store is empty. Will use <null> when loading, to create it"); //$NON-NLS-1$
         newKeyStore = true;
       }
@@ -564,6 +573,7 @@
         if (provider != null)
           throw x;
 
+        if (Configuration.DEBUG)
         log.fine("Exception while getting key store with default provider(s)." //$NON-NLS-1$
                  + " Will prompt user for another provider and continue"); //$NON-NLS-1$
         String prompt = Messages.getString("Command.40"); //$NON-NLS-1$
@@ -596,6 +606,7 @@
     }
     catch (IOException x)
     {
+      if (Configuration.DEBUG)
       log.fine("Exception while closing the key store input stream: " + x //$NON-NLS-1$
                + ". Ignore"); //$NON-NLS-1$
     }
@@ -818,9 +829,9 @@
                                             PrivateKey privateKey)
       throws IOException, SignatureException, InvalidKeyException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getSelfSignedCertificate", //$NON-NLS-1$
                  new Object[] { distinguishedName, publicKey, privateKey });
-
     byte[] versionBytes = new DERValue(DER.INTEGER, BigInteger.ZERO).getEncoded();
     DERValue derVersion = new DERValue(DER.CONSTRUCTED | DER.CONTEXT | 0,
                                        versionBytes.length, versionBytes, null);
@@ -901,7 +912,7 @@
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     DERWriter.write(baos, derCertificate);
     byte[] result = baos.toByteArray();
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getSelfSignedCertificate"); //$NON-NLS-1$
     return result;
   }
@@ -992,8 +1003,8 @@
   protected void saveKeyStore(char[] password) throws IOException,
       KeyStoreException, NoSuchAlgorithmException, CertificateException
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "saveKeyStore"); //$NON-NLS-1$
-
     URLConnection con = storeURL.openConnection();
     con.setDoOutput(true);
     con.setUseCaches(false);
@@ -1004,7 +1015,7 @@
     store.store(out, password);
     out.flush();
     out.close();
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "saveKeyStore"); //$NON-NLS-1$
   }
 

Index: keytool/Main.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/Main.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- keytool/Main.java	11 Jun 2006 10:40:51 -0000	1.3
+++ keytool/Main.java	12 Jun 2006 05:14:07 -0000	1.4
@@ -38,6 +38,7 @@
 
 package gnu.classpath.tools.keytool;
 
+import gnu.classpath.Configuration;
 import gnu.classpath.tools.common.ProviderUtil;
 import gnu.classpath.tools.getopt.ClasspathToolParser;
 import gnu.classpath.tools.getopt.Option;
@@ -133,8 +134,8 @@
 
   public static final void main(String[] args)
   {
+    if (Configuration.DEBUG)
     log.entering(Main.class.getName(), "main", args); //$NON-NLS-1$
-
     Main tool = new Main();
     int result = 1;
     try
@@ -151,12 +152,14 @@
       }
     catch (SecurityException x)
       {
+        if (Configuration.DEBUG)
         log.throwing(Main.class.getName(), "main", x); //$NON-NLS-1$
         System.err.println(Messages.getFormattedString("Main.6", //$NON-NLS-1$
                                                        x.getMessage()));
       }
     catch (Exception x)
       {
+        if (Configuration.DEBUG)
         log.throwing(Main.class.getName(), "main", x); //$NON-NLS-1$
         System.err.println(Messages.getFormattedString("Main.8", x)); //$NON-NLS-1$
       }
@@ -166,7 +169,7 @@
         if (tool.shutdownThread != null)
           Runtime.getRuntime().removeShutdownHook(tool.shutdownThread);
       }
-
+    if (Configuration.DEBUG)
     log.exiting(Main.class.getName(), "main", Integer.valueOf(result)); //$NON-NLS-1$
     System.exit(result);
   }
@@ -175,19 +178,19 @@
 
   private void setup()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "setup"); //$NON-NLS-1$
-
     cmdLineParser = getParser();
     gnuCryptoProviderNdx = ProviderUtil.addProvider(new GnuCrypto());
     gnuCallbacksNdx = ProviderUtil.addProvider(new GnuCallbacks());
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "setup"); //$NON-NLS-1$
   }
 
   private void start(String[] args) throws Exception
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "start"); //$NON-NLS-1$
-
     if (args == null || args.length == 0)
       throw new OptionException(""); //$NON-NLS-1$
 
@@ -234,14 +237,14 @@
         args = cmd.processArgs(cmdArgs);
         cmd.doCommand();
       }
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "start"); //$NON-NLS-1$
   }
 
   private Parser getParser()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "getParser"); //$NON-NLS-1$
-
     Parser result = new ClasspathToolParser(KEYTOOL_TOOL, true);
     result.setHeader(Messages.getString("Main.19")); //$NON-NLS-1$
     result.setFooter(Messages.getString("Main.20")); //$NON-NLS-1$
@@ -273,15 +276,15 @@
     cmdGroup.add(new NoParseOption(CACERT_CMD,
                                    Messages.getString("Main.5"))); //$NON-NLS-1$
     result.add(cmdGroup);
-
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "getParser", result); //$NON-NLS-1$
     return result;
   }
 
   void teardown()
   {
+    if (Configuration.DEBUG)
     log.entering(this.getClass().getName(), "teardown"); //$NON-NLS-1$
-
     // if we added our own providers remove them
     if (gnuCryptoProviderNdx > 0)
       ProviderUtil.removeProvider(Registry.GNU_CRYPTO);
@@ -289,6 +292,7 @@
     if (gnuCallbacksNdx > 0)
       ProviderUtil.removeProvider("GNU-CALLBACKS"); //$NON-NLS-1$
 
+    if (Configuration.DEBUG)
     log.exiting(this.getClass().getName(), "teardown"); //$NON-NLS-1$
   }
 



From MAILER-DAEMON Mon Jun 12 04:43:06 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fpi0o-0006r3-HV
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 04:43:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fpi0m-0006qr-Ba
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 04:43:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fpi0l-0006qK-5X
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 04:43:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fpi0k-0006q9-Nu
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 04:43:02 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fpi9R-0000Ea-0T
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 04:52:01 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fpi0k-00057q-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 04:43:02 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fpi0j-00057j-3R
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 08:43:01 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fpi0j-00057j-3R@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Mon, 12 Jun 2006 08:43:01 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/management/Manage...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 08:43:04 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/12 08:43:00

Modified files:
	.              : ChangeLog 
Added files:
	java/lang/management: ManagementPermission.java 

Log message:
	2006-06-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/management/ManagementPermission.java:
		New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7776&r2=1.7777
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ManagementPermission.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7776
retrieving revision 1.7777
diff -u -b -r1.7776 -r1.7777
--- ChangeLog	12 Jun 2006 04:04:40 -0000	1.7776
+++ ChangeLog	12 Jun 2006 08:42:59 -0000	1.7777
@@ -1,3 +1,8 @@
+2006-06-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/lang/management/ManagementPermission.java:
+	New file.
+	
 2006-06-12  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	* doc/tools.texinfo: Replaced original author with "The GNU Classpath Team".

Index: java/lang/management/ManagementPermission.java
===================================================================
RCS file: java/lang/management/ManagementPermission.java
diff -N java/lang/management/ManagementPermission.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/lang/management/ManagementPermission.java	12 Jun 2006 08:43:00 -0000	1.1
@@ -0,0 +1,127 @@
+/* ManagementPermission.java - Permissions for system management.
+   Copyright (C) 2006 Free Software Foundation
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.lang.management;
+
+import java.security.BasicPermission;
+
+/**
+ * <p>
+ * Represents the permission to view or modify the data
+ * which forms part of the system management interfaces.
+ * Calls to methods of the system management beans,
+ * provided by the {@link ManagementFactory}, may perform
+ * checks against the current {@link java.lang.SecurityManager}
+ * (if any) before allowing the operation to proceed.
+ * Instances of this object are supplied to the
+ * {@link java.lang.SecurityManager} in order to perform
+ * these checks.  It is not normal for instances of this
+ * class to be created outside the use of the
+ * {@link java.lang.SecurityManager}.
+ * </p>
+ * <p>
+ * This object can represent two types of management
+ * permission:
+ * </p>
+ * <ul>
+ * <li><strong>monitor</strong> &mdash; this allows access
+ * to information such as the arguments supplied to the
+ * virtual machine, the currently loaded classes and the
+ * stack traces of running threads.  Malicious code may
+ * use this to obtain information about the system and
+ * exploit any vulnerabilities found.</li>
+ * <li><strong>control</strong> &mdash; this allows the
+ * information stored by the management beans to be altered.
+ * For example, additional debugging information (such
+ * as class loading traces) may be turned on or memory
+ * usage limits changed.  Malicious code could use
+ * this to alter the behaviour of the system.</li>
+ * </ul>
+ * 
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class ManagementPermission
+  extends BasicPermission
+{
+
+  /**
+   * Constructs a new <code>ManagementPermission</code>
+   * for one of the two permission targets, "monitor"
+   * and "control".
+   *
+   * @param name the name of the permission this instance
+   *             should represent; either "monitor" or
+   *             "control".
+   * @throws IllegalArgumentException if the name is not
+   *                                  either "monitor"
+   *                                  or "control".
+   */
+  public ManagementPermission(String name)
+  {
+    super(name);
+    if (!(name.equals("monitor") || name.equals("control")))
+      throw new IllegalArgumentException("Invalid permission.");
+  }
+
+  /**
+   * Constructs a new <code>ManagementPermission</code>
+   * for one of the two permission targets, "monitor"
+   * and "control".  Actions are not supported, so
+   * this value should be either <code>null</code>
+   * or the empty string.
+   *
+   * @param name the name of the permission this instance
+   *             should represent; either "monitor" or
+   *             "control".
+   * @param actions either <code>null</code> or the
+   *                empty string.
+   * @throws IllegalArgumentException if the name is not
+   *                                  either "monitor"
+   *                                  or "control", or
+   *                                  a value for actions
+   *                                  is specified.
+   */
+  public ManagementPermission(String name, String actions)
+  {
+    this(name);
+    if (!(actions == null || actions.equals("")))
+      throw new IllegalArgumentException("Invalid actions.");
+  }
+  
+}
+



From MAILER-DAEMON Mon Jun 12 04:51:21 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fpi8n-0001DN-KV
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 04:51:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fpi8l-0001CC-5s
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 04:51:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fpi8k-0001Bc-Hn
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 04:51:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fpi8k-0001BZ-A4
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 04:51:18 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpiHQ-00018f-N2
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 05:00:16 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fpi8j-0005FU-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 04:51:17 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1Fpi8i-0005FR-5e
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 08:51:17 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fpi8i-0005FR-5e@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Mon, 12 Jun 2006 08:51:16 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/GdkPi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 08:51:19 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/12 08:51:15

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: GdkPixbufDecoder.java 

Log message:
	       * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (streamImage):
	       Notify data when completely done. Wait for worker thread to finish.
	       Rethrow any pending exceptions.
	       (exception): New field.
	       (run): Store pending exception.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7777&r2=1.7778
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java?cvsroot=classpath&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7777
retrieving revision 1.7778
diff -u -b -r1.7777 -r1.7778
--- ChangeLog	12 Jun 2006 08:42:59 -0000	1.7777
+++ ChangeLog	12 Jun 2006 08:51:15 -0000	1.7778
@@ -1,3 +1,11 @@
+2006-06-12  Mark Wielaard  <mark@klomp.org>
+
+	* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (streamImage):
+	Notify data when completely done. Wait for worker thread to finish.
+	Rethrow any pending exceptions.
+	(exception): New field.
+	(run): Store pending exception.
+
 2006-06-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/lang/management/ManagementPermission.java:

Index: gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gnu/java/awt/peer/gtk/GdkPixbufDecoder.java	11 Jun 2006 22:02:14 -0000	1.23
+++ gnu/java/awt/peer/gtk/GdkPixbufDecoder.java	12 Jun 2006 08:51:15 -0000	1.24
@@ -526,7 +526,8 @@
           model = img.getColorModel();
         }
 
-      new Thread(this, "GdkPixbufWriter").start();
+      Thread workerThread = new Thread(this, "GdkPixbufWriter");
+      workerThread.start();
       processImageStarted(1);
       synchronized(pixbufLock)
 	{
@@ -536,9 +537,27 @@
       synchronized(data)
         {
           data.add(DATADONE);
+          data.notifyAll();
+        }
+
+      while (workerThread.isAlive())
+        {
+	  try
+	    {
+	      workerThread.join();
+	    }
+	  catch (InterruptedException ioe)
+	    {
+	      // Ignored.
         }
     }    
 
+      if (exception != null)
+	throw exception;
+
+      processImageComplete();
+    }    
+
     /**
      * Object marking end of data from native streamImage code.
      */
@@ -552,6 +571,12 @@
      */
     private ArrayList data = new ArrayList();
 
+    /**
+     * Holds any IOException thrown by the run method that needs
+     * to be rethrown by the write method.
+     */
+    private IOException exception;
+
     /** Callback for streamImage native code. **/
     private void write(byte[] bs)
     {
@@ -593,12 +618,13 @@
                     }
                   catch (IOException ioe)
                     {
-                      // Not much we can do now...
+                      // We are only interested in the first exception.
+                      if (exception == null)
+                        exception = ioe;
                     }
                 }
             }
         }
-      processImageComplete();
     }
   }
 



From MAILER-DAEMON Mon Jun 12 05:50:14 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fpj3m-00075c-9T
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 05:50:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fpj3k-00074u-TF
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 05:50:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fpj3j-00074P-Rb
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 05:50:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fpj3j-00074L-Oj
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 05:50:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpjCQ-0005wh-Lk
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 05:59:10 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fpj3i-00079h-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 05:50:10 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fpj3i-00079e-I4
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 09:50:10 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fpj3i-00079e-I4@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Mon, 12 Jun 2006 09:50:10 +0000
Subject: [commit-cp] classpath/sun/reflect/annotation AnnotationInvo...
	[generics-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 09:50:13 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics-branch
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/12 09:50:10

Added files:
	sun/reflect/annotation: AnnotationInvocationHandler.java 

Log message:
	2006-06-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* Merge from HEAD --> generics for
		2006-05-29 to 2006-06-11.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/sun/reflect/annotation/AnnotationInvocationHandler.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1

Patches:
Index: AnnotationInvocationHandler.java
===================================================================
RCS file: AnnotationInvocationHandler.java
diff -N AnnotationInvocationHandler.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ AnnotationInvocationHandler.java	12 Jun 2006 09:50:10 -0000	1.1.2.1
@@ -0,0 +1,340 @@
+/* sun.reflect.annotation.AnnotationInvocationHandler
+   Copyright (C) 2006
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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 sun.reflect.annotation;
+
+import java.io.Serializable;
+import java.lang.annotation.AnnotationTypeMismatchException;
+import java.lang.annotation.IncompleteAnnotationException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * This class exists for serialization compatibility with the JDK.
+ * VMs can choose to implement annotations by constructing proxies
+ * with this invocation handler, but that is not required.
+ * If a different strategy for proxy objects is chosen, they can
+ * have a writeReplace method to substitute a Proxy based on this
+ * invocation handler is used for serialization.
+ */
+public final class AnnotationInvocationHandler
+  implements InvocationHandler, Serializable
+{
+    private static final long serialVersionUID = 6182022883658399397L;
+    private final Class type;
+    private final Map memberValues;
+
+    /**
+     * Construct a new invocation handler for an annotation proxy.
+     * Note that the VM is responsible for filling the memberValues map
+     * with the default values of all the annotation members.
+     */
+    public AnnotationInvocationHandler(Class type, Map memberValues)
+    {
+        this.type = type;
+        this.memberValues = memberValues;
+    }
+
+    /**
+     * Compare an instance of AnnotationInvocationHandler with another object.
+     * Note that the other object does not have to be an
+     * AnnotationInvocationHandler, any implementation of the annotation
+     * interface is allowed to be compared for equality.
+     * Note that this makes the equals method asymmetric, but this behavior
+     * is specified by Annotation.equals and identical to the JDK.
+     *
+     * This method is public for use by other parts of the VM. Some VMs
+     * (can) use different representations of annotations that reuse this
+     * method.
+     */
+    public static boolean equals(Class type, Map memberValues, Object other)
+    {
+        if (type.isInstance(other))
+        {
+            try
+            {
+                Method[] methods = type.getDeclaredMethods();
+                if (methods.length == memberValues.size())
+                {
+                    for (int i = 0; i < methods.length; i++)
+                    {
+                        String key = methods[i].getName();
+                        Object val = methods[i].invoke(other, new Object[0]);
+                        if (! deepEquals(memberValues.get(key), val))
+                        {
+                            return false;
+                        }
+                    }
+                    return true;
+                }
+            }
+            catch (IllegalAccessException _)
+            {
+                // Ignore exception, like the JDK
+            }
+            catch (InvocationTargetException _)
+            {
+                // Ignore exception, like the JDK
+            }
+        }
+        return false;
+    }
+
+    private static boolean deepEquals(Object o1, Object o2)
+    {
+        if (o1 == o2)
+            return true;
+
+        if (o1 == null || o2 == null)
+            return false;
+
+        if (o1 instanceof boolean[] && o2 instanceof boolean[])
+            return Arrays.equals((boolean[]) o1, (boolean[]) o2);
+
+        if (o1 instanceof byte[] && o2 instanceof byte[])
+            return Arrays.equals((byte[]) o1, (byte[]) o2);
+
+        if (o1 instanceof char[] && o2 instanceof char[])
+            return Arrays.equals((char[]) o1, (char[]) o2);
+
+        if (o1 instanceof short[] && o2 instanceof short[])
+            return Arrays.equals((short[]) o1, (short[]) o2);
+
+        if (o1 instanceof int[] && o2 instanceof int[])
+            return Arrays.equals((int[]) o1, (int[]) o2);
+
+        if (o1 instanceof float[] && o2 instanceof float[])
+            return Arrays.equals((float[]) o1, (float[]) o2);
+
+        if (o1 instanceof long[] && o2 instanceof long[])
+            return Arrays.equals((long[]) o1, (long[]) o2);
+
+        if (o1 instanceof double[] && o2 instanceof double[])
+            return Arrays.equals((double[]) o1, (double[]) o2);
+
+        if (o1 instanceof Object[] && o2 instanceof Object[])
+            return Arrays.equals((Object[]) o1, (Object[]) o2);
+
+        return o1.equals(o2);
+    }
+
+    private static int deepHashCode(Object obj)
+    {
+        if (obj instanceof boolean[])
+            return Arrays.hashCode((boolean[]) obj);
+
+        if (obj instanceof byte[])
+            return Arrays.hashCode((byte[]) obj);
+
+        if (obj instanceof char[])
+            return Arrays.hashCode((char[]) obj);
+
+        if (obj instanceof short[])
+            return Arrays.hashCode((short[]) obj);
+
+        if (obj instanceof int[])
+            return Arrays.hashCode((int[]) obj);
+
+        if (obj instanceof float[])
+            return Arrays.hashCode((float[]) obj);
+
+        if (obj instanceof long[])
+            return Arrays.hashCode((long[]) obj);
+
+        if (obj instanceof double[])
+            return Arrays.hashCode((double[]) obj);
+
+        if (obj instanceof Object[])
+            return Arrays.hashCode((Object[]) obj);
+
+        return obj.hashCode();
+    }
+
+    /**
+     * Compute the hashCode for an annotation. Note that the algorithm is
+     * specified by Annotation.hashCode.
+     *
+     * This method is public for use by other parts of the VM. Some VMs
+     * (can) use different representations of annotations that reuse this
+     * method.
+     */
+    public static int hashCode(Class type, Map memberValues)
+    {
+        int h = 0;
+        Iterator iter = memberValues.keySet().iterator();
+        while (iter.hasNext())
+        {
+            Object key = iter.next();
+            Object val = memberValues.get(key);
+            h += deepHashCode(val) ^ 127 * key.hashCode();
+        }
+        return h;
+    }
+
+    private static String deepToString(Object obj)
+    {
+        if (obj instanceof boolean[])
+            return Arrays.toString((boolean[]) obj);
+
+        if (obj instanceof byte[])
+            return Arrays.toString((byte[]) obj);
+
+        if (obj instanceof char[])
+            return Arrays.toString((char[]) obj);
+
+        if (obj instanceof short[])
+            return Arrays.toString((short[]) obj);
+
+        if (obj instanceof int[])
+            return Arrays.toString((int[]) obj);
+
+        if (obj instanceof float[])
+            return Arrays.toString((float[]) obj);
+
+        if (obj instanceof long[])
+            return Arrays.toString((long[]) obj);
+
+        if (obj instanceof double[])
+            return Arrays.toString((double[]) obj);
+
+        if (obj instanceof Object[])
+            return Arrays.toString((Object[]) obj);
+
+        return obj.toString();
+    }
+
+    /**
+     * This method is public for use by other parts of the VM. Some VMs
+     * (can) use different representations of annotations that reuse this
+     * method.
+     */
+    public static String toString(Class type, Map memberValues)
+    {
+        StringBuffer sb = new StringBuffer();
+        sb.append('@').append(type.getName()).append('(');
+        String sep = "";
+        Iterator iter = memberValues.keySet().iterator();
+        while (iter.hasNext())
+        {
+            Object key = iter.next();
+            Object val = memberValues.get(key);
+            sb.append(sep).append(key).append('=').append(deepToString(val));
+            sep = ", ";
+        }
+        sb.append(')');
+        return sb.toString();
+    }
+
+    private static Class getBoxedReturnType(Method method)
+    {
+        Class returnType = method.getReturnType();
+
+        if (returnType == boolean.class)
+            return Boolean.class;
+
+        if (returnType == byte.class)
+            return Byte.class;
+
+        if (returnType == char.class)
+            return Character.class;
+
+        if (returnType == short.class)
+            return Short.class;
+
+        if (returnType == int.class)
+            return Integer.class;
+
+        if (returnType == float.class)
+            return Float.class;
+
+        if (returnType == long.class)
+            return Long.class;
+
+        if (returnType == double.class)
+            return Double.class;
+
+        return returnType;
+    }
+
+    public Object invoke(Object proxy, Method method, Object[] args)
+      throws Throwable
+    {
+        String methodName = method.getName().intern();
+        if (args == null || args.length == 0)
+        {
+            if (methodName == "toString")
+            {
+                return toString(type, memberValues);
+            }
+            else if (methodName == "hashCode")
+            {
+                return Integer.valueOf(hashCode(type, memberValues));
+            }
+            else if (methodName == "annotationType")
+            {
+                return type;
+            }
+            else
+            {
+                Object val = memberValues.get(methodName);
+                if (val == null)
+                {
+                    throw new IncompleteAnnotationException(type, methodName);
+                }
+                if (! getBoxedReturnType(method).isInstance(val))
+                {
+                    throw new AnnotationTypeMismatchException(method,
+                        val.getClass().getName());
+                }
+                return val;
+            }
+        }
+        else if (args.length == 1)
+        {
+            if (methodName == "equals")
+            {
+                return Boolean.valueOf(equals(type, memberValues, args[0]));
+            }
+        }
+        throw new InternalError("Invalid annotation proxy");
+    }
+}



From MAILER-DAEMON Mon Jun 12 06:32:53 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fpjj3-0002o9-6N
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 06:32:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fpjj0-0002n2-CE
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 06:32:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fpjiy-0002mG-Rv
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 06:32:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fpjiy-0002mD-LH
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 06:32:48 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fpjrg-0002Fy-39
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 06:41:48 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fpjix-0007xQ-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 06:32:47 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fpjix-0007xN-16
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 10:32:47 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fpjix-0007xN-16@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Mon, 12 Jun 2006 10:32:47 +0000
Subject: [commit-cp] classpath native/jni/gtk-peergnu_java_awt_peer_...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 10:32:51 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/12 10:32:45

Modified files:
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_CairoSurface.c 
	                     gnu_java_awt_peer_gtk_CairoGraphics2D.c 
	include        : gnu_java_awt_peer_gtk_CairoSurface.h 
	                 gnu_java_awt_peer_gtk_CairoGraphics2D.h 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java CairoSurface.java 
	.              : ChangeLog 

Log message:
	2006-06-12  Roman Kennke  <kennke@aicas.com>
	
		* gnu/java/awt/peer/gtk/CairoGraphics2D.java
		(drawPixels): Include alpha in parameter list.
		(cairoFill): Include alpha in parameter list.
		(setComposite): Don't modify the color.
		(draw(Shape))): Use fill when the current composite has an alpha
		of != 1.0, so that the stroked shaped will be composited.
		(fill(Shape)): Call cairoFill() with alpha.
		(drawImage): Call drawPixels or drawSurface with alpha.
		(drawGlyphVector): When composite alpha is != 1.0, render the
		outline using fill() to enable compositing for text.
		(drawRaster): Call drawPixels with alpha.
		* gnu/java/awt/peer/gtk/CairoGraphics2D.java
		(nativeDrawSurface): Include alpha in parameter list.
		(drawSurface): Include alpha in parameter list. Pass it to
		nativeDrawSurface().
		* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
		* include/gnu_java_awt_peer_gtk_CairoSurface.h:
		Regenerated.
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
		(drawPixels): Handle possible alpha for compositing.
		(cairoFill): Likewise.
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
		(nativeDrawSurface): Handle possible alpha for compositing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c?cvsroot=classpath&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c?cvsroot=classpath&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoSurface.java?cvsroot=classpath&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7778&r2=1.7779

Patches:
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c	10 Jun 2006 14:16:09 -0000	1.18
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c	12 Jun 2006 10:32:44 -0000	1.19
@@ -181,7 +181,7 @@
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface 
 (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
- jlong surfacePointer, jlong context, jdoubleArray java_matrix)
+ jlong surfacePointer, jlong context, jdoubleArray java_matrix, double alpha)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, context);
   cairo_t *cr = gr->cr;
@@ -207,7 +207,11 @@
    cairo_pattern_set_matrix (p, &mat);
 
    cairo_set_source(cr, p);
+   if (alpha == 1.0)
    cairo_paint(cr);
+   else
+     cairo_paint_with_alpha(cr, alpha);
+
    cairo_pattern_destroy(p);
  }
   

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	10 Jun 2006 14:16:09 -0000	1.9
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	12 Jun 2006 10:32:44 -0000	1.10
@@ -188,7 +188,7 @@
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels 
 (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
  jlong pointer, jintArray java_pixels, 
- jint w, jint h, jint stride, jdoubleArray java_matrix)
+ jint w, jint h, jint stride, jdoubleArray java_matrix, jdouble alpha)
 {
   jint *native_pixels = NULL;
   jdouble *native_matrix = NULL;
@@ -218,7 +218,11 @@
    if (gr->pattern)
      cairo_pattern_set_filter (p, cairo_pattern_get_filter (gr->pattern));
    cairo_set_source (gr->cr, p);
+   if (alpha == 1.)
    cairo_paint (gr->cr);
+   else
+     cairo_paint_with_alpha(gr->cr, alpha);
+
    cairo_pattern_destroy (p);
    cairo_surface_destroy (surf);
  }
@@ -581,12 +585,20 @@
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill 
 (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
- jlong pointer)
+ jlong pointer, jdouble alpha)
 {
   struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
   g_assert (gr != NULL);
 
+  if (alpha == 1.0)
   cairo_fill (gr->cr);
+  else
+    {
+      cairo_save(gr->cr);
+      cairo_clip(gr->cr);
+      cairo_paint_with_alpha(gr->cr, alpha);
+      cairo_restore(gr->cr);
+    }
 }
 
 JNIEXPORT void JNICALL
@@ -653,6 +665,7 @@
     }
 }
 
+
 /************************** FONT STUFF ****************************/
 static void
 install_font_peer(cairo_t *cr,
@@ -703,4 +716,3 @@
   cairo_pattern_set_matrix (gr->pattern, &mat);
 }
 
-

Index: include/gnu_java_awt_peer_gtk_CairoSurface.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- include/gnu_java_awt_peer_gtk_CairoSurface.h	10 Jun 2006 14:16:10 -0000	1.5
+++ include/gnu_java_awt_peer_gtk_CairoSurface.h	12 Jun 2006 10:32:44 -0000	1.6
@@ -14,7 +14,7 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_destroy (JNIEnv *env, jobject, jlong, jlong);
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem (JNIEnv *env, jobject, jlong, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetElem (JNIEnv *env, jobject, jlong, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface (JNIEnv *env, jobject, jlong, jlong, jdoubleArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface (JNIEnv *env, jobject, jlong, jlong, jdoubleArray, jdouble);
 JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetPixels (JNIEnv *env, jobject, jlong, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetPixels (JNIEnv *env, jobject, jlong, jintArray);
 JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer (JNIEnv *env, jobject, jlong, jint);

Index: include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	10 Jun 2006 14:16:10 -0000	1.5
+++ include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	12 Jun 2006 10:32:44 -0000	1.6
@@ -12,7 +12,7 @@
 
 JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_init (JNIEnv *env, jobject, jlong);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative (JNIEnv *env, jobject, jlong);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels (JNIEnv *env, jobject, jlong, jintArray, jint, jint, jint, jdoubleArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels (JNIEnv *env, jobject, jlong, jintArray, jint, jint, jint, jdoubleArray, jdouble);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels (JNIEnv *env, jobject, jlong, jintArray, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix (JNIEnv *env, jobject, jlong, jdoubleArray);
@@ -32,7 +32,7 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo (JNIEnv *env, jobject, jlong, jdouble, jdouble);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke (JNIEnv *env, jobject, jlong);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill (JNIEnv *env, jobject, jlong, jdouble);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip (JNIEnv *env, jobject, jlong);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip (JNIEnv *env, jobject, jlong);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip (JNIEnv *env, jobject, jlong);

Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java	11 Jun 2006 11:21:52 -0000	1.19
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java	12 Jun 2006 10:32:44 -0000	1.20
@@ -65,6 +65,7 @@
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Arc2D;
 import java.awt.geom.Area;
+import java.awt.geom.GeneralPath;
 import java.awt.geom.Line2D;
 import java.awt.geom.NoninvertibleTransformException;
 import java.awt.geom.PathIterator;
@@ -309,7 +310,7 @@
    * @param i2u - affine transform array
    */
   private native void drawPixels(long pointer, int[] pixels, int w, int h,
-                                 int stride, double[] i2u);
+                                 int stride, double[] i2u, double alpha);
 
   private native void setGradient(long pointer, double x1, double y1,
                                   double x2, double y2,
@@ -406,7 +407,7 @@
   /**
    * Fill current path
    */
-  private native void cairoFill(long pointer);
+  private native void cairoFill(long pointer, double alpha);
 
   /** 
    * Clip current path
@@ -802,9 +803,6 @@
       {
 	AlphaComposite a = (AlphaComposite) comp;
 	cairoSetOperator(nativePointer, a.getRule());
-	Color c = getColor();
-	setColor(new Color(c.getRed(), c.getGreen(), c.getBlue(),
-	                   (int) (a.getAlpha() * ((float) c.getAlpha()))));
       }
     else
       {
@@ -817,8 +815,21 @@
 
   public void draw(Shape s)
   {
-    if (stroke != null && ! (stroke instanceof BasicStroke))
+    if ((stroke != null && ! (stroke instanceof BasicStroke))
+        || (comp instanceof AlphaComposite
+            && ((AlphaComposite) comp).getAlpha() != 1.0))
+      {
+        // FIXME: This is a hack to work around BasicStrokes's current
+        // limitations wrt cubic curves.
+        // See CubicSegment.getDisplacedSegments().
+        if (stroke instanceof BasicStroke)
       {
+            PathIterator flatten = s.getPathIterator(new AffineTransform(),
+                                                       1.0);
+            GeneralPath p = new GeneralPath();
+            p.append(flatten, false);
+            s = p;
+          }
 	fill(stroke.createStrokedShape(s));
 	return;
       }
@@ -849,7 +860,10 @@
     else
       walkPath(s.getPathIterator(null), false);
 
-    cairoFill(nativePointer);
+    double alpha = 1.0;
+    if (comp instanceof AlphaComposite)
+      alpha = ((AlphaComposite) comp).getAlpha();
+    cairoFill(nativePointer, alpha);
   }
 
   /**
@@ -1125,9 +1139,13 @@
 
     invertedXform.getMatrix(i2u);
 
+    double alpha = 1.0;
+    if (comp instanceof AlphaComposite)
+      alpha = ((AlphaComposite) comp).getAlpha();
+
     if(db instanceof CairoSurface)
       {
-	((CairoSurface)db).drawSurface(nativePointer, i2u);
+	((CairoSurface)db).drawSurface(nativePointer, i2u, alpha);
 	return true;
       }
 	    
@@ -1163,7 +1181,7 @@
 			  null, 0, width);
       }
 
-    drawPixels(nativePointer, pixels, width, height, width, i2u);
+    drawPixels(nativePointer, pixels, width, height, width, i2u, alpha);
 
     // Cairo seems to lose the current color which must be restored.
     updateColor();
@@ -1295,7 +1313,10 @@
 
   public void drawGlyphVector(GlyphVector gv, float x, float y)
   {
-    if (gv instanceof FreetypeGlyphVector)
+    double alpha = 1.0;
+    if (comp instanceof AlphaComposite)
+      alpha = ((AlphaComposite) comp).getAlpha();
+    if (gv instanceof FreetypeGlyphVector && alpha == 1.0)
       {
         int n = gv.getNumGlyphs ();
         int[] codes = gv.getGlyphCodes (0, n, null);
@@ -1463,8 +1484,11 @@
       for (int i = 0; i < pixels.length; i++)
 	pixels[i] |= 0xFF000000;
 
+    double alpha = 1.0;
+    if (comp instanceof AlphaComposite)
+      alpha = ((AlphaComposite) comp).getAlpha();
     drawPixels(nativePointer, pixels, r.getWidth(), r.getHeight(),
-               r.getWidth(), i2u);
+               r.getWidth(), i2u, alpha);
 
     // Cairo seems to lose the current color which must be restored.
     updateColor();

Index: gnu/java/awt/peer/gtk/CairoSurface.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoSurface.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnu/java/awt/peer/gtk/CairoSurface.java	10 Jun 2006 10:33:18 -0000	1.8
+++ gnu/java/awt/peer/gtk/CairoSurface.java	12 Jun 2006 10:32:44 -0000	1.9
@@ -112,11 +112,11 @@
    * with an affine transform given by i2u.
    */
   public native void nativeDrawSurface(long surfacePointer, long contextPointer,
-                                       double[] i2u);
+                                       double[] i2u, double alpha);
 
-  public void drawSurface(long contextPointer, double[] i2u)
+  public void drawSurface(long contextPointer, double[] i2u, double alpha)
   {
-    nativeDrawSurface(surfacePointer, contextPointer, i2u);
+    nativeDrawSurface(surfacePointer, contextPointer, i2u, alpha);
   }
 
   /**

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7778
retrieving revision 1.7779
diff -u -b -r1.7778 -r1.7779
--- ChangeLog	12 Jun 2006 08:51:15 -0000	1.7778
+++ ChangeLog	12 Jun 2006 10:32:44 -0000	1.7779
@@ -1,3 +1,29 @@
+2006-06-12  Roman Kennke  <kennke@aicas.com>
+
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
+	(drawPixels): Include alpha in parameter list.
+	(cairoFill): Include alpha in parameter list.
+	(setComposite): Don't modify the color.
+	(draw(Shape))): Use fill when the current composite has an alpha
+	of != 1.0, so that the stroked shaped will be composited.
+	(fill(Shape)): Call cairoFill() with alpha.
+	(drawImage): Call drawPixels or drawSurface with alpha.
+	(drawGlyphVector): When composite alpha is != 1.0, render the
+	outline using fill() to enable compositing for text.
+	(drawRaster): Call drawPixels with alpha.
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
+	(nativeDrawSurface): Include alpha in parameter list.
+	(drawSurface): Include alpha in parameter list. Pass it to
+	nativeDrawSurface().
+	* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
+	* include/gnu_java_awt_peer_gtk_CairoSurface.h:
+	Regenerated.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
+	(drawPixels): Handle possible alpha for compositing.
+	(cairoFill): Likewise.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
+	(nativeDrawSurface): Handle possible alpha for compositing.
+
 2006-06-12  Mark Wielaard  <mark@klomp.org>
 
 	* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (streamImage):



From MAILER-DAEMON Mon Jun 12 08:25:11 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FplTj-0005ce-2M
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 08:25:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FplTh-0005bU-3g
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 08:25:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FplTg-0005bI-PB
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 08:25:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FplTg-0005bF-EJ
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 08:25:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FplcO-0003iI-QC
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 08:34:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FplTc-0003Oj-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 08:25:04 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FplTc-0003Og-1m
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 12:25:04 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FplTc-0003Og-1m@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Mon, 12 Jun 2006 12:25:04 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Compo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 12:25:09 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/12 12:25:03

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: ComponentGraphics.java 

Log message:
	       * gnu/java/awt/peer/gtk/ComponentGraphics.java (hasLock):
	       New static field.
	       (ONE): Likewise.
	       (lock): New method.
	       (unlock): Likewise.
	       (draw): Use lock() and unlock().
	       (fill): Likewise.
	       (drawRenderedImage): Likewise.
	       (drawImage): Likewise.
	       (drawGlyphVector): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7779&r2=1.7780
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java?cvsroot=classpath&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7779
retrieving revision 1.7780
diff -u -b -r1.7779 -r1.7780
--- ChangeLog	12 Jun 2006 10:32:44 -0000	1.7779
+++ ChangeLog	12 Jun 2006 12:25:00 -0000	1.7780
@@ -1,3 +1,16 @@
+2006-06-12  Mark Wielaard  <mark@klomp.org>
+
+	* gnu/java/awt/peer/gtk/ComponentGraphics.java (hasLock):
+	New static field.
+	(ONE): Likewise.
+	(lock): New method.
+	(unlock): Likewise.
+	(draw): Use lock() and unlock().
+	(fill): Likewise.
+	(drawRenderedImage): Likewise.
+	(drawImage): Likewise.
+	(drawGlyphVector): Likewise.
+
 2006-06-12  Roman Kennke  <kennke@aicas.com>
 
 	* gnu/java/awt/peer/gtk/CairoGraphics2D.java

Index: gnu/java/awt/peer/gtk/ComponentGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gnu/java/awt/peer/gtk/ComponentGraphics.java	11 Jun 2006 11:21:52 -0000	1.13
+++ gnu/java/awt/peer/gtk/ComponentGraphics.java	12 Jun 2006 12:25:03 -0000	1.14
@@ -67,6 +67,35 @@
   private GtkComponentPeer component;
   protected long cairo_t;
 
+  private static ThreadLocal hasLock = new ThreadLocal();
+  private static Integer ONE = Integer.valueOf(1);
+
+  private void lock()
+  {
+    Integer i = (Integer) hasLock.get();
+    if (i == null)
+      {
+	start_gdk_drawing();
+	hasLock.set(ONE);
+      }
+    else
+      hasLock.set(Integer.valueOf(i.intValue() + 1));
+  }
+
+  private void unlock()
+  {
+    Integer i = (Integer) hasLock.get();
+    if (i == null)
+      throw new IllegalStateException();
+    if (i == ONE)
+      {
+	hasLock.set(null);
+	end_gdk_drawing();
+      }
+    else
+      hasLock.set(Integer.valueOf(i.intValue() - 1));
+  }
+
   ComponentGraphics()
   {
   }
@@ -180,40 +209,40 @@
    */
   public void draw(Shape s)
   {
-    start_gdk_drawing();
+    lock();
     try
       {
 	super.draw(s);
       }
     finally
       {
-	end_gdk_drawing();
+	unlock();
       }
   }
 
   public void fill(Shape s)
   {
-    start_gdk_drawing();
+    lock();
     try
       {
 	super.fill(s);
       }
     finally
       {
-	end_gdk_drawing();
+	unlock();
       }
   }
 
   public void drawRenderedImage(RenderedImage image, AffineTransform xform)
   {
-    start_gdk_drawing();
+    lock();
     try
       {
 	super.drawRenderedImage(image, xform);
       }
     finally
       {
-	end_gdk_drawing();
+	unlock();
       }
   }
 
@@ -221,28 +250,28 @@
 			      Color bgcolor, ImageObserver obs)
   {
     boolean rv;
-    start_gdk_drawing();
+    lock();
     try
       {
 	rv = super.drawImage(img, xform, bgcolor, obs);
       }
     finally
       {
-	end_gdk_drawing();
+	unlock();
       }
     return rv;
   }
 
   public void drawGlyphVector(GlyphVector gv, float x, float y)
   {
-    start_gdk_drawing();
+    lock();
     try
       {
 	super.drawGlyphVector(gv, x, y);
       }
     finally
       {
-	end_gdk_drawing();
+	unlock();
       }
   }
   



From MAILER-DAEMON Mon Jun 12 10:36:19 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpnWd-0001rN-Gi
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 10:36:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpnWc-0001qY-Es
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 10:36:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpnWb-0001qE-Vj
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 10:36:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpnWb-0001qB-RZ
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 10:36:17 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpnfL-0004zw-Mi
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 10:45:19 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpnWZ-0007w5-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 10:36:15 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FpnWZ-0007w1-FR
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 14:36:15 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpnWZ-0007w1-FR@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Mon, 12 Jun 2006 14:36:15 +0000
Subject: [commit-cp] classpath/java/lang Thread.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 14:36:18 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/12 14:36:13

Modified files:
	java/lang      : Thread.java 
	.              : ChangeLog 

Log message:
		* java/lang/Thread.java (uncaughtException): Javadoc fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/Thread.java?cvsroot=classpath&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7780&r2=1.7781

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7780
retrieving revision 1.7781
diff -u -b -r1.7780 -r1.7781
--- ChangeLog	12 Jun 2006 12:25:00 -0000	1.7780
+++ ChangeLog	12 Jun 2006 14:36:06 -0000	1.7781
@@ -1,3 +1,7 @@
+2006-06-12  Tom Tromey  <tromey@redhat.com>
+
+	* java/lang/Thread.java (uncaughtException): Javadoc fix.
+
 2006-06-12  Mark Wielaard  <mark@klomp.org>
 
 	* gnu/java/awt/peer/gtk/ComponentGraphics.java (hasLock):



From MAILER-DAEMON Mon Jun 12 12:08:43 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fpoy3-000851-CJ
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 12:08:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fpoy2-00084u-3w
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 12:08:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fpoy0-00084h-BV
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 12:08:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fpoy0-00084e-74
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 12:08:40 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fpp6l-0004U8-1I
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 12:17:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fpoxp-0003v5-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 12:08:29 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1Fpoxp-0003v2-25
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 16:08:29 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fpoxp-0003v2-25@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Mon, 12 Jun 2006 16:08:29 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 16:08:42 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/12 16:08:28

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicTabbedPaneUI.java 

Log message:
	2006-06-12  Lillian Angel  <langel@redhat.com>
	
	        * javax/swing/plaf/basic/BasicTabbedPaneUI.java
	        (layoutContainer): Added check to prevent exception.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7781&r2=1.7782
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java?cvsroot=classpath&r1=1.46&r2=1.47

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7781
retrieving revision 1.7782
diff -u -b -r1.7781 -r1.7782
--- ChangeLog	12 Jun 2006 14:36:06 -0000	1.7781
+++ ChangeLog	12 Jun 2006 16:08:26 -0000	1.7782
@@ -1,3 +1,8 @@
+2006-06-12  Lillian Angel  <langel@redhat.com>
+
+	* javax/swing/plaf/basic/BasicTabbedPaneUI.java
+	(layoutContainer): Added check to prevent exception.
+
 2006-06-12  Tom Tromey  <tromey@redhat.com>
 
 	* java/lang/Thread.java (uncaughtException): Javadoc fix.

Index: javax/swing/plaf/basic/BasicTabbedPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- javax/swing/plaf/basic/BasicTabbedPaneUI.java	9 Jun 2006 23:34:34 -0000	1.46
+++ javax/swing/plaf/basic/BasicTabbedPaneUI.java	12 Jun 2006 16:08:27 -0000	1.47
@@ -532,7 +532,10 @@
       Insets insets = tabPane.getInsets();
 
       int selectedIndex = tabPane.getSelectedIndex();
-      Component selectedComponent = tabPane.getComponentAt(selectedIndex);
+      
+      Component selectedComponent = null;
+      if (selectedIndex >= 0)
+        tabPane.getComponentAt(selectedIndex);
       // The RI doesn't seem to change the component if the new selected
       // component == null. This is probably so that applications can add
       // one single component for every tab. 



From MAILER-DAEMON Mon Jun 12 12:56:01 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fpphp-0000YI-JZ
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 12:56:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fpphn-0000X4-Td
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 12:55:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fpphn-0000WI-2J
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 12:55:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fpphm-0000W6-SZ
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 12:55:58 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FppqX-000837-Qg
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 13:05:01 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fpphm-0005jK-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 12:55:58 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1Fpphk-0005jG-KT
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 16:55:57 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fpphk-0005jG-KT@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Mon, 12 Jun 2006 16:55:56 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 16:56:00 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/12 16:55:56

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicTabbedPaneUI.java 

Log message:
	2006-06-12  Lillian Angel  <langel@redhat.com>
	
	        * javax/swing/plaf/basic/BasicTabbedPaneUI.java
	        (layoutContainer): Added missing selectedComponent assignment.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7782&r2=1.7783
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java?cvsroot=classpath&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7782
retrieving revision 1.7783
diff -u -b -r1.7782 -r1.7783
--- ChangeLog	12 Jun 2006 16:08:26 -0000	1.7782
+++ ChangeLog	12 Jun 2006 16:55:55 -0000	1.7783
@@ -1,6 +1,11 @@
 2006-06-12  Lillian Angel  <langel@redhat.com>
 
 	* javax/swing/plaf/basic/BasicTabbedPaneUI.java
+	(layoutContainer): Added missing selectedComponent assignment.
+
+2006-06-12  Lillian Angel  <langel@redhat.com>
+
+	* javax/swing/plaf/basic/BasicTabbedPaneUI.java
 	(layoutContainer): Added check to prevent exception.
 
 2006-06-12  Tom Tromey  <tromey@redhat.com>

Index: javax/swing/plaf/basic/BasicTabbedPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- javax/swing/plaf/basic/BasicTabbedPaneUI.java	12 Jun 2006 16:08:27 -0000	1.47
+++ javax/swing/plaf/basic/BasicTabbedPaneUI.java	12 Jun 2006 16:55:56 -0000	1.48
@@ -535,7 +535,7 @@
       
       Component selectedComponent = null;
       if (selectedIndex >= 0)
-        tabPane.getComponentAt(selectedIndex);
+        selectedComponent = tabPane.getComponentAt(selectedIndex);
       // The RI doesn't seem to change the component if the new selected
       // component == null. This is probably so that applications can add
       // one single component for every tab. 



From MAILER-DAEMON Mon Jun 12 14:58:36 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FprcS-0001Gk-FQ
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 14:58:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FprcQ-0001F9-VI
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 14:58:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FprcQ-0001EA-87
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 14:58:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FprcP-0001E0-UY
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 14:58:34 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FprlC-00005v-85
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 15:07:38 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FprcP-0001O0-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 14:58:33 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FprcN-0001Nx-SA
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 18:58:33 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FprcN-0001Nx-SA@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Mon, 12 Jun 2006 18:58:31 +0000
Subject: [commit-cp] classpath ChangeLog tools/gnu/classpath/tools/a...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 18:58:35 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/12 18:58:31

Modified files:
	.              : ChangeLog 
	tools/gnu/classpath/tools/appletviewer: 
	                                        StandaloneAppletWindow.java 

Log message:
	2006-06-12  Lillian Angel  <langel@redhat.com>
	
	        * tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java
	        (StandaloneAppletWindow): Changed title of standalone window.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7783&r2=1.7784
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java?cvsroot=classpath&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7783
retrieving revision 1.7784
diff -u -b -r1.7783 -r1.7784
--- ChangeLog	12 Jun 2006 16:55:55 -0000	1.7783
+++ ChangeLog	12 Jun 2006 18:58:30 -0000	1.7784
@@ -1,5 +1,10 @@
 2006-06-12  Lillian Angel  <langel@redhat.com>
 
+	* tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java
+	(StandaloneAppletWindow): Changed title of standalone window.
+
+2006-06-12  Lillian Angel  <langel@redhat.com>
+
 	* javax/swing/plaf/basic/BasicTabbedPaneUI.java
 	(layoutContainer): Added missing selectedComponent assignment.
 

Index: tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java	8 May 2006 20:36:46 -0000	1.1
+++ tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java	12 Jun 2006 18:58:31 -0000	1.2
@@ -199,7 +199,7 @@
     menuApplet.add(closeItem);
     menuApplet.add(quitItem);
     setMenuBar(menuBar);
-    setTitle("GCJ Applet Viewer: " + tag.code);
+    setTitle("GNU Classpath Applet Viewer: " + tag.code);
 
     AppletContext context = (AppletContext) contexts.get(tag.codebase);
     ((StandaloneAppletContext) context).addApplet(applet);



From MAILER-DAEMON Mon Jun 12 15:43:45 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpsK9-0000Ke-Li
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 15:43:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpsK6-0000Jf-IC
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 15:43:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpsK3-0000Iu-GU
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 15:43:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpsK2-0000Ir-WF
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 15:43:39 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpsSp-0003Z6-Lt
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 15:52:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpsJs-0003F1-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 15:43:28 -0400
Received: from keiths by savannah.gnu.org with local (Exim 4.50)
	id 1FpsJq-0003Ey-QD
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 19:43:28 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpsJq-0003Ey-QD@savannah.gnu.org>
From: Keith Seitz <keiths@redhat.com>
Date: Mon, 12 Jun 2006 19:43:26 +0000
Subject: [commit-cp] classpath ChangeLog gnu/classpath/jdwp/event/Ev...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 19:43:44 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Keith Seitz <keiths>	06/06/12 19:43:26

Modified files:
	.              : ChangeLog 
	gnu/classpath/jdwp/event: Event.java BreakpointEvent.java 
	                          ClassPrepareEvent.java 
	                          ThreadEndEvent.java 
	                          ThreadStartEvent.java 
	                          VmDeathEvent.java VmInitEvent.java 
	gnu/classpath/jdwp/event/filters: ClassMatchFilter.java 
	                                  ClassOnlyFilter.java 
	                                  InstanceOnlyFilter.java 
	                                  ThreadOnlyFilter.java 

Log message:
	        From Kyle Galloway  <kgallowa@redhat.com>:
	        * gnu/classpath/jdwp/event/Event.java: Added constants for
	        type.
	        (getParameter): Changed parameter type from Class to int.
	        * gnu/classpath/jdwp/event/BreakpointEvent.java (getParameter):
	        Changed from Class type to constants.
	        * gnu/classpath/jdwp/event/ClassPrepareEventEvent.java (getParameter):
	        Likewise.
	        * gnu/classpath/jdwp/event/ThreadEndEvent.java (getParameter):
	        Likewise.
	        * gnu/classpath/jdwp/event/ThreadStartEvent.java (getParameter):
	        Likewise.
	        * gnu/classpath/jdwp/event/VmDeathEvent.java (getParameter):
	        Likewise.
	        * gnu/classpath/jdwp/event/VmInitEvent.java (getParameter):
	        Likewise.
	        * gnu/classpath/jdwp/event/ClassMatchFilter.java (matches):
	        Likewise.
	        * gnu/classpath/jdwp/event/ClassOnlyFilter.java (matches):
	        Likewise.
	        * gnu/classpath/jdwp/event/InstanceOnlyFilter.java (matches):
	        Likewise.
	        * gnu/classpath/jdwp/event/ThreadOnlyFilter.java (matches):
	        Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7784&r2=1.7785
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/Event.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/BreakpointEvent.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/ClassPrepareEvent.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/ThreadEndEvent.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/ThreadStartEvent.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/VmDeathEvent.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/VmInitEvent.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java?cvsroot=classpath&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7784
retrieving revision 1.7785
diff -u -b -r1.7784 -r1.7785
--- ChangeLog	12 Jun 2006 18:58:30 -0000	1.7784
+++ ChangeLog	12 Jun 2006 19:43:25 -0000	1.7785
@@ -1,3 +1,30 @@
+2006-06-12  Keith Seitz  <keiths@redhat.com>
+
+	From Kyle Galloway  <kgallowa@redhat.com>:
+	* gnu/classpath/jdwp/event/Event.java: Added constants for
+	type.
+	(getParameter): Changed parameter type from Class to int.
+	* gnu/classpath/jdwp/event/BreakpointEvent.java (getParameter):
+	Changed from Class type to constants.
+	* gnu/classpath/jdwp/event/ClassPrepareEventEvent.java (getParameter):
+	Likewise.
+	* gnu/classpath/jdwp/event/ThreadEndEvent.java (getParameter):
+	Likewise.
+	* gnu/classpath/jdwp/event/ThreadStartEvent.java (getParameter):
+	Likewise.
+	* gnu/classpath/jdwp/event/VmDeathEvent.java (getParameter):
+	Likewise.
+	* gnu/classpath/jdwp/event/VmInitEvent.java (getParameter):
+	Likewise.
+	* gnu/classpath/jdwp/event/ClassMatchFilter.java (matches):
+	Likewise.
+	* gnu/classpath/jdwp/event/ClassOnlyFilter.java (matches):
+	Likewise.
+	* gnu/classpath/jdwp/event/InstanceOnlyFilter.java (matches):
+	Likewise.
+	* gnu/classpath/jdwp/event/ThreadOnlyFilter.java (matches):
+	Likewise.
+
 2006-06-12  Lillian Angel  <langel@redhat.com>
 
 	* tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java

Index: gnu/classpath/jdwp/event/Event.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/Event.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/classpath/jdwp/event/Event.java	30 Aug 2005 00:51:10 -0000	1.1
+++ gnu/classpath/jdwp/event/Event.java	12 Jun 2006 19:43:26 -0000	1.2
@@ -54,6 +54,41 @@
  */
 public abstract class Event
 {
+  /**
+   * The class of the object in which the event occurred
+   */
+  public static final int EVENT_CLASS = 1;
+  
+  /**
+   * The thread where the event occurred
+   */
+  public static final int EVENT_THREAD = 2;
+  
+  /**
+   * The location where an event occurred
+   */
+  public static final int EVENT_LOCATION = 3;
+  
+  /**
+   * The instance of the class where the event occurred
+   */
+  public static final int EVENT_INSTANCE = 4;
+  
+  /**
+   * The field acted on by an event
+   */
+  public static final int EVENT_FIELD = 5;
+
+  /**
+   * The class of the exception for ExceptionEvent
+   */
+  public static final int EVENT_EXCEPTION_CLASS = 6;
+
+  /**
+   * Whether this exception was caught (only valid for ExceptionEvents)
+   */
+  public static final int EVENT_EXCEPTION_CAUGHT = 7;
+  
   // The kind of event represented by this event
   private byte _eventKind;
 
@@ -97,7 +132,7 @@
    * @returns the parameter (not the ID) or <code>null</code> if none is
    *          is defined for this event
    */
-  public abstract Object getParameter (Class type);
+  public abstract Object getParameter (int type);
 
   /**
    * Converts this event into to a JDWP packet

Index: gnu/classpath/jdwp/event/BreakpointEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/BreakpointEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/classpath/jdwp/event/BreakpointEvent.java	15 Mar 2006 22:55:54 -0000	1.1
+++ gnu/classpath/jdwp/event/BreakpointEvent.java	12 Jun 2006 19:43:26 -0000	1.2
@@ -83,11 +83,11 @@
    * @param type  the type of parameter desired
    * @returns the desired parameter or null
    */
-  public Object getParameter(Class type)
+  public Object getParameter(int type)
   {
-    if (type == ThreadId.class)
+    if (type == EVENT_THREAD)
       return _thread;
-    else if (type == Location.class)
+    else if (type == EVENT_LOCATION)
       return _location;
 
     return null;

Index: gnu/classpath/jdwp/event/ClassPrepareEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/ClassPrepareEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/classpath/jdwp/event/ClassPrepareEvent.java	30 Aug 2005 00:51:10 -0000	1.1
+++ gnu/classpath/jdwp/event/ClassPrepareEvent.java	12 Jun 2006 19:43:26 -0000	1.2
@@ -116,11 +116,11 @@
    * @param type  the type of parameter desired
    * @returns the desired parameter or <code>null</code>
    */
-  public Object getParameter (Class type)
+  public Object getParameter (int type)
   {
-    if (type == ThreadId.class)
+    if (type == EVENT_THREAD)
       return _thread;
-    else if (type == ReferenceTypeId.class)
+    else if (type == EVENT_CLASS)
       return _class;
 
     return null;

Index: gnu/classpath/jdwp/event/ThreadEndEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/ThreadEndEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/classpath/jdwp/event/ThreadEndEvent.java	30 Aug 2005 00:51:10 -0000	1.1
+++ gnu/classpath/jdwp/event/ThreadEndEvent.java	12 Jun 2006 19:43:26 -0000	1.2
@@ -81,9 +81,9 @@
    * @param type  the type of parameter desired
    * @returns the desired parameter or <code>null</code>
    */
-  public Object getParameter (Class type)
+  public Object getParameter (int type)
   {
-    if (type == ThreadId.class)
+    if (type == EVENT_THREAD)
       return _thread;
 
     return null;

Index: gnu/classpath/jdwp/event/ThreadStartEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/ThreadStartEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/classpath/jdwp/event/ThreadStartEvent.java	9 Mar 2006 23:18:29 -0000	1.2
+++ gnu/classpath/jdwp/event/ThreadStartEvent.java	12 Jun 2006 19:43:26 -0000	1.3
@@ -86,9 +86,9 @@
    * @param type  the type of parameter desired
    * @returns the desired parameter or <code>null</code>
    */
-  public Object getParameter (Class type)
+  public Object getParameter (int type)
   {
-    if (type == ThreadId.class)
+    if (type == EVENT_THREAD)
       return _thread;
 
     return null;

Index: gnu/classpath/jdwp/event/VmDeathEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/VmDeathEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/classpath/jdwp/event/VmDeathEvent.java	9 Mar 2006 23:18:29 -0000	1.2
+++ gnu/classpath/jdwp/event/VmDeathEvent.java	12 Jun 2006 19:43:26 -0000	1.3
@@ -67,7 +67,7 @@
    * @param type  the type of parameter desired
    * @returns the desired parameter or <code>null</code>
    */
-  public Object getParameter (Class type)
+  public Object getParameter (int type)
   {
     return null;
   }

Index: gnu/classpath/jdwp/event/VmInitEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/VmInitEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/classpath/jdwp/event/VmInitEvent.java	30 Aug 2005 00:51:10 -0000	1.1
+++ gnu/classpath/jdwp/event/VmInitEvent.java	12 Jun 2006 19:43:26 -0000	1.2
@@ -76,7 +76,7 @@
    * @param type  the type of parameter desired
    * @returns the desired parameter or <code>null</code>
    */
-  public Object getParameter (Class type)
+  public Object getParameter (int type)
   {
     return null;
   }

Index: gnu/classpath/jdwp/event/filters/ClassMatchFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/classpath/jdwp/event/filters/ClassMatchFilter.java	9 Mar 2006 19:49:59 -0000	1.3
+++ gnu/classpath/jdwp/event/filters/ClassMatchFilter.java	12 Jun 2006 19:43:26 -0000	1.4
@@ -41,7 +41,6 @@
 
 import gnu.classpath.jdwp.event.Event;
 import gnu.classpath.jdwp.exception.InvalidStringException;
-import gnu.classpath.jdwp.id.ReferenceTypeId;
 
 /**
  * An event filter which includes events matching a 
@@ -91,7 +90,7 @@
    */
   public boolean matches (Event event)
   {
-    Object type = event.getParameter (ReferenceTypeId.class);
+    Object type = event.getParameter (Event.EVENT_CLASS);
     if (type != null)
       {
 	Class eventClass = (Class) type;

Index: gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java	26 Aug 2005 21:52:28 -0000	1.1
+++ gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java	12 Jun 2006 19:43:26 -0000	1.2
@@ -87,7 +87,7 @@
    */
   public boolean matches (Event event)
   {
-    Object type = event.getParameter (ReferenceTypeId.class);
+    Object type = event.getParameter (Event.EVENT_CLASS);
     if (type != null)
       {
 	try

Index: gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java	26 Aug 2005 21:52:28 -0000	1.1
+++ gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java	12 Jun 2006 19:43:26 -0000	1.2
@@ -89,7 +89,7 @@
    */
   public boolean matches (Event event)
   {
-    Object eventInstance = event.getParameter (ObjectId.class);
+    Object eventInstance = event.getParameter (Event.EVENT_INSTANCE);
     if (eventInstance != null)
       {
 	Object myInstance = _instance.getReference().get ();

Index: gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java	9 Mar 2006 19:49:59 -0000	1.3
+++ gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java	12 Jun 2006 19:43:26 -0000	1.4
@@ -88,7 +88,7 @@
    */
   public boolean matches (Event event)
   {
-    Object thread = event.getParameter (ThreadId.class);
+    Object thread = event.getParameter (Event.EVENT_THREAD);
     if (thread != null)
       {
 	Thread eventThread = (Thread) thread;



From MAILER-DAEMON Mon Jun 12 15:59:48 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpsZg-0007hY-LQ
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 15:59:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpsZf-0007hN-16
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 15:59:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpsZe-0007hB-Fy
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 15:59:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpsZe-0007h6-8d
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 15:59:46 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FpsiR-0004sO-1s
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 16:08:51 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpsZd-0003Ns-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 15:59:45 -0400
Received: from keiths by savannah.gnu.org with local (Exim 4.50)
	id 1FpsZc-0003Nl-3P
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 19:59:45 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpsZc-0003Nl-3P@savannah.gnu.org>
From: Keith Seitz <keiths@redhat.com>
Date: Mon, 12 Jun 2006 19:59:44 +0000
Subject: [commit-cp] classpath ChangeLog gnu/classpath/jdwp/event/Ex...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 19:59:47 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Keith Seitz <keiths>	06/06/12 19:59:43

Modified files:
	.              : ChangeLog 
Added files:
	gnu/classpath/jdwp/event: ExceptionEvent.java 

Log message:
	        From Kyle Galloway  <kgallowa@redhat.com>:
	        * gnu/classpath/jdwp/event/ExceptionEvent.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7785&r2=1.7786
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/ExceptionEvent.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7785
retrieving revision 1.7786
diff -u -b -r1.7785 -r1.7786
--- ChangeLog	12 Jun 2006 19:43:25 -0000	1.7785
+++ ChangeLog	12 Jun 2006 19:59:43 -0000	1.7786
@@ -1,6 +1,11 @@
 2006-06-12  Keith Seitz  <keiths@redhat.com>
 
 	From Kyle Galloway  <kgallowa@redhat.com>:
+	* gnu/classpath/jdwp/event/ExceptionEvent.java: New file.
+
+2006-06-12  Keith Seitz  <keiths@redhat.com>
+
+	From Kyle Galloway  <kgallowa@redhat.com>:
 	* gnu/classpath/jdwp/event/Event.java: Added constants for
 	type.
 	(getParameter): Changed parameter type from Class to int.

Index: gnu/classpath/jdwp/event/ExceptionEvent.java
===================================================================
RCS file: gnu/classpath/jdwp/event/ExceptionEvent.java
diff -N gnu/classpath/jdwp/event/ExceptionEvent.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/jdwp/event/ExceptionEvent.java	12 Jun 2006 19:59:43 -0000	1.1
@@ -0,0 +1,143 @@
+/* ExceptionEvent.java -- an event specifying an exception has been thrown
+ Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library.  Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module.  An independent module is a module which is not derived from
+ or based on this library.  If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so.  If you do not wish to do so, delete this
+ exception statement from your version. */
+
+
+package gnu.classpath.jdwp.event;
+
+import gnu.classpath.jdwp.JdwpConstants;
+import gnu.classpath.jdwp.VMIdManager;
+import gnu.classpath.jdwp.id.ObjectId;
+import gnu.classpath.jdwp.id.ThreadId;
+import gnu.classpath.jdwp.util.Location;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * Notification from the VM that an exception has occurred along with where it
+ * occurred, and if and where it was caught.
+ * 
+ * @author Kyle Galloway (kgallowa@redhat.com)
+ */
+public class ExceptionEvent
+    extends Event
+{
+  //object instance
+  private Object _instance;
+  
+  // the exception thrown
+  private Throwable _exception;
+
+  // the thread in which the exception occurred
+  private Thread _thread;
+
+  // the location where the exception was thrown
+  private Location _location;
+  
+  //the location where the exception was caught
+  private Location _catchLocation;
+
+  /**
+   * Constructs a new <code>ExceptionEvent</code> where the exception was
+   * caught.
+   * 
+   * @param exception the throwable object that generated the event
+   * @param thread the thread where the exception occurred
+   * @param location the location where the exception was thrown
+   * @param catchLocation the location where the exception was caught
+   */
+  public ExceptionEvent(Throwable exception, Thread thread, Location location,
+                        Location catchLocation, Object instance)
+  {
+    super(JdwpConstants.EventKind.EXCEPTION);
+    _exception = exception;
+    _thread = thread;
+    _location = location;
+    _catchLocation = catchLocation;
+    _instance = instance;
+  }
+
+  /**
+   * Returns a specific filtering parameter for this event. Valid types are
+   * thread, location, and catchLocation.
+   * 
+   * @param type the type of parameter desired
+   * @returns the desired parameter or null
+   */
+  public Object getParameter(int type)
+  {
+    if (type == EVENT_THREAD)
+      return _thread;
+    else if (type == EVENT_LOCATION)
+      return _location;
+    else if (type == EVENT_INSTANCE)
+      return _instance;
+    else if (type == EVENT_CLASS)
+      return _instance.getClass();
+    else if (type == EVENT_EXCEPTION_CLASS)
+      return _exception.getClass();
+    else if (type == EVENT_EXCEPTION_CAUGHT)
+      if (_catchLocation != null)
+        return new Boolean(true);
+      else
+        return new Boolean(false);
+
+    return null;
+  }
+
+  /**
+   * Writes the event to the given stream
+   * 
+   * @param outStream the output stream to write the event to
+   * @throws IOException
+   */
+  protected void _writeData(DataOutputStream outStream) 
+    throws IOException
+  {
+    VMIdManager idm = VMIdManager.getDefault();
+    ThreadId tid = (ThreadId) idm.getObjectId(_thread);
+    ObjectId oid = idm.getObjectId(_exception);
+
+    tid.write(outStream);
+    _location.write(outStream);
+    oid.writeTagged(outStream);
+    if(_catchLocation != null)
+      _catchLocation.write(outStream);
+    else
+      outStream.write(0);
+  }
+}



From MAILER-DAEMON Mon Jun 12 16:39:22 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FptBy-0005M5-QO
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 16:39:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FptBw-0005L7-LP
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 16:39:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FptBv-0005Kv-8L
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 16:39:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FptBu-0005Ks-Vp
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 16:39:19 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FptKi-0007cX-AE
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 16:48:24 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FptBu-0005Bk-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 16:39:18 -0400
Received: from keiths by savannah.gnu.org with local (Exim 4.50)
	id 1FptBt-0005Bh-Ba
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 20:39:17 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FptBt-0005Bh-Ba@savannah.gnu.org>
From: Keith Seitz <keiths@redhat.com>
Date: Mon, 12 Jun 2006 20:39:17 +0000
Subject: [commit-cp] classpath ChangeLog gnu/classpath/jdwp/event/fi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 20:39:21 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Keith Seitz <keiths>	06/06/12 20:39:16

Modified files:
	.              : ChangeLog 
	gnu/classpath/jdwp/event/filters: ExceptionOnlyFilter.java 

Log message:
	        From Kyle Galloway  <kgallowa@redhat.com>:
	        * gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
	        (forCaught): Removed unused/unnecessary method.
	        (forUncaught): Likewise.
	        (matches): Implement.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7786&r2=1.7787
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java?cvsroot=classpath&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7786
retrieving revision 1.7787
diff -u -b -r1.7786 -r1.7787
--- ChangeLog	12 Jun 2006 19:59:43 -0000	1.7786
+++ ChangeLog	12 Jun 2006 20:39:15 -0000	1.7787
@@ -1,6 +1,14 @@
 2006-06-12  Keith Seitz  <keiths@redhat.com>
 
 	From Kyle Galloway  <kgallowa@redhat.com>:
+	* gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
+	(forCaught): Removed unused/unnecessary method.
+	(forUncaught): Likewise.
+	(matches): Implement.
+
+2006-06-12  Keith Seitz  <keiths@redhat.com>
+
+	From Kyle Galloway  <kgallowa@redhat.com>:
 	* gnu/classpath/jdwp/event/ExceptionEvent.java: New file.
 
 2006-06-12  Keith Seitz  <keiths@redhat.com>

Index: gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java	9 Mar 2006 23:18:29 -0000	1.2
+++ gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java	12 Jun 2006 20:39:16 -0000	1.3
@@ -1,5 +1,5 @@
-/* ExceptionOnlyFilter.java -- 
-   Copyright (C) 2005 Free Software Foundation
+/* ExceptionOnlyFilter.java -- filter for excetions by caught/uncaught and type
+   Copyright (C) 2005, 2006 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -88,34 +88,29 @@
     return _refId;
   }
 
+  
   /**
-   * Report caught exceptions?
+   * Does the given event match the filter?
    *
-   * @return whether to report caught exceptions
+   * @param event  the <code>Event</code> to scrutinize
    */
-  public boolean forCaught ()
+  public boolean matches(Event event)
   {
-    return _caught;
-  }
+    boolean classMatch;
 
-  /**
-   * Report uncaught exceptions?
-   *
-   * @return whether to report uncaught exceptions
-   */
-  public boolean forUncaught ()
+    try
   {
-    return _uncaught;
+	Class klass = (Class) event.getParameter(Event.EVENT_EXCEPTION_CLASS);
+        classMatch = klass == _refId.getType();
   }
-
-  /**
-   * Does the given event match the filter?
-   *
-   * @param event  the <code>Event</code> to scrutinize
-   */
-  public boolean matches (Event event)
+    catch (InvalidClassException ex)
   {
-    // FIXME
-    throw new RuntimeException ("ExceptionOnlyFilter.matches not implemented");
+        classMatch = false;
+      }
+    
+    Boolean caught
+      = (Boolean) event.getParameter(Event.EVENT_EXCEPTION_CAUGHT);
+
+    return classMatch && (caught.booleanValue()) ? _caught : _uncaught;
   }
 }



From MAILER-DAEMON Mon Jun 12 17:10:19 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fptfu-00066s-Nh
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 17:10:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fptfs-00066O-Lb
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:10:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fptfr-00065r-3Q
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:10:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fptfq-00065i-VO
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:10:14 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fptoe-0001cD-Hd
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:19:20 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fptfp-0005b5-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 17:10:13 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fptfo-0005b2-0x
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 21:10:13 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fptfo-0005b2-0x@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Mon, 12 Jun 2006 21:10:12 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Cairo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 21:10:17 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/12 21:10:11

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 
	                       CairoSurfaceGraphics.java 
	                       ComponentGraphics.java 
	                       VolatileImageGraphics.java 

Log message:
	2006-06-12  Roman Kennke  <kennke@aicas.com>
	
		* gnu/java/awt/peer/gtk/CairoGraphics2D.java
		(copy): Use getClip() to copy the clip. Make copied transform
		null when original transform is null. Set clip here.
		(setTransform): Correctly update the clip.
		(setTransformImpl): New method. Updates the actual transform for
		Cairo.
		(transform): Correctly update the clip.
		(translate): Correctly update the clip.
		(clip): Handle null clip and argument correctly.
		(clipRect): Avoid creating new Rectangle objects.
		(getClip): Get the correct copy of the clip.
		(setClip): Correctly handle null argument.
		* gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java
		(CairoSurfaceGraphics): Don't set the clip here. The clip can either
		be null or whatever has been set in copy().
		* gnu/java/awt/peer/gtk/ComponentGraphics.java
		(drawImage): Add translation to the image coordinates.
		* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
		(VolatileImageGraphics): Don't set clip here. The clip can either
		be null or whatever has been set in copy().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7787&r2=1.7788
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java?cvsroot=classpath&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java?cvsroot=classpath&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7787
retrieving revision 1.7788
diff -u -b -r1.7787 -r1.7788
--- ChangeLog	12 Jun 2006 20:39:15 -0000	1.7787
+++ ChangeLog	12 Jun 2006 21:10:10 -0000	1.7788
@@ -1,3 +1,26 @@
+2006-06-12  Roman Kennke  <kennke@aicas.com>
+
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
+	(copy): Use getClip() to copy the clip. Make copied transform
+	null when original transform is null. Set clip here.
+	(setTransform): Correctly update the clip.
+	(setTransformImpl): New method. Updates the actual transform for
+	Cairo.
+	(transform): Correctly update the clip.
+	(translate): Correctly update the clip.
+	(clip): Handle null clip and argument correctly.
+	(clipRect): Avoid creating new Rectangle objects.
+	(getClip): Get the correct copy of the clip.
+	(setClip): Correctly handle null argument.
+	* gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java
+	(CairoSurfaceGraphics): Don't set the clip here. The clip can either
+	be null or whatever has been set in copy().
+	* gnu/java/awt/peer/gtk/ComponentGraphics.java
+	(drawImage): Add translation to the image coordinates.
+	* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
+	(VolatileImageGraphics): Don't set clip here. The clip can either
+	be null or whatever has been set in copy().
+
 2006-06-12  Keith Seitz  <keiths@redhat.com>
 
 	From Kyle Galloway  <kgallowa@redhat.com>:

Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java	12 Jun 2006 10:32:44 -0000	1.20
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java	12 Jun 2006 21:10:11 -0000	1.21
@@ -238,13 +238,10 @@
           bg = new Color(g.bg.getRGB());
       }
 
-    if (g.clip == null)
-      clip = null;
-    else
-      clip = new Rectangle(g.getClipBounds());
+    clip = g.getClip();
 
     if (g.transform == null)
-      transform = new AffineTransform();
+      transform = null;
     else
       transform = new AffineTransform(g.transform);
 
@@ -254,7 +251,8 @@
     setBackground(bg);
     setPaint(paint);
     setStroke(stroke);
-    setTransform(transform);
+    setTransformImpl(transform);
+    setClip(clip);
   }
 
   /**
@@ -435,6 +433,29 @@
    */ 
   public void setTransform(AffineTransform tx)
   {
+    // Transform clip into target space using the old transform.
+    updateClip(transform);
+
+    // Update the native transform.
+    setTransformImpl(tx);
+
+    // Transform the clip back into user space using the inverse new transform.
+    try
+      {
+        updateClip(transform.createInverse());
+      }
+    catch (NoninvertibleTransformException ex)
+      {
+        // TODO: How can we deal properly with this?
+        ex.printStackTrace();
+      }
+
+    if (clip != null)
+      setClip(clip);
+  }
+
+  private void setTransformImpl(AffineTransform tx)
+  {
     transform = tx;
     if (transform != null)
       {
@@ -450,28 +471,22 @@
       transform = new AffineTransform(tx);
     else
       transform.concatenate(tx);
-    setTransform(transform);
+
     if (clip != null)
       {
-	// FIXME: this should actuall try to transform the shape
-	// rather than degrade to bounds.
-	Rectangle2D r = clip.getBounds2D();
-	double[] coords = new double[]
-	  {
-	    r.getX(), r.getY(), r.getX() + r.getWidth(),
-	    r.getY() + r.getHeight()
-	  };
 	try
 	  {
-	    tx.createInverse().transform(coords, 0, coords, 0, 2);
-	    r.setRect(coords[0], coords[1], coords[2] - coords[0],
-	              coords[3] - coords[1]);
-	    clip = r;
+            AffineTransform clipTransform = tx.createInverse();
+            updateClip(clipTransform);
 	  }
-	catch (java.awt.geom.NoninvertibleTransformException e)
+        catch (NoninvertibleTransformException ex)
 	  {
+            // TODO: How can we deal properly with this?
+            ex.printStackTrace();
 	  }
       }
+
+    setTransformImpl(transform);
   }
 
   public void rotate(double theta)
@@ -504,18 +519,21 @@
       {
         // FIXME: this should actuall try to transform the shape
         // rather than degrade to bounds.
-        Rectangle2D r;
-
         if (clip instanceof Rectangle2D)
-          r = (Rectangle2D) clip;
+          {
+            Rectangle2D r = (Rectangle2D) clip;
+            r.setRect(r.getX() - tx, r.getY() - ty, r.getWidth(),
+                      r.getHeight());
+          }
         else
-          r = clip.getBounds2D();
-
-        r.setRect(r.getX() - tx, r.getY() - ty, r.getWidth(), r.getHeight());
-        clip = r;
+          {
+            AffineTransform clipTransform =
+              AffineTransform.getTranslateInstance(-tx, -ty);
+            updateClip(clipTransform);
+          }
       }
 
-    setTransform(transform);
+    setTransformImpl(transform);
   }
   
   public void translate(int x, int y)
@@ -534,11 +552,20 @@
   {
     // Do not touch clip when s == null.
     if (s == null)
+      {
+        // The spec says this should clear the clip. The reference
+        // implementation throws a NullPointerException instead. I think,
+        // in this case we should conform to the specs, as it shouldn't
+        // affect compatibility.
+        setClip(null);
       return;
+      }
 
     // If the current clip is still null, initialize it.
     if (clip == null)
-      clip = originalClip;
+      {
+        clip = getRealBounds();
+      }
     
     // This is so common, let's optimize this. 
     if (clip instanceof Rectangle2D && s instanceof Rectangle2D)
@@ -546,7 +573,6 @@
         Rectangle2D clipRect = (Rectangle2D) clip;
         Rectangle2D r = (Rectangle2D) s;
         Rectangle2D.intersect(clipRect, r, clipRect);
-        // Call setClip so that subclasses get notified.
         setClip(clipRect);
       }
    else
@@ -691,6 +717,14 @@
 
   public void clipRect(int x, int y, int width, int height)
   {
+    if (clip == null)
+      setClip(new Rectangle(x, y, width, height));
+    else if (clip instanceof Rectangle)
+      {
+        computeIntersection(x, y, width, height, (Rectangle) clip);
+        setClip(clip);
+      }
+    else
     clip(new Rectangle(x, y, width, height));
   }
 
@@ -698,8 +732,15 @@
   {
     if (clip == null)
       return null;
-    else
+    else if (clip instanceof Rectangle2D)
       return clip.getBounds2D(); //getClipInDevSpace();
+    else
+      {
+        GeneralPath p = new GeneralPath();
+        PathIterator pi = clip.getPathIterator(new AffineTransform());
+        p.append(pi, false);
+        return p;
+      }
   }
 
   public Rectangle getClipBounds()
@@ -750,12 +791,11 @@
 	firstClip = false;
       }
 
-    if (s == null)
-      clip = originalClip;
-    else
       clip = s;
     cairoResetClip(nativePointer);
 
+    if (clip != null)
+      {
     cairoNewPath(nativePointer);
     if (clip instanceof Rectangle2D)
       {
@@ -768,6 +808,7 @@
     
     cairoClip(nativePointer);
   }
+  }
 
   public void setBackground(Color c)
   {
@@ -1626,4 +1667,47 @@
 
     return db.getData();
   }
+
+  /**
+   * Helper method to transform the clip. This is called by the various
+   * transformation-manipulation methods to update the clip (which is in
+   * userspace) accordingly.
+   *
+   * The transform usually is the inverse transform that was applied to the
+   * graphics object.
+   *
+   * @param t the transform to apply to the clip
+   */
+  private void updateClip(AffineTransform t)
+  {
+    if (clip == null)
+      return;
+
+    if (! (clip instanceof GeneralPath))
+      clip = new GeneralPath(clip);
+
+    GeneralPath p = (GeneralPath) clip;
+    p.transform(t);
+  }
+
+  private static Rectangle computeIntersection(int x, int y, int w, int h,
+                                               Rectangle rect)
+  {
+    int x2 = (int) rect.x;
+    int y2 = (int) rect.y;
+    int w2 = (int) rect.width;
+    int h2 = (int) rect.height;
+
+    int dx = (x > x2) ? x : x2;
+    int dy = (y > y2) ? y : y2;
+    int dw = (x + w < x2 + w2) ? (x + w - dx) : (x2 + w2 - dx);
+    int dh = (y + h < y2 + h2) ? (y + h - dy) : (y2 + h2 - dy);
+
+    if (dw >= 0 && dh >= 0)
+      rect.setBounds(dx, dy, dw, dh);
+    else
+      rect.setBounds(0, 0, 0, 0);
+
+    return rect;
+  }
 }

Index: gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java	10 Jun 2006 10:33:18 -0000	1.5
+++ gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java	12 Jun 2006 21:10:11 -0000	1.6
@@ -64,7 +64,6 @@
     this.surface = surface;
     cairo_t = surface.newCairoContext();
     setup( cairo_t );
-    setClip(0, 0, surface.width, surface.height);
   }
 
   /**
@@ -76,7 +75,6 @@
     surface = copyFrom.surface;
     cairo_t = surface.newCairoContext();
     copy( copyFrom, cairo_t );
-    setClip(0, 0, surface.width, surface.height);
   }
   
   public Graphics create()

Index: gnu/java/awt/peer/gtk/ComponentGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gnu/java/awt/peer/gtk/ComponentGraphics.java	12 Jun 2006 12:25:03 -0000	1.14
+++ gnu/java/awt/peer/gtk/ComponentGraphics.java	12 Jun 2006 21:10:11 -0000	1.15
@@ -277,11 +277,14 @@
   
   public boolean drawImage(Image img, int x, int y, ImageObserver observer)
   {
-    if( img instanceof GtkVolatileImage )
+    if (img instanceof GtkVolatileImage
+        && transform.getType() == AffineTransform.TYPE_TRANSLATION)
       {
+        x += transform.getTranslateX();
+        y += transform.getTranslateY();
         GtkVolatileImage vimg = (GtkVolatileImage) img;
 	drawVolatile( component, vimg.nativePointer,
-                      x, y - 20, vimg.width, vimg.height );
+                      x, y, vimg.width, vimg.height );
 	return true;
       }      
     return super.drawImage( img, x, y, observer );
@@ -290,10 +293,13 @@
   public boolean drawImage(Image img, int x, int y, int width, int height,
                            ImageObserver observer)
   {
-    if( img instanceof GtkVolatileImage )
+    if( img instanceof GtkVolatileImage
+        && transform.getType() == AffineTransform.TYPE_TRANSLATION)
       {
+        x += transform.getTranslateX();
+        y += transform.getTranslateY();
         GtkVolatileImage vimg = (GtkVolatileImage) img;
-	drawVolatile( component, vimg.nativePointer, x, y - 20, 
+	drawVolatile( component, vimg.nativePointer, x, y, 
 		      width, height );
 	return true;
       }      

Index: gnu/java/awt/peer/gtk/VolatileImageGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/java/awt/peer/gtk/VolatileImageGraphics.java	10 Jun 2006 14:06:23 -0000	1.4
+++ gnu/java/awt/peer/gtk/VolatileImageGraphics.java	12 Jun 2006 21:10:11 -0000	1.5
@@ -67,7 +67,6 @@
     this.owner = img;
     cairo_t = initFromVolatile( owner.nativePointer, img.width, img.height );
     setup( cairo_t );
-    setClip( new Rectangle( 0, 0, img.width, img.height) );
   }
 
   private VolatileImageGraphics(VolatileImageGraphics copy)
@@ -75,7 +74,6 @@
     this.owner = copy.owner;
     cairo_t = initFromVolatile(owner.nativePointer, owner.width, owner.height);
     copy( copy, cairo_t );
-    clipRect(0, 0, owner.width, owner.height);
   }
 
   public void copyAreaImpl(int x, int y, int width, int height, int dx, int dy)



From MAILER-DAEMON Mon Jun 12 17:14:52 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FptkK-00005A-Ln
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 17:14:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FptkJ-00004x-Jo
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:14:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FptkJ-0008WQ-2d
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:14:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FptkI-0008WN-TM
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:14:50 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fptt6-0001v5-N2
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:23:56 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FptkI-0005el-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 17:14:50 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FptkH-0005ei-0e
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 21:14:50 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FptkH-0005ei-0e@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Mon, 12 Jun 2006 21:14:49 +0000
Subject: [commit-cp] classpath/javax/swing JComponent.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 21:14:52 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/12 21:14:48

Modified files:
	javax/swing    : JComponent.java 
	.              : ChangeLog 

Log message:
	2006-06-12  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/JComponent.java
		(paintDoubleBuffered): Correctly translate and clip the Graphics
		instance.
		(clipAndTranslateGraphics): New helper method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7788&r2=1.7789

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7788
retrieving revision 1.7789
diff -u -b -r1.7788 -r1.7789
--- ChangeLog	12 Jun 2006 21:10:10 -0000	1.7788
+++ ChangeLog	12 Jun 2006 21:14:48 -0000	1.7789
@@ -1,5 +1,12 @@
 2006-06-12  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/JComponent.java
+	(paintDoubleBuffered): Correctly translate and clip the Graphics
+	instance.
+	(clipAndTranslateGraphics): New helper method.
+
+2006-06-12  Roman Kennke  <kennke@aicas.com>
+
 	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
 	(copy): Use getClip() to copy the clip. Make copied transform
 	null when original transform is null. Set clip here.



From MAILER-DAEMON Mon Jun 12 17:25:20 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FptuS-0003f6-Ls
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 17:25:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FptuQ-0003er-Vr
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:25:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FptuP-0003ef-C3
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:25:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FptuP-0003ec-69
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:25:17 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fpu3C-0002f6-Se
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:34:23 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FptuO-0005p3-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 17:25:16 -0400
Received: from keiths by savannah.gnu.org with local (Exim 4.50)
	id 1FptuM-0005ox-WA
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 21:25:16 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FptuM-0005ox-WA@savannah.gnu.org>
From: Keith Seitz <keiths@redhat.com>
Date: Mon, 12 Jun 2006 21:25:14 +0000
Subject: [commit-cp] classpath ChangeLog gnu/classpath/jdwp/event/Me...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 21:25:19 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Keith Seitz <keiths>	06/06/12 21:25:14

Modified files:
	.              : ChangeLog 
Added files:
	gnu/classpath/jdwp/event: MethodEntryEvent.java 
	                          MethodExitEvent.java 

Log message:
	        From Kyle Galloway  <kgallowa@redhat.com>:
	        * gnu/classpath/jdwp/event/MethodEntryEvent.java: New file.
	
	        * gnu/classpath/jdwp/event/MethodExitEvent.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7789&r2=1.7790
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/MethodEntryEvent.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/MethodExitEvent.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7789
retrieving revision 1.7790
diff -u -b -r1.7789 -r1.7790
--- ChangeLog	12 Jun 2006 21:14:48 -0000	1.7789
+++ ChangeLog	12 Jun 2006 21:25:14 -0000	1.7790
@@ -1,3 +1,10 @@
+2006-06-12  Keith Seitz  <keiths@redhat.com>
+
+	From Kyle Galloway  <kgallowa@redhat.com>:
+	* gnu/classpath/jdwp/event/MethodEntryEvent.java: New file.
+
+	* gnu/classpath/jdwp/event/MethodExitEvent.java: New file.
+
 2006-06-12  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/JComponent.java

Index: gnu/classpath/jdwp/event/MethodEntryEvent.java
===================================================================
RCS file: gnu/classpath/jdwp/event/MethodEntryEvent.java
diff -N gnu/classpath/jdwp/event/MethodEntryEvent.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/jdwp/event/MethodEntryEvent.java	12 Jun 2006 21:25:14 -0000	1.1
@@ -0,0 +1,117 @@
+/* MethodEntryEvent.java -- an event specifying that a method has been invoked
+ Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library.  Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module.  An independent module is a module which is not derived from
+ or based on this library.  If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so.  If you do not wish to do so, delete this
+ exception statement from your version. */
+
+
+package gnu.classpath.jdwp.event;
+
+import gnu.classpath.jdwp.JdwpConstants;
+import gnu.classpath.jdwp.VMIdManager;
+import gnu.classpath.jdwp.id.ThreadId;
+import gnu.classpath.jdwp.util.Location;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * Notification from the VM that that a method has been invoked
+ * 
+ * @author Kyle Galloway (kgallowa@redhat.com)
+ */
+public class MethodEntryEvent
+    extends Event
+{
+  // The thread where the event occurred
+  private Thread _thread;
+
+  // the location where the event occurred
+  private Location _location;
+
+  //object instance
+  private Object _instance;
+
+  /**
+   * Constructs a new <code>MethodEntryEvent</code>
+   * 
+   * @param thread the thread where the exception occurred
+   * @param location the location single stepped to
+   */
+  public MethodEntryEvent(Thread thread, Location location, Object instance)
+  {
+    super(JdwpConstants.EventKind.METHOD_ENTRY);
+    _thread = thread;
+    _location = location;
+    _instance = instance;
+  }
+
+  /**
+   * Returns a specific filtering parameter for this event. Valid types are
+   * thread and location
+   * 
+   * @param type the type of parameter desired
+   * @returns the desired parameter or null
+   */
+  public Object getParameter(int type)
+  {
+    if (type == EVENT_THREAD)
+      return _thread;
+    else if (type == EVENT_LOCATION)
+      return _location;
+    else if (type == EVENT_INSTANCE)
+      return _instance;
+    else if (type == EVENT_CLASS)
+      return _instance.getClass();
+
+    return null;
+  }
+
+  /**
+   * Writes the event to the given stream
+   * 
+   * @param outStream the output stream to write the event to
+   * @throws IOException
+   */
+  protected void _writeData(DataOutputStream outStream) 
+    throws IOException
+  {
+    VMIdManager idm = VMIdManager.getDefault();
+    ThreadId tid = (ThreadId) idm.getObjectId(_thread);
+
+    tid.write(outStream);
+    _location.write(outStream);
+  }
+
+}

Index: gnu/classpath/jdwp/event/MethodExitEvent.java
===================================================================
RCS file: gnu/classpath/jdwp/event/MethodExitEvent.java
diff -N gnu/classpath/jdwp/event/MethodExitEvent.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/jdwp/event/MethodExitEvent.java	12 Jun 2006 21:25:14 -0000	1.1
@@ -0,0 +1,114 @@
+/* MethodExitEvent.java -- an event specifying that a method has returned
+ Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library.  Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module.  An independent module is a module which is not derived from
+ or based on this library.  If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so.  If you do not wish to do so, delete this
+ exception statement from your version. */
+
+
+package gnu.classpath.jdwp.event;
+
+import gnu.classpath.jdwp.JdwpConstants;
+import gnu.classpath.jdwp.VMIdManager;
+import gnu.classpath.jdwp.id.ThreadId;
+import gnu.classpath.jdwp.util.Location;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * Notification from the VM that that a method has returned
+ * 
+ * @author Kyle Galloway (kgallowa@redhat.com)
+ */
+public class MethodExitEvent
+    extends Event
+{
+  // The thread where the event occurred
+  private Thread _thread;
+
+  // the location where the event occurred
+  private Location _location;
+
+  // object instance
+  private Object _instance;
+
+  /**
+   * Constructs a new <code>MethodExitEvent</code>
+   * 
+   * @param thread the thread where the exception occurred
+   * @param location the location single stepped to
+   */
+  public MethodExitEvent(Thread thread, Location location, Object instance)
+  {
+    super(JdwpConstants.EventKind.METHOD_EXIT);
+    _thread = thread;
+    _location = location;
+    _instance = instance;
+  }
+
+  /**
+   * Returns a specific filtering parameter for this event. Valid types are
+   * thread and location
+   * 
+   * @param type the type of parameter desired
+   * @returns the desired parameter or null
+   */
+  public Object getParameter(int type)
+  {
+    if (type == EVENT_THREAD)
+      return _thread;
+    else if (type == EVENT_LOCATION)
+      return _location;
+    else if (type == EVENT_CLASS)
+      return _instance.getClass();
+
+    return null;
+  }
+
+  /**
+   * Writes the event to the given stream
+   * 
+   * @param outStream the output stream to write the event to
+   * @throws IOException
+   */
+  protected void _writeData(DataOutputStream outStream) 
+    throws IOException
+  {
+    VMIdManager idm = VMIdManager.getDefault();
+    ThreadId tid = (ThreadId) idm.getObjectId(_thread);
+
+    tid.write(outStream);
+    _location.write(outStream);
+  }
+}



From MAILER-DAEMON Mon Jun 12 17:29:44 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fptyi-0004D8-4z
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 17:29:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fptyg-0004Cx-V1
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:29:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fptyf-0004C0-Nz
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:29:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fptyf-0004Bx-JE
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:29:41 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fpu7T-0002vh-BU
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 17:38:47 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fptye-0005sx-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 17:29:40 -0400
Received: from keiths by savannah.gnu.org with local (Exim 4.50)
	id 1Fptyd-0005ss-Fk
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 21:29:40 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fptyd-0005ss-Fk@savannah.gnu.org>
From: Keith Seitz <keiths@redhat.com>
Date: Mon, 12 Jun 2006 21:29:39 +0000
Subject: [commit-cp] classpath ChangeLog gnu/classpath/jdwp/event/Si...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2006 21:29:43 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Keith Seitz <keiths>	06/06/12 21:29:39

Modified files:
	.              : ChangeLog 
Added files:
	gnu/classpath/jdwp/event: SingleStepEvent.java 

Log message:
	        From Kyle Galloway  <kgallowa@redhat.com>:
	        * gnu/classpath/jdwp/event/SingleStepEvent.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7790&r2=1.7791
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/SingleStepEvent.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7790
retrieving revision 1.7791
diff -u -b -r1.7790 -r1.7791
--- ChangeLog	12 Jun 2006 21:25:14 -0000	1.7790
+++ ChangeLog	12 Jun 2006 21:29:38 -0000	1.7791
@@ -1,6 +1,11 @@
 2006-06-12  Keith Seitz  <keiths@redhat.com>
 
 	From Kyle Galloway  <kgallowa@redhat.com>:
+	* gnu/classpath/jdwp/event/SingleStepEvent.java: New file.
+
+2006-06-12  Keith Seitz  <keiths@redhat.com>
+
+	From Kyle Galloway  <kgallowa@redhat.com>:
 	* gnu/classpath/jdwp/event/MethodEntryEvent.java: New file.
 
 	* gnu/classpath/jdwp/event/MethodExitEvent.java: New file.

Index: gnu/classpath/jdwp/event/SingleStepEvent.java
===================================================================
RCS file: gnu/classpath/jdwp/event/SingleStepEvent.java
diff -N gnu/classpath/jdwp/event/SingleStepEvent.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/jdwp/event/SingleStepEvent.java	12 Jun 2006 21:29:39 -0000	1.1
@@ -0,0 +1,120 @@
+/* SingleStepEvent.java -- an event specifying that a single step has
+ compleated
+ Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library.  Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module.  An independent module is a module which is not derived from
+ or based on this library.  If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so.  If you do not wish to do so, delete this
+ exception statement from your version. */
+
+
+package gnu.classpath.jdwp.event;
+
+import gnu.classpath.jdwp.JdwpConstants;
+import gnu.classpath.jdwp.VMIdManager;
+import gnu.classpath.jdwp.id.ThreadId;
+import gnu.classpath.jdwp.util.Location;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+
+/**
+ * Notification from the VM that a single step has compleated including the
+ * thread and location stepped to
+ * 
+ * @author Kyle Galloway (kgallowa@redhat.com)
+ */
+public class SingleStepEvent
+    extends Event
+{
+  // the thread where the event occurred
+  private Thread _thread;
+
+  // the location where the event occurred
+  private Location _location;
+
+  //object instance
+  private Object _instance;
+
+  /**
+   * Constructs a new <code>SingleStepEvent</code>
+   * 
+   * @param thread the thread where the exception occurred
+   * @param location the location single stepped to
+   */
+  public SingleStepEvent(Thread thread, Location location, Object instance)
+  {
+    super(JdwpConstants.EventKind.SINGLE_STEP);
+    _thread = thread;
+    _location = location;
+    _instance = instance;
+  }
+
+  /**
+   * Returns a specific filtering parameter for this event. Valid types are
+   * thread and location
+   * 
+   * @param type the type of parameter desired
+   * @returns the desired parameter or null
+   */
+  public Object getParameter(int type)
+  {
+    if (type == EVENT_THREAD)
+      return _thread;
+    else if (type == EVENT_LOCATION)
+      return _location;
+    else if (type == EVENT_INSTANCE)
+      return _instance;
+    else if (type == EVENT_CLASS)
+      return _instance.getClass();
+
+    return null;
+  }
+
+  /**
+   * Writes the event to the given stream
+   * 
+   * @param outStream the output stream to write the event to
+   * @throws IOException
+   */
+  protected void _writeData(DataOutputStream outStream) 
+    throws IOException
+  {
+    VMIdManager idm = VMIdManager.getDefault();
+    ThreadId tid = (ThreadId) idm.getObjectId(_thread);
+
+    tid.write(outStream);
+    _location.write(outStream);
+  }
+
+}



From MAILER-DAEMON Mon Jun 12 20:14:34 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FpwYE-0001Bl-4q
	for mharc-commit-classpath@gnu.org; Mon, 12 Jun 2006 20:14:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FpwYC-0001BI-IQ
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 20:14:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FpwYC-0001B1-05
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 20:14:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FpwYB-0001Ay-NH
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 20:14:31 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fpwh1-0003wb-7Y
	for commit-classpath@gnu.org; Mon, 12 Jun 2006 20:23:39 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FpwY8-0003Fr-00
	for <commit-classpath@gnu.org>; Mon, 12 Jun 2006 20:14:28 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FpwY7-0003Fo-Cy
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 00:14:28 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FpwY7-0003Fo-Cy@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Tue, 13 Jun 2006 00:14:27 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/font/LineBreakMeas...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 00:14:33 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/13 00:14:27

Modified files:
	.              : ChangeLog 
	java/awt/font  : LineBreakMeasurer.java 

Log message:
	2006-06-12  Sven de Marothy  <sven@physto.se>
	
		* java/awt/font/LineBreakMeasurer.java): Implement.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7791&r2=1.7792
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/LineBreakMeasurer.java?cvsroot=classpath&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7791
retrieving revision 1.7792
diff -u -b -r1.7791 -r1.7792
--- ChangeLog	12 Jun 2006 21:29:38 -0000	1.7791
+++ ChangeLog	13 Jun 2006 00:14:26 -0000	1.7792
@@ -1,3 +1,7 @@
+2006-06-12  Sven de Marothy  <sven@physto.se>
+
+	* java/awt/font/LineBreakMeasurer.java): Implement.
+
 2006-06-12  Keith Seitz  <keiths@redhat.com>
 
 	From Kyle Galloway  <kgallowa@redhat.com>:

Index: java/awt/font/LineBreakMeasurer.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/font/LineBreakMeasurer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- java/awt/font/LineBreakMeasurer.java	22 Mar 2006 19:15:24 -0000	1.3
+++ java/awt/font/LineBreakMeasurer.java	13 Jun 2006 00:14:27 -0000	1.4
@@ -1,5 +1,5 @@
 /* LineBreakMeasurer.java
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,84 +38,161 @@
 
 package java.awt.font;
 
-import gnu.classpath.NotImplementedException;
-
 import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
 import java.text.BreakIterator;
+import java.awt.font.TextLayout;
+import java.awt.font.FontRenderContext;
+import java.awt.Shape;
 
 public final class LineBreakMeasurer
 {
-  private AttributedCharacterIterator ci;
+  private AttributedCharacterIterator text;
+  private int position;
   private FontRenderContext frc;
-  private BreakIterator bi;
+  private TextLayout totalLayout;
+  private int numChars;
 
-  /**
-   * Constructs a <code>LineBreakMeasurer</code> object.
-   */
-  public LineBreakMeasurer (AttributedCharacterIterator text,
-                            FontRenderContext frc)
+  public LineBreakMeasurer(AttributedCharacterIterator text, 
+			   BreakIterator breakIter, FontRenderContext frc)
   {
-    this (text, null, frc);
+    this.text = text;
+    this.frc = frc;
+    position = 0;
+    totalLayout = new TextLayout(text, frc);
+    numChars = totalLayout.getCharacterCount();
   }
 
-  /**
-   * Constructs a <code>LineBreakMeasurer</code> object.
-   */
-  public LineBreakMeasurer (AttributedCharacterIterator text,
-                            BreakIterator breakIter, FontRenderContext frc) 
+  public LineBreakMeasurer(AttributedCharacterIterator text, 
+			   FontRenderContext frc)
   {
-    this.ci = text;
-    this.bi = breakIter;
+    this.text = text;
     this.frc = frc;
+    position = 0;
+    totalLayout = new TextLayout(text, frc);
+    numChars = totalLayout.getCharacterCount();
   }
 
-  public void deleteChar (AttributedCharacterIterator newParagraph,
+  public void deleteChar(AttributedCharacterIterator newParagraph, 
                           int deletePos)
-    throws NotImplementedException
   {
-    throw new Error ("not implemented");
+    totalLayout = new TextLayout(newParagraph, frc);
+    if( deletePos < 0 || deletePos > totalLayout.getCharacterCount() )
+      throw new NullPointerException("Invalid deletePos:"+deletePos);
+    numChars = totalLayout.getCharacterCount();
+    text = newParagraph;
+    position = 0;
   }
 
-  public int getPosition ()
+  public void insertChar(AttributedCharacterIterator newParagraph, 
+			 int insertPos)
   {
-    return ci.getIndex ();
+    totalLayout = new TextLayout(newParagraph, frc);
+    if( insertPos < 0 || insertPos > totalLayout.getCharacterCount() )
+      throw new NullPointerException("Invalid insertPos:"+insertPos);
+    numChars = totalLayout.getCharacterCount();
+    text = newParagraph;
+    position = 0;
   }
 
-  public void insertChar (AttributedCharacterIterator newParagraph,
-                          int insertPos)
-    throws NotImplementedException
+  public TextLayout nextLayout(float wrappingWidth)
   {
-    throw new Error ("not implemented");
+    return nextLayout( wrappingWidth, numChars, false );
   }
 
-  public TextLayout nextLayout (float wrappingWidth)
-    throws NotImplementedException
+  public TextLayout nextLayout(float wrappingWidth, int offsetLimit, 
+			       boolean requireNextWord)
   {
-    throw new Error ("not implemented");
+    int next = nextOffset( wrappingWidth, offsetLimit, requireNextWord );
+    AttributedCharacterIterator aci = (new AttributedString( text, 
+							     position, next )
+				       ).getIterator();
+    position = next;
+    return new TextLayout( aci, frc );
   }
 
-  public TextLayout nextLayout (float wrappingWidth, int offsetLimit,
+  public int nextOffset(float wrappingWidth)
+  {
+    return nextOffset( wrappingWidth, numChars, false );
+  }
+
+  public int nextOffset(float wrappingWidth, int offsetLimit, 
                                 boolean requireNextWord)
-    throws NotImplementedException
   {
-    throw new Error ("not implemented");
+    Shape s = totalLayout.getBlackBoxBounds( position, offsetLimit );
+    double remainingLength = s.getBounds2D().getWidth();
+
+    int guessOffset = (int)( ( (double)wrappingWidth / (double)remainingLength)
+			     * ( (double)numChars - (double)position ) );
+    guessOffset += position;
+    if( guessOffset > offsetLimit )
+      guessOffset = offsetLimit;
+
+    s = totalLayout.getBlackBoxBounds( position, guessOffset );
+    double guessLength = s.getBounds2D().getWidth();
+
+    boolean makeSmaller = ( guessLength > wrappingWidth );
+    int inc = makeSmaller ? -1 : 1;
+    boolean keepGoing = true;
+
+    do
+      {
+	guessOffset = guessOffset + inc;
+	if( guessOffset <= position || guessOffset > offsetLimit )
+	  {
+	    keepGoing = false;
+	  }
+	else
+	  {
+	    s = totalLayout.getBlackBoxBounds( position, guessOffset );
+	    guessLength = s.getBounds2D().getWidth();
+	    if( makeSmaller && ( guessLength <= wrappingWidth) )	  
+	      keepGoing = false;
+	    if( !makeSmaller && ( guessLength >= wrappingWidth) )
+	      keepGoing = false;
+	  }
   }
+    while( keepGoing );
 
-  public int nextOffset (float wrappingWidth)
-    throws NotImplementedException
+    if( !makeSmaller )
+      guessOffset--;
+
+    if( guessOffset >= offsetLimit )
+      return offsetLimit;
+
+    text.setIndex( guessOffset );
+    if( !requireNextWord )
+      {
+	char c = text.previous();
+	while( !Character.isWhitespace( c ) && c != '-' && 
+	       guessOffset > position )
+	  { 
+	    guessOffset--; 
+	    c = text.previous();
+	  }
+      }
+    else
   {
-    throw new Error ("not implemented");
+	char c = text.next();
+	while( !Character.isWhitespace( c ) && c != '-' && 
+	       guessOffset < offsetLimit )
+	  {
+	    guessOffset++;
+	    c = text.next();
+	  }
   }
 
-  public int nextOffset (float wrappingWidth, int offsetLimit,
-                         boolean requireNextWord)
-    throws NotImplementedException
+    return guessOffset;
+  }
+
+  public void setPosition(int newPosition)
   {
-    throw new Error ("not implemented");
+    position = newPosition;
   }
 
-  public void setPosition (int newPosition)
+  public int getPosition()
   {
-    ci.setIndex (newPosition);
+    return position;
   }
 }
+



From MAILER-DAEMON Tue Jun 13 05:29:08 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fq5Ct-0005Zo-UY
	for mharc-commit-classpath@gnu.org; Tue, 13 Jun 2006 05:29:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fq5Cq-0005Wt-SJ
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 05:29:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fq5Co-0005U0-WE
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 05:29:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fq5Co-0005Tt-BG
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 05:29:02 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fq5Li-0005f1-Ky
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 05:38:15 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fq5Cl-00051E-00
	for <commit-classpath@gnu.org>; Tue, 13 Jun 2006 05:28:59 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1Fq5Ck-00051B-9f
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 09:28:59 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fq5Ck-00051B-9f@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Tue, 13 Jun 2006 09:28:58 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 09:29:05 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/13 09:28:57

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicCheckBoxUI.java 
	                        BasicComboBoxUI.java 
	                        BasicComboPopup.java 
	                        BasicFileChooserUI.java 
	                        BasicInternalFrameUI.java 
	                        BasicLookAndFeel.java 
	                        BasicMenuItemUI.java 
	                        BasicOptionPaneUI.java 
	                        BasicProgressBarUI.java 
	                        BasicRadioButtonUI.java 
	                        BasicScrollBarUI.java BasicSliderUI.java 
	                        BasicTableHeaderUI.java 
	                        BasicTableUI.java BasicTextUI.java 
	                        BasicToolBarUI.java BasicTreeUI.java 

Log message:
	2006-06-13  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/plaf/basic/BasicCheckBoxUI.java: Source code formatting 
		changes only,
		* javax/swing/plaf/basic/BasicComboBoxUI.java: Likewise,
		* javax/swing/plaf/basic/BasicComboPopup.java: Likewise,
		* javax/swing/plaf/basic/BasicFileChooserUI.java: Likewise,
		* javax/swing/plaf/basic/BasicInternalFrameUI.java: Likewise,
		* javax/swing/plaf/basic/BasicLookAndFeel.java: Likewise,
		* javax/swing/plaf/basic/BasicMenuItemUI.java: Likewise,
		* javax/swing/plaf/basic/BasicOptionPaneUI.java: Likewise,
		* javax/swing/plaf/basic/BasicProgressBarUI.java: Likewise,
		* javax/swing/plaf/basic/BasicRadioButtonUI.java: Likewise,
		* javax/swing/plaf/basic/BasicScrollBarUI.java: Likewise,
		* javax/swing/plaf/basic/BasicSliderUI.java: Likewise,
		* javax/swing/plaf/basic/BasicTableHeaderUI.java: Likewise,
		* javax/swing/plaf/basic/BasicTableUI.java: Likewise,
		* javax/swing/plaf/basic/BasicTextUI.java: Likewise,
		* javax/swing/plaf/basic/BasicToolBarUI.java: Likewise,
		* javax/swing/plaf/basic/BasicTreeUI.java: Likewise.
	----------------------------------------------------------------------

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7792&r2=1.7793
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java?cvsroot=classpath&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java?cvsroot=classpath&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicComboPopup.java?cvsroot=classpath&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java?cvsroot=classpath&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java?cvsroot=classpath&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java?cvsroot=classpath&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java?cvsroot=classpath&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java?cvsroot=classpath&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java?cvsroot=classpath&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java?cvsroot=classpath&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java?cvsroot=classpath&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicSliderUI.java?cvsroot=classpath&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java?cvsroot=classpath&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTableUI.java?cvsroot=classpath&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTextUI.java?cvsroot=classpath&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicToolBarUI.java?cvsroot=classpath&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTreeUI.java?cvsroot=classpath&r1=1.143&r2=1.144

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7792
retrieving revision 1.7793
diff -u -b -r1.7792 -r1.7793
--- ChangeLog	13 Jun 2006 00:14:26 -0000	1.7792
+++ ChangeLog	13 Jun 2006 09:28:56 -0000	1.7793
@@ -1,3 +1,24 @@
+2006-06-13  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/plaf/basic/BasicCheckBoxUI.java: Source code formatting 
+	changes only,
+	* javax/swing/plaf/basic/BasicComboBoxUI.java: Likewise,
+	* javax/swing/plaf/basic/BasicComboPopup.java: Likewise,
+	* javax/swing/plaf/basic/BasicFileChooserUI.java: Likewise,
+	* javax/swing/plaf/basic/BasicInternalFrameUI.java: Likewise,
+	* javax/swing/plaf/basic/BasicLookAndFeel.java: Likewise,
+	* javax/swing/plaf/basic/BasicMenuItemUI.java: Likewise,
+	* javax/swing/plaf/basic/BasicOptionPaneUI.java: Likewise,
+	* javax/swing/plaf/basic/BasicProgressBarUI.java: Likewise,
+	* javax/swing/plaf/basic/BasicRadioButtonUI.java: Likewise,
+	* javax/swing/plaf/basic/BasicScrollBarUI.java: Likewise,
+	* javax/swing/plaf/basic/BasicSliderUI.java: Likewise,
+	* javax/swing/plaf/basic/BasicTableHeaderUI.java: Likewise,
+	* javax/swing/plaf/basic/BasicTableUI.java: Likewise,
+	* javax/swing/plaf/basic/BasicTextUI.java: Likewise,
+	* javax/swing/plaf/basic/BasicToolBarUI.java: Likewise,
+	* javax/swing/plaf/basic/BasicTreeUI.java: Likewise.
+
 2006-06-12  Sven de Marothy  <sven@physto.se>
 
 	* java/awt/font/LineBreakMeasurer.java): Implement.

Index: javax/swing/plaf/basic/BasicCheckBoxUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- javax/swing/plaf/basic/BasicCheckBoxUI.java	11 May 2006 09:25:18 -0000	1.14
+++ javax/swing/plaf/basic/BasicCheckBoxUI.java	13 Jun 2006 09:28:57 -0000	1.15
@@ -57,7 +57,8 @@
    *     
    * @return A new instance of <code>BasicCheckBoxUI</code>.
    */
-  public static ComponentUI createUI(JComponent c)  {
+  public static ComponentUI createUI(JComponent c)
+  {
     return new BasicCheckBoxUI();
   }
 

Index: javax/swing/plaf/basic/BasicComboBoxUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- javax/swing/plaf/basic/BasicComboBoxUI.java	24 May 2006 17:19:56 -0000	1.36
+++ javax/swing/plaf/basic/BasicComboBoxUI.java	13 Jun 2006 09:28:57 -0000	1.37
@@ -921,8 +921,8 @@
     Object prototype = comboBox.getPrototypeDisplayValue();
     if (prototype != null)
       {
-        Component comp = renderer.getListCellRendererComponent
-          (listBox, prototype, -1, false, false);
+        Component comp = renderer.getListCellRendererComponent(listBox, 
+            prototype, -1, false, false);
         currentValuePane.add(comp);
         comp.setFont(comboBox.getFont());
         Dimension renderSize = comp.getPreferredSize();
@@ -938,8 +938,8 @@
           {
             for (int i = 0; i < size; ++i)
               {
-                Component comp = renderer.getListCellRendererComponent
-                (listBox, model.getElementAt(i), -1, false, false);
+                Component comp = renderer.getListCellRendererComponent(listBox, 
+                    model.getElementAt(i), -1, false, false);
                 currentValuePane.add(comp);
                 comp.setFont(comboBox.getFont());
                 Dimension renderSize = comp.getPreferredSize();

Index: javax/swing/plaf/basic/BasicComboPopup.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicComboPopup.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- javax/swing/plaf/basic/BasicComboPopup.java	16 May 2006 18:57:33 -0000	1.18
+++ javax/swing/plaf/basic/BasicComboPopup.java	13 Jun 2006 09:28:57 -0000	1.19
@@ -677,7 +677,7 @@
   {
     Point point = SwingUtilities.convertPoint((Component) e.getSource(),
                                               e.getPoint(), list);
-    MouseEvent newEvent= new MouseEvent((Component) e.getSource(),
+    MouseEvent newEvent = new MouseEvent((Component) e.getSource(),
                                         e.getID(), e.getWhen(),
                                         e.getModifiers(), point.x, point.y,
                                         e.getModifiers(),

Index: javax/swing/plaf/basic/BasicFileChooserUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- javax/swing/plaf/basic/BasicFileChooserUI.java	1 Jun 2006 05:17:02 -0000	1.25
+++ javax/swing/plaf/basic/BasicFileChooserUI.java	13 Jun 2006 09:28:57 -0000	1.26
@@ -699,10 +699,10 @@
   String fileDescText;
 
   /** Is a directory selected? */
-  boolean dirSelected = false;
+  boolean dirSelected;
 
   /** The current directory. */
-  File currDir = null;
+  File currDir;
 
   // FIXME: describe what is contained in the bottom panel
   /** The bottom panel. */

Index: javax/swing/plaf/basic/BasicInternalFrameUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- javax/swing/plaf/basic/BasicInternalFrameUI.java	6 Jun 2006 12:21:21 -0000	1.37
+++ javax/swing/plaf/basic/BasicInternalFrameUI.java	13 Jun 2006 09:28:57 -0000	1.38
@@ -179,10 +179,10 @@
     protected final int RESIZE_NONE = 0;
 
     /** The x offset from the top left corner of the JInternalFrame. */
-    private transient int xOffset = 0;
+    private transient int xOffset;
 
     /** The y offset from the top left corner of the JInternalFrame. */
-    private transient int yOffset = 0;
+    private transient int yOffset;
 
     /** The direction that the resize is occuring in. */
     private transient int direction = -1;
@@ -314,7 +314,7 @@
           frame.setCursor(Cursor.getDefaultCursor());
           showingCursor = Cursor.DEFAULT_CURSOR;
         }
-      else if (e.getSource()==frame && frame.isResizable())
+      else if (e.getSource() == frame && frame.isResizable())
         {
           setCursor(e);
         }

Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- javax/swing/plaf/basic/BasicLookAndFeel.java	9 Jun 2006 11:17:09 -0000	1.92
+++ javax/swing/plaf/basic/BasicLookAndFeel.java	13 Jun 2006 09:28:57 -0000	1.93
@@ -509,7 +509,7 @@
           return BasicIconFactory.getMenuItemCheckIcon();
         }
       },
-      "CheckBox.margin",new InsetsUIResource(2, 2, 2, 2),
+      "CheckBox.margin", new InsetsUIResource(2, 2, 2, 2),
       "CheckBox.textIconGap", new Integer(4),
       "CheckBox.textShiftOffset", new Integer(0),
       "CheckBoxMenuItem.acceleratorFont", new FontUIResource("Dialog",
@@ -599,7 +599,7 @@
         "ctrl F4", "close",
         "KP_DOWN", "down",
         "ctrl F10", "maximize",
-        "ctrl alt shift F6","selectPreviousFrame"
+        "ctrl alt shift F6", "selectPreviousFrame"
       }),
       "DesktopIcon.border", new BorderUIResource.CompoundBorderUIResource(null,
                                                                           null),
@@ -1091,7 +1091,7 @@
       "ScrollPane.ancestorInputMap", new UIDefaults.LazyInputMap(new Object[] {
         "PAGE_UP", "scrollUp",
         "KP_LEFT", "unitScrollLeft",
-        "ctrl PAGE_DOWN","scrollRight",
+        "ctrl PAGE_DOWN", "scrollRight",
         "PAGE_DOWN", "scrollDown",
         "KP_RIGHT", "unitScrollRight",
         "LEFT",  "unitScrollLeft",
@@ -1167,7 +1167,7 @@
       "SplitPaneDivider.border", BasicBorders.getSplitPaneDividerBorder(),
       "SplitPaneDivider.draggingColor", new ColorUIResource(Color.DARK_GRAY),
       "TabbedPane.ancestorInputMap", new UIDefaults.LazyInputMap(new Object[] {
-        "ctrl PAGE_DOWN","navigatePageDown",
+        "ctrl PAGE_DOWN", "navigatePageDown",
         "ctrl PAGE_UP", "navigatePageUp",
         "ctrl UP", "requestFocus",
         "ctrl KP_UP", "requestFocus"
@@ -1220,13 +1220,13 @@
         "COPY", "copy",
         "ctrl KP_UP", "selectPreviousRowChangeLead",
         "PASTE", "paste",
-        "shift PAGE_DOWN","scrollDownExtendSelection",
+        "shift PAGE_DOWN", "scrollDownExtendSelection",
         "PAGE_DOWN", "scrollDownChangeSelection",
         "END",  "selectLastColumn",
         "shift END", "selectLastColumnExtendSelection",
         "HOME",  "selectFirstColumn",
         "ctrl END", "selectLastRow",
-        "ctrl shift END","selectLastRowExtendSelection",
+        "ctrl shift END", "selectLastRowExtendSelection",
         "LEFT",  "selectPreviousColumn",
         "shift HOME", "selectFirstColumnExtendSelection",
         "UP",  "selectPreviousRow",
@@ -1234,7 +1234,7 @@
         "ctrl HOME", "selectFirstRow",
         "shift LEFT", "selectPreviousColumnExtendSelection",
         "DOWN",  "selectNextRow",
-        "ctrl shift HOME","selectFirstRowExtendSelection",
+        "ctrl shift HOME", "selectFirstRowExtendSelection",
         "shift UP", "selectPreviousRowExtendSelection",
         "F2",  "startEditing",
         "shift RIGHT", "selectNextColumnExtendSelection",

Index: javax/swing/plaf/basic/BasicMenuItemUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- javax/swing/plaf/basic/BasicMenuItemUI.java	29 Mar 2006 14:22:41 -0000	1.46
+++ javax/swing/plaf/basic/BasicMenuItemUI.java	13 Jun 2006 09:28:57 -0000	1.47
@@ -239,9 +239,10 @@
     {
       if (e.getPropertyName() == "accelerator")
         {
-          InputMap map = SwingUtilities.getUIInputMap(menuItem, JComponent.WHEN_IN_FOCUSED_WINDOW);
+          InputMap map = SwingUtilities.getUIInputMap(menuItem, 
+              JComponent.WHEN_IN_FOCUSED_WINDOW);
           if (map != null)
-            map.remove((KeyStroke)e.getOldValue());
+            map.remove((KeyStroke) e.getOldValue());
           else
             map = new ComponentInputMapUIResource(menuItem);
 
@@ -499,7 +500,8 @@
    */
   public Dimension getPreferredSize(JComponent c)
   {
-    return getPreferredMenuItemSize(c, checkIcon, arrowIcon, defaultTextIconGap);
+    return getPreferredMenuItemSize(c, checkIcon, arrowIcon, 
+                                    defaultTextIconGap);
   }
 
   /**
@@ -535,8 +537,10 @@
                                      prefix + ".foreground", prefix + ".font");
     menuItem.setMargin(UIManager.getInsets(prefix + ".margin"));
     acceleratorFont = UIManager.getFont(prefix + ".acceleratorFont");
-    acceleratorForeground = UIManager.getColor(prefix + ".acceleratorForeground");
-    acceleratorSelectionForeground = UIManager.getColor(prefix + ".acceleratorSelectionForeground");
+    acceleratorForeground = UIManager.getColor(prefix 
+        + ".acceleratorForeground");
+    acceleratorSelectionForeground = UIManager.getColor(prefix 
+        + ".acceleratorSelectionForeground");
     selectionBackground = UIManager.getColor(prefix + ".selectionBackground");
     selectionForeground = UIManager.getColor(prefix + ".selectionForeground");
     acceleratorDelimiter = UIManager.getString(prefix + ".acceleratorDelimiter");
@@ -551,13 +555,15 @@
    */
   protected void installKeyboardActions()
   {
-    InputMap focusedWindowMap = SwingUtilities.getUIInputMap(menuItem, JComponent.WHEN_IN_FOCUSED_WINDOW);
+    InputMap focusedWindowMap = SwingUtilities.getUIInputMap(menuItem, 
+        JComponent.WHEN_IN_FOCUSED_WINDOW);
     if (focusedWindowMap == null)
       focusedWindowMap = new ComponentInputMapUIResource(menuItem);
     KeyStroke accelerator = menuItem.getAccelerator();
     if (accelerator != null)
       focusedWindowMap.put(accelerator, "doClick");
-    SwingUtilities.replaceUIInputMap(menuItem, JComponent.WHEN_IN_FOCUSED_WINDOW, focusedWindowMap);
+    SwingUtilities.replaceUIInputMap(menuItem, 
+        JComponent.WHEN_IN_FOCUSED_WINDOW, focusedWindowMap);
     
     ActionMap UIActionMap = SwingUtilities.getUIActionMap(menuItem);
     if (UIActionMap == null)
@@ -1268,8 +1274,8 @@
     Insets insets = m.getInsets();
     viewRect.x += insets.left;
     viewRect.y += insets.top;
-    viewRect.width -= (insets.left + insets.right);
-    viewRect.height -= (insets.top + insets.bottom);
+    viewRect.width -= insets.left + insets.right;
+    viewRect.height -= insets.top + insets.bottom;
 
     // Fetch the fonts.
     Font font = m.getFont();

Index: javax/swing/plaf/basic/BasicOptionPaneUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- javax/swing/plaf/basic/BasicOptionPaneUI.java	1 Jun 2006 05:17:02 -0000	1.30
+++ javax/swing/plaf/basic/BasicOptionPaneUI.java	13 Jun 2006 09:28:57 -0000	1.31
@@ -139,8 +139,8 @@
 	((JDialog) owner).dispose();
 
       //else we probably have some kind of internal frame.
-      JInternalFrame inf = (JInternalFrame) SwingUtilities.getAncestorOfClass(JInternalFrame.class,
-                                                                              optionPane);
+      JInternalFrame inf = (JInternalFrame) SwingUtilities.getAncestorOfClass(
+          JInternalFrame.class, optionPane);
       if (inf != null)
         {
           try
@@ -433,7 +433,7 @@
   public static final int MinimumHeight = 90;
 
   /** Whether the JOptionPane contains custom components. */
-  protected boolean hasCustomComponents = false;
+  protected boolean hasCustomComponents;
 
   // The initialFocusComponent seems to always be set to a button (even if 
   // I try to set initialSelectionValue). This is different from what the 
@@ -821,8 +821,8 @@
     if (remainder.length() == 0)
       return;
 
-    // Recursivly call ourselves to burst the remainder of the string, 
-    if ((remainder.length() > maxll || remainder.contains("\n")))
+    // Recursively call ourselves to burst the remainder of the string, 
+    if (remainder.length() > maxll || remainder.contains("\n"))
       burstStringInto(c, remainder, maxll);
     else
       // Add the remainder to the container and be done.
@@ -979,7 +979,7 @@
       case JOptionPane.DEFAULT_OPTION:
         return (optionPane.getWantsInput()) ?
                new Object[] { OK_STRING, CANCEL_STRING } :
-               ( optionPane.getMessageType() == JOptionPane.QUESTION_MESSAGE ) ?
+               (optionPane.getMessageType() == JOptionPane.QUESTION_MESSAGE) ?
                new Object[] { YES_STRING, NO_STRING, CANCEL_STRING } :
                // ERROR_MESSAGE, INFORMATION_MESSAGE, WARNING_MESSAGE, PLAIN_MESSAGE
                new Object[] { OK_STRING };

Index: javax/swing/plaf/basic/BasicProgressBarUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- javax/swing/plaf/basic/BasicProgressBarUI.java	8 Jun 2006 14:27:44 -0000	1.17
+++ javax/swing/plaf/basic/BasicProgressBarUI.java	13 Jun 2006 09:28:57 -0000	1.18
@@ -384,7 +384,7 @@
       }
 
     int index = getAnimationIndex();
-    if (animationIndex > (numFrames) / 2)
+    if (animationIndex > numFrames / 2)
       index = numFrames - getAnimationIndex();
 
     if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
@@ -671,7 +671,8 @@
 	else
 	  {
 	    g.setColor(c.getForeground());
-	    g.fillRect(vr.x, vr.y + vr.height - amountFull, vr.width, amountFull);
+	    g.fillRect(vr.x, vr.y + vr.height - amountFull, vr.width, 
+                       amountFull);
 	  }
 
     if (progressBar.isStringPainted() && !progressBar.getString().equals(""))

Index: javax/swing/plaf/basic/BasicRadioButtonUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- javax/swing/plaf/basic/BasicRadioButtonUI.java	11 May 2006 08:37:19 -0000	1.17
+++ javax/swing/plaf/basic/BasicRadioButtonUI.java	13 Jun 2006 09:28:57 -0000	1.18
@@ -70,7 +70,8 @@
    *
    * @return a new instance of <code>BasicRadioButtonUI</code>
    */
-  public static ComponentUI createUI(final JComponent c)  {
+  public static ComponentUI createUI(final JComponent c)  
+  {
     return new BasicRadioButtonUI();
   }
 
@@ -155,8 +156,8 @@
       currentIcon = b.getDisabledIcon();
 
     SwingUtilities.calculateInnerArea(b, vr);
-    String text = SwingUtilities.layoutCompoundLabel
-      (c, g.getFontMetrics(f), b.getText(), currentIcon,
+    String text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f), 
+       b.getText(), currentIcon,
        b.getVerticalAlignment(), b.getHorizontalAlignment(),
        b.getVerticalTextPosition(), b.getHorizontalTextPosition(),
        vr, ir, tr, b.getIconTextGap() + defaultTextShiftOffset);

Index: javax/swing/plaf/basic/BasicScrollBarUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- javax/swing/plaf/basic/BasicScrollBarUI.java	9 Jun 2006 11:17:09 -0000	1.34
+++ javax/swing/plaf/basic/BasicScrollBarUI.java	13 Jun 2006 09:28:57 -0000	1.35
@@ -400,9 +400,9 @@
         return false;
       
       if (direction == POSITIVE_SCROLL)
-	return (value > scrollbar.getValue());
+	return value > scrollbar.getValue();
       else
-	return (value < scrollbar.getValue());
+	return value < scrollbar.getValue();
     }
   }
 
@@ -727,7 +727,7 @@
     int orientation = scrollbar.getOrientation();
     switch (orientation)
       {
-      case (JScrollBar.HORIZONTAL):
+      case JScrollBar.HORIZONTAL:
         incrButton = createIncreaseButton(EAST);
         decrButton = createDecreaseButton(WEST);
         break;
@@ -1357,9 +1357,9 @@
     // If the length is 0, you shouldn't be able to even see where the thumb is.
     // This really shouldn't ever happen, but just in case, we'll return the middle.
     if (len == 0)
-      return ((max - min) / 2);
+      return (max - min) / 2;
 
-    value = ((yPos - trackRect.y) * (max - min) / len + min);
+    value = (yPos - trackRect.y) * (max - min) / len + min;
 
     // If this isn't a legal value, then we'll have to move to one now.
     if (value > max)
@@ -1390,9 +1390,9 @@
     // If the length is 0, you shouldn't be able to even see where the slider is.
     // This really shouldn't ever happen, but just in case, we'll return the middle.
     if (len == 0)
-      return ((max - min) / 2);
+      return (max - min) / 2;
 
-    value = ((xPos - trackRect.x) * (max - min) / len + min);
+    value = (xPos - trackRect.x) * (max - min) / len + min;
 
     // If this isn't a legal value, then we'll have to move to one now.
     if (value > max)

Index: javax/swing/plaf/basic/BasicSliderUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicSliderUI.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- javax/swing/plaf/basic/BasicSliderUI.java	17 May 2006 15:31:39 -0000	1.30
+++ javax/swing/plaf/basic/BasicSliderUI.java	13 Jun 2006 09:28:57 -0000	1.31
@@ -68,7 +68,6 @@
 import javax.swing.JLabel;
 import javax.swing.JSlider;
 import javax.swing.LookAndFeel;
-import javax.swing.RepaintManager;
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 import javax.swing.UIManager;
@@ -483,9 +482,9 @@
         value = valueForYPosition(currentMouseY);
 
       if (direction == POSITIVE_SCROLL)
-        return (value > slider.getValue());
+        return value > slider.getValue();
       else
-        return (value < slider.getValue());
+        return value < slider.getValue();
     }
   }
 
@@ -1298,7 +1297,7 @@
         tickRect.x = trackRect.x;
         tickRect.y = trackRect.y + trackRect.height;
         tickRect.width = trackRect.width;
-        tickRect.height = (slider.getPaintTicks() ? getTickLength() : 0);
+        tickRect.height = slider.getPaintTicks() ? getTickLength() : 0;
 
         if (tickRect.y + tickRect.height > contentRect.y + contentRect.height)
           tickRect.height = contentRect.y + contentRect.height - tickRect.y;
@@ -1307,7 +1306,7 @@
       {
         tickRect.x = trackRect.x + trackRect.width;
         tickRect.y = trackRect.y;
-        tickRect.width = (slider.getPaintTicks() ? getTickLength() : 0);
+        tickRect.width = slider.getPaintTicks() ? getTickLength() : 0;
         tickRect.height = trackRect.height;
 
         if (tickRect.x + tickRect.width > contentRect.x + contentRect.width)
@@ -2226,12 +2225,12 @@
     // is.  This really shouldn't ever happen, but just in case, we'll return 
     // the middle.
     if (len == 0)
-      return ((max - min) / 2);
+      return (max - min) / 2;
 
     if (! drawInverted())
-      value = ((len - (yPos - trackRect.y)) * (max - min) / len + min);
+      value = (len - (yPos - trackRect.y)) * (max - min) / len + min;
     else
-      value = ((yPos - trackRect.y) * (max - min) / len + min);
+      value = (yPos - trackRect.y) * (max - min) / len + min;
 
     // If this isn't a legal value, then we'll have to move to one now.
     if (value > max)
@@ -2262,12 +2261,12 @@
     // is.  This really shouldn't ever happen, but just in case, we'll return 
     // the middle.
     if (len == 0)
-      return ((max - min) / 2);
+      return (max - min) / 2;
 
     if (! drawInverted())
-      value = ((xPos - trackRect.x) * (max - min) / len + min);
+      value = (xPos - trackRect.x) * (max - min) / len + min;
     else
-      value = ((len - (xPos - trackRect.x)) * (max - min) / len + min);
+      value = (len - (xPos - trackRect.x)) * (max - min) / len + min;
 
     // If this isn't a legal value, then we'll have to move to one now.
     if (value > max)

Index: javax/swing/plaf/basic/BasicTableHeaderUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- javax/swing/plaf/basic/BasicTableHeaderUI.java	19 May 2006 18:57:08 -0000	1.22
+++ javax/swing/plaf/basic/BasicTableHeaderUI.java	13 Jun 2006 09:28:57 -0000	1.23
@@ -249,11 +249,11 @@
 
 		  originalCursor = header.getCursor();
                   if (p < x)
-                    header.setCursor(Cursor.getPredefinedCursor
-                                     (Cursor.W_RESIZE_CURSOR));
+                    header.setCursor(Cursor.getPredefinedCursor(
+                        Cursor.W_RESIZE_CURSOR));
                   else
-                    header.setCursor(Cursor.getPredefinedCursor
-                                     (Cursor.E_RESIZE_CURSOR));
+                    header.setCursor(Cursor.getPredefinedCursor(
+                        Cursor.E_RESIZE_CURSOR));
                 }
               else
                 {
@@ -368,7 +368,7 @@
       int x = e.getX();
       int p = 0;
       
-      int col = model.getColumnCount()-1;
+      int col = model.getColumnCount() - 1;
       int n = model.getColumnCount();
 
       // This loop does not find the column if the mouse if out of the 
@@ -504,7 +504,7 @@
             comp.setBackground(header.getBackground());
             comp.setForeground(header.getForeground());
             if (comp instanceof JComponent)
-              ((JComponent)comp).setBorder(cellBorder);
+              ((JComponent) comp).setBorder(cellBorder);
             rendererPane.paintComponent(gfx, comp, header, bounds.x, bounds.y,
                                         bounds.width, bounds.height);
           }
@@ -513,11 +513,11 @@
     // This displays a running rectangle that is much simplier than the total
     // animation, as it is seen in Sun's application.
     // TODO animate the collumn dragging like in Sun's jre.
-    if (draggingHeaderRect!=null)
+    if (draggingHeaderRect != null)
       {
         gfx.setColor(header.getForeground()); 
-        gfx.drawRect(draggingHeaderRect.x, draggingHeaderRect.y+2,
-                     draggingHeaderRect.width-1, draggingHeaderRect.height-6);
+        gfx.drawRect(draggingHeaderRect.x, draggingHeaderRect.y + 2,
+            draggingHeaderRect.width - 1, draggingHeaderRect.height - 6);
       }
   }
   
@@ -533,7 +533,7 @@
     TableColumnModel cmod = header.getColumnModel();
     TableCellRenderer defaultRend = header.getDefaultRenderer();
     int ncols = cmod.getColumnCount();    
-    Dimension ret = new Dimension(0,0);
+    Dimension ret = new Dimension(0, 0);
     int spacing = 0;
 
     if (header.getTable() != null 
@@ -556,7 +556,7 @@
         comp.setBackground(header.getBackground());
         comp.setForeground(header.getForeground());
         if (comp instanceof JComponent)
-          ((JComponent)comp).setBorder(cellBorder);
+          ((JComponent) comp).setBorder(cellBorder);
 
         Dimension d = comp.getPreferredSize();
         ret.width += spacing;

Index: javax/swing/plaf/basic/BasicTableUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicTableUI.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- javax/swing/plaf/basic/BasicTableUI.java	6 Jun 2006 09:39:07 -0000	1.53
+++ javax/swing/plaf/basic/BasicTableUI.java	13 Jun 2006 09:28:57 -0000	1.54
@@ -269,8 +269,8 @@
           begin = new Point(e.getX(), e.getY());
           curr = new Point(e.getX(), e.getY());
           //if control is pressed and the cell is already selected, deselect it
-          if (e.isControlDown() && table.
-              isCellSelected(table.rowAtPoint(begin),table.columnAtPoint(begin)))
+          if (e.isControlDown() && table.isCellSelected(
+              table.rowAtPoint(begin), table.columnAtPoint(begin)))
             {                                       
               table.getSelectionModel().
               removeSelectionInterval(table.rowAtPoint(begin), 
@@ -467,22 +467,21 @@
     // Register key bindings in the UI InputMap-ActionMap pair
     for (int i = 0; i < keys.length; i++)
       {
-        KeyStroke stroke = (KeyStroke)keys[i];
+        KeyStroke stroke = (KeyStroke) keys[i];
         String actionString = (String) ancestorMap.get(stroke);
 
         parentInputMap.put(KeyStroke.getKeyStroke(stroke.getKeyCode(),
                                                   stroke.getModifiers()),
                            actionString);
 
-        parentActionMap.put (actionString, 
-                             new ActionListenerProxy (action, actionString));
+        parentActionMap.put(actionString, 
+                            new ActionListenerProxy(action, actionString));
 
       }
     // Set the UI InputMap-ActionMap pair to be the parents of the
     // JTable's InputMap-ActionMap pair
-    parentInputMap.setParent
-      (table.getInputMap
-       (JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).getParent());
+    parentInputMap.setParent(table.getInputMap(
+        JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).getParent());
     parentActionMap.setParent(table.getActionMap().getParent());
     table.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
       setParent(parentInputMap);
@@ -532,10 +531,12 @@
      *
      * @param e the ActionEvent that caused this action.
      */
-    public void actionPerformed (ActionEvent e)
+    public void actionPerformed(ActionEvent e)
     {
-      DefaultListSelectionModel rowModel = (DefaultListSelectionModel) table.getSelectionModel();
-      DefaultListSelectionModel colModel = (DefaultListSelectionModel) table.getColumnModel().getSelectionModel();
+      DefaultListSelectionModel rowModel 
+          = (DefaultListSelectionModel) table.getSelectionModel();
+      DefaultListSelectionModel colModel 
+          = (DefaultListSelectionModel) table.getColumnModel().getSelectionModel();
 
       int rowLead = rowModel.getLeadSelectionIndex();
       int rowMax = table.getModel().getRowCount() - 1;
@@ -556,7 +557,7 @@
       else if (command.equals("startEditing"))
         {
           if (table.isCellEditable(rowLead, colLead))
-            table.editCellAt(rowLead,colLead);
+            table.editCellAt(rowLead, colLead);
         }
       else if (command.equals("selectFirstRowExtendSelection"))
         {              
@@ -572,7 +573,7 @@
         }      
       else if (command.equals("selectLastRow"))
         {
-          rowModel.setSelectionInterval(rowMax,rowMax);
+          rowModel.setSelectionInterval(rowMax, rowMax);
         }
       else if (command.equals("selectNextRowExtendSelection"))
         {
@@ -580,7 +581,7 @@
         }
       else if (command.equals("selectFirstRow"))
         {
-          rowModel.setSelectionInterval(0,0);
+          rowModel.setSelectionInterval(0, 0);
         }
       else if (command.equals("selectNextColumnExtendSelection"))
         {
@@ -603,9 +604,8 @@
         {
           int target;
           if (rowLead == getFirstVisibleRowIndex())
-            target = Math.max
-              (0, rowLead - (getLastVisibleRowIndex() - 
-                             getFirstVisibleRowIndex() + 1));
+            target = Math.max(0, rowLead - (getLastVisibleRowIndex() 
+                - getFirstVisibleRowIndex() + 1));
           else
             target = getFirstVisibleRowIndex();
           
@@ -621,9 +621,8 @@
         {
           int target;
           if (colLead == getLastVisibleColumnIndex())
-            target = Math.min
-              (colMax, colLead + (getLastVisibleColumnIndex() -
-                                  getFirstVisibleColumnIndex() + 1));
+            target = Math.min(colMax, colLead + (getLastVisibleColumnIndex() 
+                - getFirstVisibleColumnIndex() + 1));
           else
             target = getLastVisibleColumnIndex();
           
@@ -639,9 +638,8 @@
         {
           int target;
           if (colLead == getFirstVisibleColumnIndex())
-            target = Math.max
-              (0, colLead - (getLastVisibleColumnIndex() -
-                             getFirstVisibleColumnIndex() + 1));
+            target = Math.max(0, colLead - (getLastVisibleColumnIndex() 
+                - getFirstVisibleColumnIndex() + 1));
           else
             target = getFirstVisibleColumnIndex();
           
@@ -701,12 +699,10 @@
             {
               if (command.indexOf("Column") != -1) 
                 advanceSingleSelection(colModel, colMax, rowModel, rowMax, 
-                                       (command.equals
-                                        ("selectPreviousColumnCell")));
+                    command.equals("selectPreviousColumnCell"));
               else
                 advanceSingleSelection(rowModel, rowMax, colModel, colMax, 
-                                       (command.equals 
-                                        ("selectPreviousRowCell")));
+                    command.equals("selectPreviousRowCell"));
               return;
             }
           
@@ -729,14 +725,12 @@
           if (command.indexOf("Column") != -1) 
             advanceMultipleSelection(colModel, colMinSelected, colMaxSelected, 
                                      rowModel, rowMinSelected, rowMaxSelected, 
-                                     (command.equals
-                                      ("selectPreviousColumnCell")), true);
+                command.equals("selectPreviousColumnCell"), true);
           
           else
             advanceMultipleSelection(rowModel, rowMinSelected, rowMaxSelected, 
                                      colModel, colMinSelected, colMaxSelected, 
-                                     (command.equals 
-                                      ("selectPreviousRowCell")), false);
+                command.equals("selectPreviousRowCell"), false);
         }
       else if (command.equals("selectNextColumn"))
         {
@@ -747,9 +741,8 @@
         {
           int target;
           if (colLead == getFirstVisibleColumnIndex())
-            target = Math.max
-              (0, colLead - (getLastVisibleColumnIndex() -
-                             getFirstVisibleColumnIndex() + 1));
+            target = Math.max(0, colLead - (getLastVisibleColumnIndex() 
+                - getFirstVisibleColumnIndex() + 1));
           else
             target = getFirstVisibleColumnIndex();
           
@@ -760,9 +753,8 @@
         {
           int target;
           if (rowLead == getLastVisibleRowIndex())
-            target = Math.min
-              (rowMax, rowLead + (getLastVisibleRowIndex() - 
-                                  getFirstVisibleRowIndex() + 1));
+            target = Math.min(rowMax, rowLead + (getLastVisibleRowIndex() 
+                - getFirstVisibleRowIndex() + 1));
           else
             target = getLastVisibleRowIndex();
           
@@ -773,9 +765,8 @@
         {
           int target;
           if (colLead == getLastVisibleColumnIndex())
-            target = Math.min
-              (colMax, colLead + (getLastVisibleColumnIndex() -
-                                  getFirstVisibleColumnIndex() + 1));
+            target = Math.min(colMax, colLead + (getLastVisibleColumnIndex() 
+                - getFirstVisibleColumnIndex() + 1));
           else
             target = getLastVisibleColumnIndex();
           
@@ -795,9 +786,8 @@
         {
           int target;
           if (rowLead == getLastVisibleRowIndex())
-            target = Math.min
-              (rowMax, rowLead + (getLastVisibleRowIndex() - 
-                                  getFirstVisibleRowIndex() + 1));
+            target = Math.min(rowMax, rowLead + (getLastVisibleRowIndex() 
+                - getFirstVisibleRowIndex() + 1));
           else
             target = getLastVisibleRowIndex();
           
@@ -808,9 +798,8 @@
         {
           int target;
           if (rowLead == getFirstVisibleRowIndex())
-            target = Math.max
-              (0, rowLead - (getLastVisibleRowIndex() - 
-                             getFirstVisibleRowIndex() + 1));
+            target = Math.max(0, rowLead - (getLastVisibleRowIndex() 
+                - getFirstVisibleRowIndex() + 1));
           else
             target = getFirstVisibleRowIndex();
           
@@ -819,34 +808,37 @@
         }
       else if (command.equals("selectNextRowChangeLead"))
           {
-            if (rowModel.getSelectionMode() != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
+            if (rowModel.getSelectionMode() 
+                != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
               {
                 // just "selectNextRow"
                 rowModel.setSelectionInterval(Math.min(rowLead + 1, rowMax),
                                               Math.min(rowLead + 1, rowMax));
-                colModel.setSelectionInterval(colLead,colLead);
+                colModel.setSelectionInterval(colLead, colLead);
               }
             else
               rowModel.moveLeadSelectionIndex(Math.min(rowLead + 1, rowMax));
           }
       else if (command.equals("selectPreviousRowChangeLead"))
         {
-          if (rowModel.getSelectionMode() != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
+          if (rowModel.getSelectionMode() 
+              != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
             {
               // just selectPreviousRow
               rowModel.setSelectionInterval(Math.max(rowLead - 1, 0),
-                                            Math.min(rowLead -1, 0));
-              colModel.setSelectionInterval(colLead,colLead);
+                                            Math.min(rowLead - 1, 0));
+              colModel.setSelectionInterval(colLead, colLead);
             }
           else
             rowModel.moveLeadSelectionIndex(Math.max(rowLead - 1, 0));
         }
       else if (command.equals("selectNextColumnChangeLead"))
         {
-          if (colModel.getSelectionMode() != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)            
+          if (colModel.getSelectionMode() 
+              != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)            
             {
               // just selectNextColumn
-              rowModel.setSelectionInterval(rowLead,rowLead);
+              rowModel.setSelectionInterval(rowLead, rowLead);
               colModel.setSelectionInterval(Math.min(colLead + 1, colMax),
                                             Math.min(colLead + 1, colMax));
             }
@@ -855,10 +847,11 @@
         }
       else if (command.equals("selectPreviousColumnChangeLead"))
         {
-          if (colModel.getSelectionMode() != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)            
+          if (colModel.getSelectionMode() 
+              != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)            
             {
               // just selectPreviousColumn
-              rowModel.setSelectionInterval(rowLead,rowLead);
+              rowModel.setSelectionInterval(rowLead, rowLead);
               colModel.setSelectionInterval(Math.max(colLead - 1, 0),
                                             Math.max(colLead - 1, 0));
               
@@ -924,9 +917,9 @@
           && command != "addToSelection")
         table.editingStopped(new ChangeEvent("update"));
             
-      table.scrollRectToVisible
-        (table.getCellRect(rowModel.getLeadSelectionIndex(), 
-                           colModel.getLeadSelectionIndex(), false));
+      table.scrollRectToVisible(table.getCellRect(
+          rowModel.getLeadSelectionIndex(), colModel.getLeadSelectionIndex(), 
+          false));
     }
     
     /**
@@ -1010,13 +1003,13 @@
      * @param reverse true if shift was held for the event
      * @param eventIsTab true if TAB was pressed, false if ENTER pressed
      */
-    void advanceMultipleSelection (ListSelectionModel firstModel, int firstMin,
+    void advanceMultipleSelection(ListSelectionModel firstModel, int firstMin,
                                    int firstMax, ListSelectionModel secondModel, 
                                    int secondMin, int secondMax, boolean reverse,
                                    boolean eventIsTab)
     {
-      // If eventIsTab, all the "firsts" correspond to columns, otherwise, to rows
-      // "seconds" correspond to the opposite
+      // If eventIsTab, all the "firsts" correspond to columns, otherwise, to 
+      // rows "seconds" correspond to the opposite
       int firstLead = firstModel.getLeadSelectionIndex();
       int secondLead = secondModel.getLeadSelectionIndex();
       int numFirsts = eventIsTab ? 
@@ -1115,7 +1108,7 @@
      * @param reverse true if SHIFT was pressed for the event
      */
 
-    void advanceSingleSelection (ListSelectionModel firstModel, int firstMax, 
+    void advanceSingleSelection(ListSelectionModel firstModel, int firstMax, 
                                  ListSelectionModel secondModel, int secondMax, 
                                  boolean reverse)
     {
@@ -1136,8 +1129,8 @@
       
       // do we have to wrap the "seconds"?
       if (reverse && (firstLead == 0) || !reverse && (firstLead == firstMax))
-        secondModel.setSelectionInterval((secondLead + 1)%(secondMax + 1), 
-                                         (secondLead + 1)%(secondMax + 1));
+        secondModel.setSelectionInterval((secondLead + 1) % (secondMax + 1), 
+                                         (secondLead + 1) % (secondMax + 1));
       // if not, just reselect the current lead
       else
         secondModel.setSelectionInterval(secondLead, secondLead);
@@ -1152,8 +1145,8 @@
           firstLead -= 2;
         }
       // select the next "first"
-      firstModel.setSelectionInterval ((firstLead + 1)%(firstMax + 1), 
-                                       (firstLead + 1)%(firstMax + 1));
+      firstModel.setSelectionInterval((firstLead + 1) % (firstMax + 1), 
+                                      (firstLead + 1) % (firstMax + 1));
     }
   }
 
@@ -1212,7 +1205,7 @@
 
   public void installUI(JComponent comp) 
   {
-    table = (JTable)comp;
+    table = (JTable) comp;
     rendererPane = new CellRendererPane();
     table.add(rendererPane);
 
@@ -1282,8 +1275,8 @@
     int rowMargin = table.getRowMargin();
 
     TableColumnModel cmodel = table.getColumnModel();
-    int [] widths = new int[cn+1];
-    for (int i = c0; i <=cn ; i++)
+    int[] widths = new int[cn + 1];
+    for (int i = c0; i <= cn; i++)
       {
         widths[i] = cmodel.getColumn(i).getWidth() - columnMargin;
       }

Index: javax/swing/plaf/basic/BasicTextUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicTextUI.java,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- javax/swing/plaf/basic/BasicTextUI.java	6 Jun 2006 10:46:43 -0000	1.85
+++ javax/swing/plaf/basic/BasicTextUI.java	13 Jun 2006 09:28:57 -0000	1.86
@@ -603,10 +603,12 @@
     // Fetch the colors for enabled/disabled text components.
     background = UIManager.getColor(prefix + ".background");
     inactiveBackground = UIManager.getColor(prefix + ".inactiveBackground");
-    textComponent.setDisabledTextColor
-                         (UIManager.getColor(prefix + ".inactiveForeground"));
-    textComponent.setSelectedTextColor(UIManager.getColor(prefix + ".selectionForeground"));
-    textComponent.setSelectionColor(UIManager.getColor(prefix + ".selectionBackground"));    
+    textComponent.setDisabledTextColor(UIManager.getColor(prefix 
+        + ".inactiveForeground"));
+    textComponent.setSelectedTextColor(UIManager.getColor(prefix 
+        + ".selectionForeground"));
+    textComponent.setSelectionColor(UIManager.getColor(prefix 
+        + ".selectionBackground"));    
   }
 
   /**
@@ -639,7 +641,8 @@
                 Clipboard cb = Toolkit.getDefaultToolkit().getSystemSelection();
                 if (cb != null)
                   {
-                    StringSelection selection = new StringSelection(textComponent.getSelectedText());
+                    StringSelection selection = new StringSelection(
+                        textComponent.getSelectedText());
                     cb.setContents(selection, selection);
                   }
               }
@@ -853,7 +856,8 @@
    */
   protected void uninstallKeyboardActions()
   {
-    SwingUtilities.replaceUIInputMap(textComponent, JComponent.WHEN_FOCUSED, null);
+    SwingUtilities.replaceUIInputMap(textComponent, JComponent.WHEN_FOCUSED, 
+                                     null);
     SwingUtilities.replaceUIActionMap(textComponent, null);
   }
 
@@ -1114,13 +1118,14 @@
                        && Utilities.getRowStart(t, nextPosBelow) != p1RowStart)
                   {
                     posBelow = nextPosBelow;
-                    nextPosBelow = Utilities.getPositionBelow(t, posBelow, l1.x);
+                    nextPosBelow = Utilities.getPositionBelow(t, posBelow, 
+                                                              l1.x);
                     
                     if (posBelow == nextPosBelow)
                       break;
                   }
-                // Now posBelow is an offset on the last line which has to be damaged
-                // completely. (newPosBelow is on the same line as p1)
+                // Now posBelow is an offset on the last line which has to be 
+                // damaged completely. (newPosBelow is on the same line as p1)
                  
                 // Retrieve the rectangle of posBelow and use its y and height
                 // value to calculate the final height of the multiple line

Index: javax/swing/plaf/basic/BasicToolBarUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicToolBarUI.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- javax/swing/plaf/basic/BasicToolBarUI.java	19 May 2006 09:03:06 -0000	1.24
+++ javax/swing/plaf/basic/BasicToolBarUI.java	13 Jun 2006 09:28:57 -0000	1.25
@@ -417,8 +417,8 @@
     int w = 0;
     int h = 0;
 
-    boolean tmp = ((loc == SwingConstants.NORTH)
-                  || (loc == SwingConstants.SOUTH) || (loc == -1));
+    boolean tmp = (loc == SwingConstants.NORTH)
+                  || (loc == SwingConstants.SOUTH) || (loc == -1);
 
     cachedOrientation = toolBar.getOrientation();
     cachedBounds = toolBar.getSize();
@@ -1084,7 +1084,8 @@
       isDragging = true;
 
       if (dragWindow != null)
-	dragWindow.setOffset(new Point(cachedBounds.width/2, cachedBounds.height/2));
+	dragWindow.setOffset(new Point(cachedBounds.width / 2, 
+            cachedBounds.height / 2));
 
       dragTo(e.getPoint(), origin);
     }

Index: javax/swing/plaf/basic/BasicTreeUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicTreeUI.java,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- javax/swing/plaf/basic/BasicTreeUI.java	8 Jun 2006 14:00:54 -0000	1.143
+++ javax/swing/plaf/basic/BasicTreeUI.java	13 Jun 2006 09:28:57 -0000	1.144
@@ -248,7 +248,7 @@
   int gap = 4;
 
   /** The max height of the nodes in the tree. */
-  int maxHeight = 0;
+  int maxHeight;
   
   /** The hash color. */
   Color hashColor;
@@ -1129,7 +1129,7 @@
   {
     Enumeration expanded = tree.getExpandedDescendants(path);
     while (expanded.hasMoreElements())
-      treeState.setExpandedState(((TreePath) expanded.nextElement()), true);
+      treeState.setExpandedState((TreePath) expanded.nextElement(), true);
   }
 
   /**
@@ -1140,7 +1140,7 @@
    */
   protected TreePath getLastChildPath(TreePath parent)
   {
-    return ((TreePath) parent.getLastPathComponent());
+    return (TreePath) parent.getLastPathComponent();
   }
 
   /**
@@ -1295,21 +1295,21 @@
     ActionMapUIResource am = new ActionMapUIResource();
     Action action;
 
-    action= new TreeAction();
+    action = new TreeAction();
     am.put(action.getValue(Action.NAME), action);
 
     // TreeHomeAction.
-    action= new TreeHomeAction(-1, "selectFirst");
+    action = new TreeHomeAction(-1, "selectFirst");
     am.put(action.getValue(Action.NAME), action);
-    action= new TreeHomeAction(-1, "selectFirstChangeLead");
+    action = new TreeHomeAction(-1, "selectFirstChangeLead");
     am.put(action.getValue(Action.NAME), action);
-    action= new TreeHomeAction(-1, "selectFirstExtendSelection");
+    action = new TreeHomeAction(-1, "selectFirstExtendSelection");
     am.put(action.getValue(Action.NAME), action);
-    action= new TreeHomeAction(1, "selectLast");
+    action = new TreeHomeAction(1, "selectLast");
     am.put(action.getValue(Action.NAME), action);
-    action= new TreeHomeAction(1, "selectLastChangeLead");
+    action = new TreeHomeAction(1, "selectLastChangeLead");
     am.put(action.getValue(Action.NAME), action);
-    action= new TreeHomeAction(1, "selectLastExtendSelection");
+    action = new TreeHomeAction(1, "selectLastExtendSelection");
     am.put(action.getValue(Action.NAME), action);
 
     // TreeIncrementAction.
@@ -1414,8 +1414,8 @@
     if (treeSelectionModel != null
         && selectionModelPropertyChangeListener != null)
       {
-        treeSelectionModel.addPropertyChangeListener
-                                        (selectionModelPropertyChangeListener);
+        treeSelectionModel.addPropertyChangeListener(
+            selectionModelPropertyChangeListener);
       }
 
     componentListener = createComponentListener();
@@ -1819,7 +1819,7 @@
 
         Insets i = tree.getInsets();
         int left = getRowX(tree.getRowForPath(path), path.getPathCount() - 1)
-                   -getRightChildIndent() - width / 2 + i.left;
+                   - getRightChildIndent() - width / 2 + i.left;
         cntlClick = mouseX >= left && mouseX <= left + width;
       }
     return cntlClick;
@@ -2207,7 +2207,7 @@
     {
       cancelEditing(tree);
     }
-  }// CellEditorHandler
+  } // CellEditorHandler
 
   /**
    * Repaints the lead selection row when focus is lost/grained.
@@ -2255,7 +2255,7 @@
     void repaintLeadRow()
     {
       TreePath lead = tree.getLeadSelectionPath();
-      if (lead!=null)
+      if (lead != null)
         tree.repaint(tree.getPathBounds(lead));
     }
   }
@@ -2588,7 +2588,7 @@
     {
       return BasicTreeUI.this.getRowX(row, depth);
     }
-  }// NodeDimensionsHandler
+  } // NodeDimensionsHandler
 
   /**
    * PropertyChangeListener for the tree. Updates the appropriate variable, or
@@ -2742,7 +2742,7 @@
       tree.revalidate();
       tree.repaint();
     }
-  }// TreeExpansionHandler
+  } // TreeExpansionHandler
 
   /**
    * TreeHomeAction is used to handle end/home actions. Scrolls either the first
@@ -3040,7 +3040,7 @@
       treeState.treeStructureChanged(e);
       tree.repaint();
     }
-  }// TreeModelHandler
+  } // TreeModelHandler
 
   /**
    * TreePageAction handles page up and page down events.
@@ -3125,7 +3125,7 @@
             }
           else
             {
-              newVisible.y -= (visible.height - newVisible.height);
+              newVisible.y -= visible.height - newVisible.height;
               newVisible.height = visible.height;
             }
 
@@ -3169,7 +3169,7 @@
     {
       return (tree != null) && tree.isEnabled();
     }
-  }// TreePageAction
+  } // TreePageAction
 
   /**
    * Listens for changes in the selection model and updates the display
@@ -3208,13 +3208,13 @@
           Rectangle n = treeState.getBounds(event.getNewLeadSelectionPath(), 
                                            new Rectangle());
           
-          if (o!=null)
+          if (o != null)
             tree.repaint(o);
-          if (n!=null)
+          if (n != null)
             tree.repaint(n);
         }
     }
-  }// TreeSelectionHandler
+  } // TreeSelectionHandler
 
   /**
    * For the first selected row expandedness will be toggled.
@@ -3315,7 +3315,7 @@
               // is not visible.
               TreePath parent = current.getParentPath();
               if (parent != null && 
-                  !(parent.getPathCount()==1 && !tree.isRootVisible()) )
+                  ! (parent.getPathCount() == 1 && ! tree.isRootVisible()))
                 tree.setSelectionPath(parent);
             }
         }
@@ -3647,7 +3647,7 @@
     if (parent != null)
       {
         Rectangle parentBounds = getPathBounds(tree, parent);
-        paintVerticalLine(g, tree, parentBounds.x + 2* gap, 
+        paintVerticalLine(g, tree, parentBounds.x + 2 * gap, 
                           parentBounds.y + parentBounds.height / 2,
                           bounds.y + bounds.height / 2);
       }
@@ -3717,7 +3717,7 @@
                                              boolean isLeaf)
   {
     Object node = path.getLastPathComponent();
-    return (! isLeaf && hasControlIcons());
+    return ! isLeaf && hasControlIcons();
   }
 
   /**



From MAILER-DAEMON Tue Jun 13 08:38:02 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fq89i-0004WM-Gu
	for mharc-commit-classpath@gnu.org; Tue, 13 Jun 2006 08:38:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fq89g-0004U1-Ps
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 08:38:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fq89f-0004SJ-H9
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 08:38:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fq89f-0004Ry-48
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 08:37:59 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fq8Ib-00084V-OB
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 08:47:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fq89e-0003vN-00
	for <commit-classpath@gnu.org>; Tue, 13 Jun 2006 08:37:58 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fq89c-0003vB-Af
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 12:37:57 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fq89c-0003vB-Af@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Tue, 13 Jun 2006 12:37:56 +0000
Subject: [commit-cp] classpath javax/swing/plaf/basicBasicLookAndFee...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 12:38:01 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/13 12:37:56

Modified files:
	javax/swing/plaf/basic: BasicLookAndFeel.java 
	java/awt       : Component.java 
	.              : ChangeLog 

Log message:
	2006-06-13  Roman Kennke  <kennke@aicas.com>
	
		* java/awt/Component.java
		(getGraphics): Translate child graphics correctly.
		(dispatchEvent): Only dispatch event if it hasn't been consumed
		yet by the global dispatcher.
		* javax/swing/plaf/basic/BasicLookAndFeel.java
		Added some API docs.
		(PopupHelper.mousePressed): Consume the event after closing
		opened menus.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java?cvsroot=classpath&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Component.java?cvsroot=classpath&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7793&r2=1.7794

Patches:
Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- javax/swing/plaf/basic/BasicLookAndFeel.java	13 Jun 2006 09:28:57 -0000	1.93
+++ javax/swing/plaf/basic/BasicLookAndFeel.java	13 Jun 2006 12:37:53 -0000	1.94
@@ -79,7 +79,9 @@
 import javax.swing.plaf.InsetsUIResource;
 
 /**
- * BasicLookAndFeel
+ * A basic implementation of Swing's Look and Feel framework. This can serve
+ * as a base for custom look and feel implementations.
+ *
  * @author Andrew Selkirk
  */
 public abstract class BasicLookAndFeel extends LookAndFeel
@@ -126,8 +128,12 @@
       Component target = ev.getComponent();
       if (target instanceof Container)
         target = ((Container) target).findComponentAt(ev.getPoint());
-      if (! m.isComponentPartOfCurrentMenu(target))
+      if (m.getSelectedPath().length > 0
+          && ! m.isComponentPartOfCurrentMenu(target))
+        {
         m.clearSelectedPath();
+          ev.consume();
+        }
     }
 
   }
@@ -197,6 +203,9 @@
    */
   private transient PopupHelper popupHelper;
 
+  /**
+   * Maps the audio actions for this l&f.
+   */
   private ActionMap audioActionMap;
 
   /**
@@ -425,9 +434,15 @@
   }
 
   /**
-   * loadResourceBundle
-   * @param defaults TODO
+   * Loads the resource bundle in 'resources/basic' and adds the contained
+   * key/value pairs to the <code>defaults</code> table.
+   *
+   * @param defaults the UI defaults to load the resources into
    */
+  // FIXME: This method is not used atm and private and thus could be removed.
+  // However, I consider this method useful for providing localized
+  // descriptions and similar stuff and therefore think that we should use it
+  // instead and provide the resource bundles.
   private void loadResourceBundle(UIDefaults defaults)
   {
     ResourceBundle bundle;
@@ -446,7 +461,9 @@
   }
 
   /**
-   * initComponentDefaults
+   * Populates the <code>defaults</code> table with UI default values for
+   * colors, fonts, keybindings and much more.
+   *
    * @param defaults  the defaults table (<code>null</code> not permitted).
    */
   protected void initComponentDefaults(UIDefaults defaults)

Index: java/awt/Component.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Component.java,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- java/awt/Component.java	4 Jun 2006 20:21:39 -0000	1.120
+++ java/awt/Component.java	13 Jun 2006 12:37:54 -0000	1.121
@@ -1739,9 +1739,8 @@
         if (gfx == null && parent != null)
           {
             gfx = parent.getGraphics();
-            Rectangle bounds = getBounds();
-            gfx.setClip(bounds);
-            gfx.translate(bounds.x, bounds.y);
+            gfx.clipRect(getX(), getY(), getWidth(), getHeight());
+            gfx.translate(getX(), getY());
             return gfx;
           }
         gfx.setFont(font);
@@ -2315,6 +2314,7 @@
 
     // Some subclasses in the AWT package need to override this behavior,
     // hence the use of dispatchEventImpl().
+    if (! e.isConsumed())
     dispatchEventImpl(e);
   }
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7793
retrieving revision 1.7794
diff -u -b -r1.7793 -r1.7794
--- ChangeLog	13 Jun 2006 09:28:56 -0000	1.7793
+++ ChangeLog	13 Jun 2006 12:37:54 -0000	1.7794
@@ -1,3 +1,14 @@
+2006-06-13  Roman Kennke  <kennke@aicas.com>
+
+	* java/awt/Component.java
+	(getGraphics): Translate child graphics correctly.
+	(dispatchEvent): Only dispatch event if it hasn't been consumed
+	yet by the global dispatcher.
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	Added some API docs.
+	(PopupHelper.mousePressed): Consume the event after closing
+	opened menus.
+
 2006-06-13  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/plaf/basic/BasicCheckBoxUI.java: Source code formatting 



From MAILER-DAEMON Tue Jun 13 08:59:27 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fq8UR-0002UC-1j
	for mharc-commit-classpath@gnu.org; Tue, 13 Jun 2006 08:59:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fq8UP-0002Tg-Nw
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 08:59:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fq8UO-0002Rx-Kg
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 08:59:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fq8UO-0002Rn-3H
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 08:59:24 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fq8dK-0001hW-Rb
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 09:08:38 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fq8UN-0004oq-00
	for <commit-classpath@gnu.org>; Tue, 13 Jun 2006 08:59:23 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1Fq8UM-0004on-Uu
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 12:59:23 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fq8UM-0004on-Uu@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Tue, 13 Jun 2006 12:59:22 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Cairo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 12:59:26 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/13 12:59:22

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 
	                       ComponentGraphics.java 

Log message:
	       * gnu/java/awt/peer/gtk/CairoGraphics2D.java (drawImage): Don't
	       allocate unused AffineTransform. Add comment about conversion to
	       BufferedImage.
	       * gnu/java/awt/peer/gtk/ComponentGraphics.java (drawImage):
	       Recognize identity transform as "easy". Always convert to
	       BufferedImage before calling super.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7794&r2=1.7795
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java?cvsroot=classpath&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7794
retrieving revision 1.7795
diff -u -b -r1.7794 -r1.7795
--- ChangeLog	13 Jun 2006 12:37:54 -0000	1.7794
+++ ChangeLog	13 Jun 2006 12:59:19 -0000	1.7795
@@ -1,3 +1,12 @@
+2006-06-13  Mark Wielaard  <mark@klomp.org>
+
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java (drawImage): Don't
+	allocate unused AffineTransform. Add comment about conversion to
+	BufferedImage.
+	* gnu/java/awt/peer/gtk/ComponentGraphics.java (drawImage):
+	Recognize identity transform as "easy". Always convert to
+	BufferedImage before calling super.
+
 2006-06-13  Roman Kennke  <kennke@aicas.com>
 
 	* java/awt/Component.java

Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java	12 Jun 2006 21:10:11 -0000	1.21
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java	13 Jun 2006 12:59:22 -0000	1.22
@@ -1144,7 +1144,7 @@
     // other way around. Therefore to get the "user -> pixel" transform 
     // that cairo wants from "image -> user" transform that we currently
     // have, we will need to invert the transformation matrix.
-    AffineTransform invertedXform = new AffineTransform();
+    AffineTransform invertedXform;
 
     try
       {
@@ -1157,6 +1157,9 @@
       }
 
     // Unrecognized image - convert to a BufferedImage
+    // Note - this can get us in trouble when the gdk lock is re-acquired.
+    // for example by VolatileImage. See ComponentGraphics for how we work
+    // around this.
     if( !(img instanceof BufferedImage) )
       {
 	ImageProducer source = img.getSource();

Index: gnu/java/awt/peer/gtk/ComponentGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gnu/java/awt/peer/gtk/ComponentGraphics.java	12 Jun 2006 21:10:11 -0000	1.15
+++ gnu/java/awt/peer/gtk/ComponentGraphics.java	13 Jun 2006 12:59:22 -0000	1.16
@@ -46,6 +46,7 @@
 import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.Shape;
+import java.awt.Toolkit;
 import java.awt.Point;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
@@ -53,6 +54,7 @@
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.ImageObserver;
+import java.awt.image.ImageProducer;
 import java.awt.image.ImagingOpException;
 import java.awt.image.RenderedImage;
 
@@ -277,33 +279,84 @@
   
   public boolean drawImage(Image img, int x, int y, ImageObserver observer)
   {
-    if (img instanceof GtkVolatileImage
-        && transform.getType() == AffineTransform.TYPE_TRANSLATION)
+    // If it is a GtkVolatileImage with an "easy" transform then
+    // draw directly. Always pass a BufferedImage to super to avoid
+    // deadlock (see Note in CairoGraphics.drawImage()).
+    if (img instanceof GtkVolatileImage)
+      {
+        GtkVolatileImage vimg = (GtkVolatileImage) img;
+	int type = transform.getType();
+	if (type == AffineTransform.TYPE_IDENTITY)
+	  {
+	    drawVolatile(component, vimg.nativePointer,
+			 x, y, vimg.width, vimg.height);
+	    return true;
+	  }
+	  else if (type == AffineTransform.TYPE_TRANSLATION)
       {
         x += transform.getTranslateX();
         y += transform.getTranslateY();
-        GtkVolatileImage vimg = (GtkVolatileImage) img;
-	drawVolatile( component, vimg.nativePointer,
-                      x, y, vimg.width, vimg.height );
+	    drawVolatile(component, vimg.nativePointer,
+			 x, y, vimg.width, vimg.height);
 	return true;
       }      
-    return super.drawImage( img, x, y, observer );
+	else
+	  return super.drawImage(vimg.getSnapshot(), x, y, observer);
+      }
+
+    BufferedImage bimg;
+    if (img instanceof BufferedImage)
+      bimg = (BufferedImage) img;
+    else
+      {
+	ImageProducer source = img.getSource();
+        if (source == null)
+          return false;
+        bimg = (BufferedImage) Toolkit.getDefaultToolkit().createImage(source);
+      }
+    return super.drawImage(bimg, x, y, observer);
   }
   
   public boolean drawImage(Image img, int x, int y, int width, int height,
                            ImageObserver observer)
   {
-    if( img instanceof GtkVolatileImage
-        && transform.getType() == AffineTransform.TYPE_TRANSLATION)
+    // If it is a GtkVolatileImage with an "easy" transform then
+    // draw directly. Always pass a BufferedImage to super to avoid
+    // deadlock (see Note in CairoGraphics.drawImage()).
+    if (img instanceof GtkVolatileImage)
+      {
+        GtkVolatileImage vimg = (GtkVolatileImage) img;
+	int type = transform.getType();
+	if (type == AffineTransform.TYPE_IDENTITY)
+	  {
+	    drawVolatile(component, vimg.nativePointer,
+			 x, y, width, height);
+	    return true;
+	  }
+	  else if (type == AffineTransform.TYPE_TRANSLATION)
       {
         x += transform.getTranslateX();
         y += transform.getTranslateY();
-        GtkVolatileImage vimg = (GtkVolatileImage) img;
-	drawVolatile( component, vimg.nativePointer, x, y, 
-		      width, height );
+	    drawVolatile(component, vimg.nativePointer,
+			 x, y, width, height);
 	return true;
       }      
-    return super.drawImage( img, x, y, width, height, observer );
+	else
+	  return super.drawImage(vimg.getSnapshot(), x, y,
+				 width, height, observer);
+      }
+
+    BufferedImage bimg;
+    if (img instanceof BufferedImage)
+      bimg = (BufferedImage) img;
+    else
+      {
+	ImageProducer source = img.getSource();
+        if (source == null)
+          return false;
+        bimg = (BufferedImage) Toolkit.getDefaultToolkit().createImage(source);
+      }
+    return super.drawImage(bimg, x, y, width, height, observer);
   }
 
 }



From MAILER-DAEMON Tue Jun 13 10:18:25 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fq9ir-0006Fc-3y
	for mharc-commit-classpath@gnu.org; Tue, 13 Jun 2006 10:18:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fq9ip-0006FH-JE
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 10:18:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fq9io-0006EX-3L
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 10:18:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fq9in-0006EU-Ri
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 10:18:21 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fq9rl-0000Lj-JM
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 10:27:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fq9in-0007Be-00
	for <commit-classpath@gnu.org>; Tue, 13 Jun 2006 10:18:21 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1Fq9il-0007Ba-53
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 14:18:20 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fq9il-0007Ba-53@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Tue, 13 Jun 2006 14:18:19 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/image/PixelGrabber...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 14:18:24 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/13 14:18:18

Modified files:
	.              : ChangeLog 
	java/awt/image : PixelGrabber.java 

Log message:
	2006-06-13  Lillian Angel  <langel@redhat.com>
	
	        * java/awt/image/PixelGrabber.java
	        (PixelGrabber): Removed check to throw exception. JDK does
	        not do this.
	        (startGrabbing): Removed line to print stacktrace.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7795&r2=1.7796
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/image/PixelGrabber.java?cvsroot=classpath&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7795
retrieving revision 1.7796
diff -u -b -r1.7795 -r1.7796
--- ChangeLog	13 Jun 2006 12:59:19 -0000	1.7795
+++ ChangeLog	13 Jun 2006 14:18:15 -0000	1.7796
@@ -1,3 +1,10 @@
+2006-06-13  Lillian Angel  <langel@redhat.com>
+
+	* java/awt/image/PixelGrabber.java
+	(PixelGrabber): Removed check to throw exception. JDK does
+	not do this.
+	(startGrabbing): Removed line to print stacktrace. 
+
 2006-06-13  Mark Wielaard  <mark@klomp.org>
 
 	* gnu/java/awt/peer/gtk/CairoGraphics2D.java (drawImage): Don't

Index: java/awt/image/PixelGrabber.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/PixelGrabber.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- java/awt/image/PixelGrabber.java	18 Aug 2005 13:45:44 -0000	1.15
+++ java/awt/image/PixelGrabber.java	13 Jun 2006 14:18:18 -0000	1.16
@@ -131,9 +131,6 @@
   public PixelGrabber(ImageProducer ip, int x, int y, int w, int h,
 		      int pix[], int off, int scansize)
   {
-    if (ip == null)
-      throw new NullPointerException("The ImageProducer must not be null.");
-
     this.ip = ip;
     this.x = x;
     this.y = y;
@@ -222,7 +219,6 @@
                 }
               catch (Exception ex)
                 {
-                  ex.printStackTrace();
                   imageComplete(ImageConsumer.IMAGEABORTED);
                 }
 	    }



From MAILER-DAEMON Tue Jun 13 11:10:42 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqAXS-0000ce-Ny
	for mharc-commit-classpath@gnu.org; Tue, 13 Jun 2006 11:10:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqAXR-0000bX-TT
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 11:10:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqAXR-0000av-D6
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 11:10:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqAXR-0000as-63
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 11:10:41 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqAgP-0005yP-78
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 11:19:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqAXP-00017V-00
	for <commit-classpath@gnu.org>; Tue, 13 Jun 2006 11:10:39 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FqAXP-00017Q-C2
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 15:10:39 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqAXP-00017Q-C2@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Tue, 13 Jun 2006 15:10:39 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 15:10:42 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/13 15:10:39

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicSliderUI.java 

Log message:
	2006-06-13  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/plaf/basic/BasicSliderUI.java
		(calculateThumbSize): Removed unnecessary code,
		(calculateThumbLocation): Shift position by one,
		(calculateTickRect): Shift position by one when ticks are displayed,
		(calculateLabelRect): Calculate rect differently according to whether
		or not the labels are visible,
		(paintTrack): Shift track down one pixel.
	----------------------------------------------------------------------

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7796&r2=1.7797
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicSliderUI.java?cvsroot=classpath&r1=1.31&r2=1.32

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7796
retrieving revision 1.7797
diff -u -b -r1.7796 -r1.7797
--- ChangeLog	13 Jun 2006 14:18:15 -0000	1.7796
+++ ChangeLog	13 Jun 2006 15:10:36 -0000	1.7797
@@ -1,3 +1,13 @@
+2006-06-13  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/plaf/basic/BasicSliderUI.java
+	(calculateThumbSize): Removed unnecessary code,
+	(calculateThumbLocation): Shift position by one,
+	(calculateTickRect): Shift position by one when ticks are displayed,
+	(calculateLabelRect): Calculate rect differently according to whether
+	or not the labels are visible,
+	(paintTrack): Shift track down one pixel.
+
 2006-06-13  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/image/PixelGrabber.java

Index: javax/swing/plaf/basic/BasicSliderUI.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/basic/BasicSliderUI.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- javax/swing/plaf/basic/BasicSliderUI.java	13 Jun 2006 09:28:57 -0000	1.31
+++ javax/swing/plaf/basic/BasicSliderUI.java	13 Jun 2006 15:10:38 -0000	1.32
@@ -1151,10 +1151,6 @@
     Dimension d = getThumbSize();
     thumbRect.width = d.width;
     thumbRect.height = d.height;
-    if (slider.getOrientation() == JSlider.HORIZONTAL)
-      thumbRect.y = trackRect.y;
-    else
-      thumbRect.x = trackRect.x;
   }
 
   /**
@@ -1188,11 +1184,11 @@
     if (slider.getOrientation() == JSlider.HORIZONTAL)
       {
         thumbRect.x = xPositionForValue(value) - thumbRect.width / 2;
-        thumbRect.y = trackRect.y;
+        thumbRect.y = trackRect.y + 1;
       }
     else
       {
-        thumbRect.x = trackRect.x;
+        thumbRect.x = trackRect.x + 1;
         thumbRect.y = yPositionForValue(value) - thumbRect.height / 2;
       }
   }
@@ -1299,6 +1295,10 @@
         tickRect.width = trackRect.width;
         tickRect.height = slider.getPaintTicks() ? getTickLength() : 0;
 
+        // this makes our Mauve tests pass...can't explain it!
+        if (!slider.getPaintTicks())
+          tickRect.y--;
+
         if (tickRect.y + tickRect.height > contentRect.y + contentRect.height)
           tickRect.height = contentRect.y + contentRect.height - tickRect.y;
       }
@@ -1309,31 +1309,53 @@
         tickRect.width = slider.getPaintTicks() ? getTickLength() : 0;
         tickRect.height = trackRect.height;
 
+        // this makes our Mauve tests pass...can't explain it!
+        if (!slider.getPaintTicks())
+          tickRect.x--;
+
         if (tickRect.x + tickRect.width > contentRect.x + contentRect.width)
           tickRect.width = contentRect.x + contentRect.width - tickRect.x;
       }
   }
 
   /**
-   * This method calculates the size and position of the labelRect. It must
-   * take into account the orientation of the slider.
+   * Calculates the <code>labelRect</code> field, taking into account the 
+   * orientation of the slider.
    */
   protected void calculateLabelRect()
   {
     if (slider.getOrientation() == JSlider.HORIZONTAL)
       {
+        if (slider.getPaintLabels())
+          {
         labelRect.x = contentRect.x;
-        labelRect.y = tickRect.y + tickRect.height;
+            labelRect.y = tickRect.y + tickRect.height - 1;
         labelRect.width = contentRect.width;
+          }
+        else
+          {
+            labelRect.x = trackRect.x;
+            labelRect.y = tickRect.y + tickRect.height;
+            labelRect.width = trackRect.width;
+          }
         labelRect.height = getHeightOfTallestLabel();
       }
     else
       {
-        labelRect.x = tickRect.x + tickRect.width;
+        if (slider.getPaintLabels())
+          {
+            labelRect.x = tickRect.x + tickRect.width - 1;
         labelRect.y = contentRect.y;
-        labelRect.width = getWidthOfWidestLabel();
         labelRect.height = contentRect.height;
       }
+        else
+          {
+            labelRect.x = tickRect.x + tickRect.width;
+            labelRect.y = trackRect.y;
+            labelRect.height = trackRect.height;
+          }
+        labelRect.width = getWidthOfWidestLabel();
+      }
   }
 
   /**
@@ -1643,7 +1665,7 @@
     int width;
     int height;
 
-    Point a = new Point(trackRect.x, trackRect.y);
+    Point a = new Point(trackRect.x, trackRect.y + 1);
     Point b = new Point(a);
     Point c = new Point(a);
     Point d = new Point(a);



From MAILER-DAEMON Tue Jun 13 11:17:14 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqAdm-00039Y-7q
	for mharc-commit-classpath@gnu.org; Tue, 13 Jun 2006 11:17:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqAdj-00039H-OV
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 11:17:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqAdi-000395-OU
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 11:17:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqAdi-000392-Ie
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 11:17:10 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqAmg-0006Ve-MX
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 11:26:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqAdh-0001TX-00
	for <commit-classpath@gnu.org>; Tue, 13 Jun 2006 11:17:09 -0400
Received: from keiths by savannah.gnu.org with local (Exim 4.50)
	id 1FqAdh-0001TS-5s
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 15:17:09 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqAdh-0001TS-5s@savannah.gnu.org>
From: Keith Seitz <keiths@redhat.com>
Date: Tue, 13 Jun 2006 15:17:09 +0000
Subject: [commit-cp] classpath ChangeLog gnu/classpath/jdwp/event/Cl...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 15:17:12 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Keith Seitz <keiths>	06/06/13 15:17:08

Modified files:
	.              : ChangeLog 
Added files:
	gnu/classpath/jdwp/event: ClassUnloadEvent.java 

Log message:
	        From Kyle Galloway  <kgallowa@redhat.com>:
	        * gnu/classpath/jdwp/event/ClassUnloadEvent.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7797&r2=1.7798
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/ClassUnloadEvent.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7797
retrieving revision 1.7798
diff -u -b -r1.7797 -r1.7798
--- ChangeLog	13 Jun 2006 15:10:36 -0000	1.7797
+++ ChangeLog	13 Jun 2006 15:17:07 -0000	1.7798
@@ -1,3 +1,8 @@
+2006-06-13  Keith Seitz  <keiths@redhat.com>
+
+	From Kyle Galloway  <kgallowa@redhat.com>:
+	* gnu/classpath/jdwp/event/ClassUnloadEvent.java: New file.
+
 2006-06-13  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/plaf/basic/BasicSliderUI.java

Index: gnu/classpath/jdwp/event/ClassUnloadEvent.java
===================================================================
RCS file: gnu/classpath/jdwp/event/ClassUnloadEvent.java
diff -N gnu/classpath/jdwp/event/ClassUnloadEvent.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/jdwp/event/ClassUnloadEvent.java	13 Jun 2006 15:17:08 -0000	1.1
@@ -0,0 +1,96 @@
+/* ClassUnloadEvent.java -- event generated when a class is unloaded
+ Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library.  Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module.  An independent module is a module which is not derived from
+ or based on this library.  If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so.  If you do not wish to do so, delete this
+ exception statement from your version. */
+
+
+package gnu.classpath.jdwp.event;
+
+import gnu.classpath.jdwp.JdwpConstants;
+import gnu.classpath.jdwp.VMIdManager;
+import gnu.classpath.jdwp.util.JdwpString;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * "Notification of a class unload in the target VM" -- JDWP 1.4.2
+ * 
+ * @author Kyle Galloway (kgallowa@redhat.com)
+ */
+public class ClassUnloadEvent
+    extends Event
+{
+  //signature directly from VM
+  private String _signature;
+
+  /**
+   * Constructs a new <code>ClassUnloadEvent</code>
+   * 
+   * @param signature the signature reported from the VM
+   */
+  public ClassUnloadEvent(String signature)
+  {
+    super(JdwpConstants.EventKind.CLASS_UNLOAD);
+    _signature = signature;
+  }
+
+  /**
+   * Returns a specific filtering parameter for this event. Class is the only
+   * valid type.
+   * 
+   * @param type the type of parameter desired
+   * @returns the desired parameter or <code>null</code>
+   */
+  public Object getParameter(int type)
+  {
+
+    return null;
+  }
+
+  /**
+   * Writes the event to the given stream
+   * 
+   * @param outStream the output stream to write the event to
+   */
+  protected void _writeData(DataOutputStream outStream) 
+    throws IOException
+  {
+    VMIdManager idm = VMIdManager.getDefault();
+
+    JdwpString.writeString(outStream, _signature);
+  }
+
+}



From MAILER-DAEMON Tue Jun 13 11:59:42 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqBIs-00007a-8F
	for mharc-commit-classpath@gnu.org; Tue, 13 Jun 2006 11:59:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqBIq-0008UL-Fi
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 11:59:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqBIp-0008S8-Jt
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 11:59:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqBIp-0008S4-FC
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 11:59:39 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqBRn-0001ki-OC
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 12:08:55 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqBIo-0003Wz-00
	for <commit-classpath@gnu.org>; Tue, 13 Jun 2006 11:59:38 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FqBIm-0003Wu-Ml
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 15:59:37 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqBIm-0003Wu-Ml@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Tue, 13 Jun 2006 15:59:36 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Cairo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 15:59:40 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/13 15:59:36

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoSurface.java 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_CairoSurface.c 

Log message:
	2006-06-13  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/CairoSurface.java
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
		(create): Use stride in ints.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7798&r2=1.7799
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoSurface.java?cvsroot=classpath&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c?cvsroot=classpath&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7798
retrieving revision 1.7799
diff -u -b -r1.7798 -r1.7799
--- ChangeLog	13 Jun 2006 15:17:07 -0000	1.7798
+++ ChangeLog	13 Jun 2006 15:59:35 -0000	1.7799
@@ -1,3 +1,9 @@
+2006-06-13  Sven de Marothy  <sven@physto.se>
+
+	* gnu/java/awt/peer/gtk/CairoSurface.java
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
+	(create): Use stride in ints.
+
 2006-06-13  Keith Seitz  <keiths@redhat.com>
 
 	From Kyle Galloway  <kgallowa@redhat.com>:

Index: gnu/java/awt/peer/gtk/CairoSurface.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/CairoSurface.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnu/java/awt/peer/gtk/CairoSurface.java	12 Jun 2006 10:32:44 -0000	1.9
+++ gnu/java/awt/peer/gtk/CairoSurface.java	13 Jun 2006 15:59:36 -0000	1.10
@@ -88,7 +88,7 @@
   /**
    * Allocates and clears the buffer and creates the cairo surface.
    * @param width, height - the image size
-   * @param stride - the buffer row stride.
+   * @param stride - the buffer row stride. (in ints)
    */
   private native void create(int width, int height, int stride);
 
@@ -146,7 +146,7 @@
    * The format will be ARGB32 with premultiplied alpha and native bit 
    * and word ordering.
    */
-  CairoSurface(int width, int height)
+  public CairoSurface(int width, int height)
   {
     super(DataBuffer.TYPE_INT, width * height);
 
@@ -156,7 +156,7 @@
     this.width = width;
     this.height = height;
 
-    create(width, height, width * 4);
+    create(width, height, width);
 
     if(surfacePointer == 0 || bufferPointer == 0)
       throw new Error("Could not allocate bitmap.");
@@ -176,7 +176,7 @@
     width = image.width;
     height = image.height;
 
-    create(width, height, width * 4);
+    create(width, height, width);
     
     if(surfacePointer == 0 || bufferPointer == 0)
       throw new Error("Could not allocate bitmap.");

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c	12 Jun 2006 10:32:44 -0000	1.19
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c	13 Jun 2006 15:59:36 -0000	1.20
@@ -64,7 +64,7 @@
   setNativeObject(env, obj, data, BUFFER);
 
   surface = cairo_image_surface_create_for_data
-    (data, CAIRO_FORMAT_ARGB32, width, height, stride);
+    (data, CAIRO_FORMAT_ARGB32, width, height, stride * 4);
 
   setNativeObject(env, obj, surface, SURFACE);
 }



From MAILER-DAEMON Tue Jun 13 14:08:25 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqDJR-0000jX-Rx
	for mharc-commit-classpath@gnu.org; Tue, 13 Jun 2006 14:08:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqDJQ-0000jS-9Q
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 14:08:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqDJO-0000jG-Q4
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 14:08:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqDJO-0000jD-LO
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 14:08:22 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqDSO-0004HN-EK
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 14:17:40 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqDJN-0007kT-00
	for <commit-classpath@gnu.org>; Tue, 13 Jun 2006 14:08:21 -0400
Received: from keiths by savannah.gnu.org with local (Exim 4.50)
	id 1FqDJN-0007kQ-ES
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 18:08:21 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqDJN-0007kQ-ES@savannah.gnu.org>
From: Keith Seitz <keiths@redhat.com>
Date: Tue, 13 Jun 2006 18:08:21 +0000
Subject: [commit-cp] classpath ChangeLog gnu/classpath/jdwp/event/Br...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 18:08:24 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Keith Seitz <keiths>	06/06/13 18:08:21

Modified files:
	.              : ChangeLog 
	gnu/classpath/jdwp/event: BreakpointEvent.java 
	gnu/classpath/jdwp/event/filters: ExceptionOnlyFilter.java 

Log message:
	From Kyle Galloway  <kgallowa@redhat.com>:
	        * gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
	        (ExceptionOnlyFilter): Allow null refId.
	
	        * gnu/classpath/jdwp/event/BreakpointEvent.java: Added _instance for
	        compatibility with filters.
	        (getParameter): Modified to allow access to above.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7799&r2=1.7800
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/BreakpointEvent.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java?cvsroot=classpath&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7799
retrieving revision 1.7800
diff -u -b -r1.7799 -r1.7800
--- ChangeLog	13 Jun 2006 15:59:35 -0000	1.7799
+++ ChangeLog	13 Jun 2006 18:08:20 -0000	1.7800
@@ -1,3 +1,13 @@
+2006-06-13  Keith Seitz  <keiths@redhat.com>
+
+	From Kyle Galloway  <kgallowa@redhat.com>:
+	* gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
+	(ExceptionOnlyFilter): Allow null refId.
+
+	* gnu/classpath/jdwp/event/BreakpointEvent.java: Added _instance for
+	compatibility with filters.
+	(getParameter): Modified to allow access to above. 
+
 2006-06-13  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/peer/gtk/CairoSurface.java

Index: gnu/classpath/jdwp/event/BreakpointEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/BreakpointEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/classpath/jdwp/event/BreakpointEvent.java	12 Jun 2006 19:43:26 -0000	1.2
+++ gnu/classpath/jdwp/event/BreakpointEvent.java	13 Jun 2006 18:08:21 -0000	1.3
@@ -63,17 +63,22 @@
   // Location where breakpoint occurred
   private Location _location;
 
+  //object instance
+  private Object _instance;
+
   /**
    * Constructs a new BreakpointEvent
    *
    * @param thread  thread in which event occurred
    * @param loc     location where breakpoint occurred
+   * @param instance object instance
    */
-  public BreakpointEvent(Thread thread, Location loc)
+  public BreakpointEvent(Thread thread, Location loc, Object instance)
   {
     super(JdwpConstants.EventKind.BREAKPOINT);
     _thread = thread;
     _location = loc;
+    _instance = instance;
   }
 
   /**
@@ -89,6 +94,8 @@
       return _thread;
     else if (type == EVENT_LOCATION)
       return _location;
+    else if (type == EVENT_INSTANCE)
+      return _instance;
 
     return null;
   }

Index: gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java	12 Jun 2006 20:39:16 -0000	1.3
+++ gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java	13 Jun 2006 18:08:21 -0000	1.4
@@ -61,7 +61,7 @@
   /**
    * Constructs a new ExceptionOnlyFilter
    *
-   * @param  refId     ID of the exception to report
+   * @param  refId     ID of the exception to report(null for all exceptions)
    * @param  caught    Report caught exceptions
    * @param  uncaught  Report uncaught exceptions
    * @throws InvalidClassException if refid is invalid
@@ -70,8 +70,8 @@
 			      boolean uncaught)
     throws InvalidClassException
   {
-    if (refId == null || refId.getReference().get () == null)
-      throw new InvalidClassException (refId.getId ());
+    if (refId != null && refId.getReference().get() == null)
+      throw new InvalidClassException(refId.getId());
 
     _refId = refId;
     _caught = caught;
@@ -96,21 +96,28 @@
    */
   public boolean matches(Event event)
   {
-    boolean classMatch;
+    boolean classMatch = true;
     
+    // if not allowing all exceptions check if the exception matches
+    if (_refId != null)
+      {
     try
       {
-	Class klass = (Class) event.getParameter(Event.EVENT_EXCEPTION_CLASS);
+            Class klass 
+              = (Class) event.getParameter(Event.EVENT_EXCEPTION_CLASS);
         classMatch = klass == _refId.getType();
       }
     catch (InvalidClassException ex)
       {
         classMatch = false;
       }
+      }
     
+    // check against the caught and uncaught options
     Boolean caught
       = (Boolean) event.getParameter(Event.EVENT_EXCEPTION_CAUGHT);
 
     return classMatch && (caught.booleanValue()) ? _caught : _uncaught;
   }
+  
 }



From MAILER-DAEMON Tue Jun 13 15:01:05 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqE8P-0008Ds-Gk
	for mharc-commit-classpath@gnu.org; Tue, 13 Jun 2006 15:01:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqE8O-0008B6-4b
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 15:01:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqE8N-00089V-Ic
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 15:01:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqE8N-00089N-FZ
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 15:01:03 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqEHM-0000SZ-4r
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 15:10:20 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqE89-0001Fm-00
	for <commit-classpath@gnu.org>; Tue, 13 Jun 2006 15:00:49 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FqE88-0001Fi-EF
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 19:00:49 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqE88-0001Fi-EF@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Tue, 13 Jun 2006 19:00:48 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/image/PixelGrabber...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 19:01:04 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/13 19:00:48

Modified files:
	.              : ChangeLog 
	java/awt/image : PixelGrabber.java 

Log message:
	2006-06-13  Lillian Angel  <langel@redhat.com>
	
	        * java/awt/image/PixelGrabber.java
	        (PixelGrabber): Added to API documentation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7800&r2=1.7801
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/image/PixelGrabber.java?cvsroot=classpath&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7800
retrieving revision 1.7801
diff -u -b -r1.7800 -r1.7801
--- ChangeLog	13 Jun 2006 18:08:20 -0000	1.7800
+++ ChangeLog	13 Jun 2006 19:00:47 -0000	1.7801
@@ -1,3 +1,8 @@
+2006-06-13  Lillian Angel  <langel@redhat.com>
+
+	* java/awt/image/PixelGrabber.java
+	(PixelGrabber): Added to API documentation.
+
 2006-06-13  Keith Seitz  <keiths@redhat.com>
 
 	From Kyle Galloway  <kgallowa@redhat.com>:

Index: java/awt/image/PixelGrabber.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/PixelGrabber.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- java/awt/image/PixelGrabber.java	13 Jun 2006 14:18:18 -0000	1.16
+++ java/awt/image/PixelGrabber.java	13 Jun 2006 19:00:48 -0000	1.17
@@ -112,7 +112,8 @@
    * in the grab rectangle will be stored at
    * <code>pix[(n - y) * scansize + (m - x) + off]</code>.
    *
-   * @param ip the ImageProducer from which to grab pixels
+   * @param ip the ImageProducer from which to grab pixels. This can
+   * be null.
    * @param x the x coordinate of the grab rectangle's top-left pixel,
    * specified relative to the top-left corner of the image produced
    * by <code>ip</code>



From MAILER-DAEMON Tue Jun 13 15:41:28 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqElT-00083h-Uy
	for mharc-commit-classpath@gnu.org; Tue, 13 Jun 2006 15:41:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqElS-00081y-1L
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 15:41:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqElQ-00080Z-LP
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 15:41:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqElQ-00080J-Er
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 15:41:24 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqEuR-00037B-6d
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 15:50:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqElP-00035f-00
	for <commit-classpath@gnu.org>; Tue, 13 Jun 2006 15:41:23 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FqElP-00035X-9p
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 19:41:23 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqElP-00035X-9p@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Tue, 13 Jun 2006 19:41:23 +0000
Subject: [commit-cp] classpath java/awtComponent.java javax/swing/pl...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 19:41:26 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/13 19:41:23

Modified files:
	java/awt       : Component.java 
	javax/swing/plaf/basic: BasicLookAndFeel.java 
	                        BasicArrowButton.java 
	.              : ChangeLog 

Log message:
	2006-06-13  Roman Kennke  <kennke@aicas.com>
	
		* java/awt/Component.java
		(dispatchEvent): Handle events even when consumed (this might be
		picked up later in the dispatching chain).
		* javax/swing/plaf/basic/BasicLookAndFeel.java
		(PopupHelper.mousePressed): Don't consume event. Only close popup
		when target component isn't flagged as DONT_CANCEL_POPUP.
		(DONT_CANCEL_POPUP): New package private constant for flagging
		special components that don't trigger popup closing.
		* javax/swing/plaf/basic/BasicArrowButton.java
		(BasicArrowButton): Set client property for not triggering closing
		of popups.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Component.java?cvsroot=classpath&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java?cvsroot=classpath&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicArrowButton.java?cvsroot=classpath&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7801&r2=1.7802

Patches:
Index: java/awt/Component.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Component.java,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- java/awt/Component.java	13 Jun 2006 12:37:54 -0000	1.121
+++ java/awt/Component.java	13 Jun 2006 19:41:22 -0000	1.122
@@ -2314,7 +2314,6 @@
 
     // Some subclasses in the AWT package need to override this behavior,
     // hence the use of dispatchEventImpl().
-    if (! e.isConsumed())
       dispatchEventImpl(e);
   }
 

Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- javax/swing/plaf/basic/BasicLookAndFeel.java	13 Jun 2006 12:37:53 -0000	1.94
+++ javax/swing/plaf/basic/BasicLookAndFeel.java	13 Jun 2006 19:41:22 -0000	1.95
@@ -132,7 +132,6 @@
           && ! m.isComponentPartOfCurrentMenu(target))
         {
           m.clearSelectedPath();
-          ev.consume();
         }
     }
 
@@ -199,6 +198,14 @@
   static final long serialVersionUID = -6096995660290287879L;
 
   /**
+   * This is a key for a client property that tells the PopupHelper that
+   * it shouldn't close popups when the mouse event target has this
+   * property set. This is used when the component handles popup closing
+   * itself.
+   */
+  static final String DONT_CANCEL_POPUP = "noCancelPopup";
+
+  /**
    * Helps closing menu popups when user clicks outside of the menu area.
    */
   private transient PopupHelper popupHelper;

Index: javax/swing/plaf/basic/BasicArrowButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicArrowButton.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- javax/swing/plaf/basic/BasicArrowButton.java	24 Nov 2005 18:19:18 -0000	1.17
+++ javax/swing/plaf/basic/BasicArrowButton.java	13 Jun 2006 19:41:22 -0000	1.18
@@ -116,6 +116,8 @@
     this.shadow = shadow;
     this.darkShadow = darkShadow;
     this.highlight = highlight;
+    // Mark the button as not closing the popup, we handle this ourselves.
+    putClientProperty(BasicLookAndFeel.DONT_CANCEL_POPUP, Boolean.TRUE);
   }
 
   /**

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7801
retrieving revision 1.7802
diff -u -b -r1.7801 -r1.7802
--- ChangeLog	13 Jun 2006 19:00:47 -0000	1.7801
+++ ChangeLog	13 Jun 2006 19:41:22 -0000	1.7802
@@ -1,3 +1,17 @@
+2006-06-13  Roman Kennke  <kennke@aicas.com>
+
+	* java/awt/Component.java
+	(dispatchEvent): Handle events even when consumed (this might be
+	picked up later in the dispatching chain).
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	(PopupHelper.mousePressed): Don't consume event. Only close popup
+	when target component isn't flagged as DONT_CANCEL_POPUP.
+	(DONT_CANCEL_POPUP): New package private constant for flagging
+	special components that don't trigger popup closing.
+	* javax/swing/plaf/basic/BasicArrowButton.java
+	(BasicArrowButton): Set client property for not triggering closing
+	of popups.
+
 2006-06-13  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/image/PixelGrabber.java



From MAILER-DAEMON Tue Jun 13 16:54:08 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqFto-0006vs-HY
	for mharc-commit-classpath@gnu.org; Tue, 13 Jun 2006 16:54:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqFtl-0006vO-Tx
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 16:54:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqFtk-0006vC-6c
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 16:54:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqFtk-0006v9-1U
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 16:54:04 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqG2l-0001Rn-7B
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 17:03:23 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqFtj-0005ON-00
	for <commit-classpath@gnu.org>; Tue, 13 Jun 2006 16:54:03 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FqFth-0005OH-Em
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 20:54:02 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqFth-0005OH-Em@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Tue, 13 Jun 2006 20:54:01 +0000
Subject: [commit-cp] classpath ChangeLog javax/management/AttributeN...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 20:54:06 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/13 20:54:01

Modified files:
	.              : ChangeLog 
Added files:
	javax/management: AttributeNotFoundException.java 
	                  InvalidAttributeValueException.java 
	                  JMException.java MBeanException.java 
	                  OperationsException.java 
	                  ReflectionException.java 

Log message:
	2006-06-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* javax/management/AttributeNotFoundException.java,
		* javax/management/InvalidAttributeValueException.java,
		* javax/management/JMException.java,
		* javax/management/MBeanException.java,
		* javax/management/OperationsException.java,
		* javax/management/ReflectionException.java:
		New files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7802&r2=1.7803
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/AttributeNotFoundException.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/InvalidAttributeValueException.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/JMException.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/MBeanException.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/OperationsException.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/ReflectionException.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7802
retrieving revision 1.7803
diff -u -b -r1.7802 -r1.7803
--- ChangeLog	13 Jun 2006 19:41:22 -0000	1.7802
+++ ChangeLog	13 Jun 2006 20:54:00 -0000	1.7803
@@ -1,3 +1,13 @@
+2006-06-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* javax/management/AttributeNotFoundException.java,
+	* javax/management/InvalidAttributeValueException.java,
+	* javax/management/JMException.java,
+	* javax/management/MBeanException.java,
+	* javax/management/OperationsException.java,
+	* javax/management/ReflectionException.java:
+	New files.
+	
 2006-06-13  Roman Kennke  <kennke@aicas.com>
 
 	* java/awt/Component.java

Index: javax/management/AttributeNotFoundException.java
===================================================================
RCS file: javax/management/AttributeNotFoundException.java
diff -N javax/management/AttributeNotFoundException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/management/AttributeNotFoundException.java	13 Jun 2006 20:54:01 -0000	1.1
@@ -0,0 +1,71 @@
+/* AttributeNotFoundException.java -- Thrown by unknown attributes.
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.management;
+
+/**
+ * Thrown when a attribute is requested but can not be
+ * found.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class AttributeNotFoundException
+  extends OperationsException
+{
+
+  /**
+   * Constructs a new <code>AttributeNotFoundException</code>.
+   */
+  public AttributeNotFoundException()
+  {
+    super();
+  }
+
+  /**
+   * Constructs a new <code>AttributeNotFoundException</code>
+   * with the specified message.
+   *
+   * @param message the error message to give to the user.
+   */
+  public AttributeNotFoundException(String message)
+  {
+    super(message);
+  }
+
+}
+

Index: javax/management/InvalidAttributeValueException.java
===================================================================
RCS file: javax/management/InvalidAttributeValueException.java
diff -N javax/management/InvalidAttributeValueException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/management/InvalidAttributeValueException.java	13 Jun 2006 20:54:01 -0000	1.1
@@ -0,0 +1,71 @@
+/* InvalidAttributeValueException.java -- Thrown by invalid values.
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.management;
+
+/**
+ * Thrown when a value is given for an attribute which
+ * is invalid.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class InvalidAttributeValueException
+  extends OperationsException
+{
+
+  /**
+   * Constructs a new <code>InvalidAttributeValueException</code>.
+   */
+  public InvalidAttributeValueException()
+  {
+    super();
+  }
+
+  /**
+   * Constructs a new <code>InvalidAttributeValueException</code>
+   * with the specified message.
+   *
+   * @param message the error message to give to the user.
+   */
+  public InvalidAttributeValueException(String message)
+  {
+    super(message);
+  }
+
+}
+

Index: javax/management/JMException.java
===================================================================
RCS file: javax/management/JMException.java
diff -N javax/management/JMException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/management/JMException.java	13 Jun 2006 20:54:01 -0000	1.1
@@ -0,0 +1,71 @@
+/* JMException.java -- Thrown by the management classes.
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.management;
+
+/**
+ * A general superclass for all non-runtime management
+ * exceptions.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class JMException
+  extends Exception
+{
+
+  /**
+   * Constructs a new <code>JMException</code>.
+   */
+  public JMException()
+  {
+    super();
+  }
+
+  /**
+   * Constructs a new <code>JMException</code>
+   * with the specified message.
+   *
+   * @param message the error message to give to the user.
+   */
+  public JMException(String message)
+  {
+    super(message);
+  }
+
+}
+

Index: javax/management/MBeanException.java
===================================================================
RCS file: javax/management/MBeanException.java
diff -N javax/management/MBeanException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/management/MBeanException.java	13 Jun 2006 20:54:01 -0000	1.1
@@ -0,0 +1,113 @@
+/* MBeanException.java -- A user-defined management exception.
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.management;
+
+/**
+ * Represents an arbitrary exception thrown by a management
+ * bean.  When a management bean executes code that causes
+ * an exception to be thrown, the resulting exception is
+ * wrapped inside an {@link MBeanException}.  Calling
+ * {@link getTargetException()} will return the wrapped
+ * exception.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class MBeanException
+  extends Exception
+{
+
+  /* Sun re-implemented causality -- don't know why, but
+     serialization demands we do too... */
+
+  /**
+   * The target exception.
+   *
+   * @serial the target exception.
+   */
+  private Exception exception;
+
+  /**
+   * Constructs a new <code>MBeanException</code> wrapping
+   * the specified exception.
+   *
+   * @param e the exception to be wrapped.
+   */
+  public MBeanException(Exception e)
+  {
+    super();
+    exception = e;
+  }
+
+  /**
+   * Constructs a new <code>MBeanException</code> wrapping
+   * the specified exception and using the supplied message.
+   *
+   * @param e the exception to be wrapped.
+   * @param message the error message to give to the user.
+   */
+  public MBeanException(Exception e, String message)
+  {
+    super(message);
+    exception = e;
+  }
+
+  /**
+   * Returns the true cause of this exception, the wrapped
+   * exception.
+   *
+   * @return the wrapped exception.
+   */
+  public Throwable getCause()
+  {
+    return exception;
+  }
+
+  /**
+   * Returns the true cause of this exception, the wrapped
+   * exception.
+   *
+   * @return the wrapped exception.
+   */
+  public Exception getTargetException()
+  {
+    return exception;
+  }
+
+}
+

Index: javax/management/OperationsException.java
===================================================================
RCS file: javax/management/OperationsException.java
diff -N javax/management/OperationsException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/management/OperationsException.java	13 Jun 2006 20:54:01 -0000	1.1
@@ -0,0 +1,71 @@
+/* OperationsException.java -- Thrown by management operations.
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.management;
+
+/**
+ * A general superclass for all exceptions thrown by
+ * operations on management beans.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class OperationsException
+  extends JMException
+{
+
+  /**
+   * Constructs a new <code>OperationsException</code>.
+   */
+  public OperationsException()
+  {
+    super();
+  }
+
+  /**
+   * Constructs a new <code>OperationsException</code>
+   * with the specified message.
+   *
+   * @param message the error message to give to the user.
+   */
+  public OperationsException(String message)
+  {
+    super(message);
+  }
+
+}
+

Index: javax/management/ReflectionException.java
===================================================================
RCS file: javax/management/ReflectionException.java
diff -N javax/management/ReflectionException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/management/ReflectionException.java	13 Jun 2006 20:54:01 -0000	1.1
@@ -0,0 +1,113 @@
+/* ReflectionException.java -- A reflection-based management exception.
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.management;
+
+/**
+ * Represents one of the reflection exceptions thrown by a
+ * management bean.  When a management bean tries to perform
+ * a lookup using the reflection API and encounters an exception,
+ * it gets wrapped inside an {@link ReflectionException}.
+ * Calling {@link getTargetException()} will return the wrapped
+ * exception.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class ReflectionException
+  extends Exception
+{
+
+  /* Sun re-implemented causality -- don't know why, but
+     serialization demands we do too... */
+
+  /**
+   * The target exception.
+   *
+   * @serial the target exception.
+   */
+  private Exception exception;
+
+  /**
+   * Constructs a new <code>ReflectionException</code> wrapping
+   * the specified exception.
+   *
+   * @param e the exception to be wrapped.
+   */
+  public ReflectionException(Exception e)
+  {
+    super();
+    exception = e;
+  }
+
+  /**
+   * Constructs a new <code>ReflectionException</code> wrapping
+   * the specified exception and using the supplied message.
+   *
+   * @param e the exception to be wrapped.
+   * @param message the error message to give to the user.
+   */
+  public ReflectionException(Exception e, String message)
+  {
+    super(message);
+    exception = e;
+  }
+
+  /**
+   * Returns the true cause of this exception, the wrapped
+   * exception.
+   *
+   * @return the wrapped exception.
+   */
+  public Throwable getCause()
+  {
+    return exception;
+  }
+
+  /**
+   * Returns the true cause of this exception, the wrapped
+   * exception.
+   *
+   * @return the wrapped exception.
+   */
+  public Exception getTargetException()
+  {
+    return exception;
+  }
+
+}
+



From MAILER-DAEMON Tue Jun 13 17:08:16 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqG7U-0006pd-1l
	for mharc-commit-classpath@gnu.org; Tue, 13 Jun 2006 17:08:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqG7R-0006lQ-9m
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 17:08:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqG7P-0006ic-Pq
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 17:08:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqG7P-0006iJ-KJ
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 17:08:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqGGR-0002jZ-8F
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 17:17:31 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqG7P-0005Xm-00
	for <commit-classpath@gnu.org>; Tue, 13 Jun 2006 17:08:11 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FqG7O-0005Xj-NU
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 21:08:11 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqG7O-0005Xj-NU@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Tue, 13 Jun 2006 21:08:10 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/metal/Meta...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 21:08:14 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/13 21:08:10

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/metal: MetalIconFactory.java 

Log message:
	2006-06-13  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/plaf/metal/MetalIconFactory.java
		(HorizontalSliderThumbIcon.gradientMask): Modified by 1 pixel to 
		prevent overwriting border,
		(VerticalSliderThumbIcon.gradientMask): Likewise.
	----------------------------------------------------------------------

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7803&r2=1.7804
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/metal/MetalIconFactory.java?cvsroot=classpath&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7803
retrieving revision 1.7804
diff -u -b -r1.7803 -r1.7804
--- ChangeLog	13 Jun 2006 20:54:00 -0000	1.7803
+++ ChangeLog	13 Jun 2006 21:08:10 -0000	1.7804
@@ -1,3 +1,10 @@
+2006-06-13  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/plaf/metal/MetalIconFactory.java
+	(HorizontalSliderThumbIcon.gradientMask): Modified by 1 pixel to 
+	prevent overwriting border,
+	(VerticalSliderThumbIcon.gradientMask): Likewise.
+
 2006-06-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* javax/management/AttributeNotFoundException.java,

Index: javax/swing/plaf/metal/MetalIconFactory.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/metal/MetalIconFactory.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- javax/swing/plaf/metal/MetalIconFactory.java	11 May 2006 17:05:55 -0000	1.25
+++ javax/swing/plaf/metal/MetalIconFactory.java	13 Jun 2006 21:08:10 -0000	1.26
@@ -967,7 +967,7 @@
      * This mask is used to paint the gradient in the shape of the thumb.
      */
     int[][] gradientMask = new int[][] { {0, 12}, {0, 12}, {0, 12}, {0, 12},
-                                         {0, 12}, {0, 12}, {0, 12}, {1, 12},
+                                         {0, 12}, {0, 12}, {0, 12}, {1, 11},
                                          {2, 10}, {3, 9}, {4, 8}, {5, 7},
                                          {6, 6}};
 
@@ -1623,7 +1623,7 @@
      * This mask is used to paint the gradient in the shape of the thumb.
      */
     int[][] gradientMask = new int[][] { {0, 12}, {0, 12}, {0, 12}, {0, 12},
-                                         {0, 12}, {0, 12}, {0, 12}, {1, 12},
+                                         {0, 12}, {0, 12}, {0, 12}, {1, 11},
                                          {2, 10}, {3, 9}, {4, 8}, {5, 7},
                                          {6, 6}};
 



From MAILER-DAEMON Tue Jun 13 17:39:25 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqGbd-00041D-L3
	for mharc-commit-classpath@gnu.org; Tue, 13 Jun 2006 17:39:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqGbc-0003z4-IL
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 17:39:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqGbc-0003xv-1A
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 17:39:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqGbb-0003xn-Pd
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 17:39:23 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqGkd-0004td-Mh
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 17:48:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqGbb-0007BY-00
	for <commit-classpath@gnu.org>; Tue, 13 Jun 2006 17:39:23 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FqGbZ-0007BU-RT
	for commit-classpath@gnu.org; Tue, 13 Jun 2006 21:39:23 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqGbZ-0007BU-RT@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Tue, 13 Jun 2006 21:39:21 +0000
Subject: [commit-cp] classpath ChangeLog native/plugin/gcjwebplugin.cc
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2006 21:39:24 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/13 21:39:21

Modified files:
	.              : ChangeLog 
	native/plugin  : gcjwebplugin.cc 

Log message:
	2006-06-13  Lillian Angel  <langel@redhat.com>
	
	        * native/plugin/gcjwebplugin.cc
	        (NP_Initialize): Removed code to create whitelist file.
	        (GCJ_New): Added code to create whitelist file.
	        (plugin_user_trusts_documentbase): Fixed error message.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7804&r2=1.7805
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/gcjwebplugin.cc?cvsroot=classpath&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7804
retrieving revision 1.7805
diff -u -b -r1.7804 -r1.7805
--- ChangeLog	13 Jun 2006 21:08:10 -0000	1.7804
+++ ChangeLog	13 Jun 2006 21:39:21 -0000	1.7805
@@ -1,3 +1,10 @@
+2006-06-13  Lillian Angel  <langel@redhat.com>
+
+	* native/plugin/gcjwebplugin.cc
+	(NP_Initialize): Removed code to create whitelist file.
+	(GCJ_New): Added code to create whitelist file.
+	(plugin_user_trusts_documentbase): Fixed error message.
+
 2006-06-13  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/plaf/metal/MetalIconFactory.java

Index: native/plugin/gcjwebplugin.cc
===================================================================
RCS file: /cvsroot/classpath/classpath/native/plugin/gcjwebplugin.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- native/plugin/gcjwebplugin.cc	9 Jun 2006 14:53:34 -0000	1.11
+++ native/plugin/gcjwebplugin.cc	13 Jun 2006 21:39:21 -0000	1.12
@@ -324,6 +324,26 @@
       goto cleanup_appletviewer_mutex;
     }
 
+  // Open the user's documentbase whitelist.
+  whitelist_file = g_io_channel_new_file (whitelist_filename,
+                                          "a+", &channel_error);
+  if (!whitelist_file)
+    {
+      if (channel_error)
+        {
+          PLUGIN_ERROR_THREE ("Failed to open whitelist file",
+                              whitelist_filename,
+                              channel_error->message);
+          g_error_free (channel_error);
+          channel_error = NULL;
+        }
+      else
+        PLUGIN_ERROR_TWO ("Failed to open whitelist file",
+                          whitelist_filename);
+
+      return NPERR_GENERIC_ERROR;
+    }
+    
   if (!plugin_user_trusts_documentbase (documentbase))
     {
       PLUGIN_ERROR ("User does not trust applet.");
@@ -959,7 +979,7 @@
               channel_error = NULL;
             }
           else
-            PLUGIN_ERROR ("Failed to open whitelist file.");
+            PLUGIN_ERROR ("Failed to read line from whitelist file.");
           g_free (whitelist_entry);
           whitelist_entry = NULL;
           break;
@@ -1632,26 +1652,6 @@
         }
     }
 
-  // Open the user's documentbase whitelist.
-  whitelist_file = g_io_channel_new_file (whitelist_filename,
-                                          "a+", &channel_error);
-  if (!whitelist_file)
-    {
-      if (channel_error)
-        {
-          PLUGIN_ERROR_THREE ("Failed to open whitelist file",
-                              whitelist_filename,
-                              channel_error->message);
-          g_error_free (channel_error);
-          channel_error = NULL;
-        }
-      else
-        PLUGIN_ERROR_TWO ("Failed to open whitelist file",
-                          whitelist_filename);
-
-      return NPERR_GENERIC_ERROR;
-    }
-
   // Store in a local table the browser functions that we may use.
   browserFunctions.version = browserTable->version;
   browserFunctions.size = browserTable->size;



From MAILER-DAEMON Wed Jun 14 05:53:46 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqS4I-0002O8-1m
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 05:53:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqS4G-0002Nu-52
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 05:53:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqS4F-0002Mf-DL
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 05:53:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqS4F-0002MU-8n
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 05:53:43 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqSDO-0006QS-1H
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 06:03:10 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqS48-00079N-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 05:53:36 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FqS48-00079K-97
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 09:53:36 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqS48-00079K-97@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Wed, 14 Jun 2006 09:53:36 +0000
Subject: [commit-cp] classpath ChangeLog gnu/javax/security/auth/log...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 09:53:44 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/14 09:53:36

Modified files:
	.              : ChangeLog 
	gnu/javax/security/auth/login: ConfigFileTokenizer.java 

Log message:
	2006-06-14  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/javax/security/auth/login/ConfigFileTokenizer.java: Fixed a typo.
		Condition all trace/debug code based on Configuration.DEBUG.
		Use logger instead of STDOUT and ot STDERR.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7805&r2=1.7806
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java?cvsroot=classpath&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7805
retrieving revision 1.7806
diff -u -b -r1.7805 -r1.7806
--- ChangeLog	13 Jun 2006 21:39:21 -0000	1.7805
+++ ChangeLog	14 Jun 2006 09:53:35 -0000	1.7806
@@ -1,3 +1,9 @@
+2006-06-14  Raif S. Naffah  <raif@swiftdsl.com.au>
+
+	* gnu/javax/security/auth/login/ConfigFileTokenizer.java: Fixed a typo.
+	Condition all trace/debug code based on Configuration.DEBUG.
+	Use logger instead of STDOUT and ot STDERR.
+
 2006-06-13  Lillian Angel  <langel@redhat.com>
 
 	* native/plugin/gcjwebplugin.cc

Index: gnu/javax/security/auth/login/ConfigFileTokenizer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/security/auth/login/ConfigFileTokenizer.java	15 Jan 2006 19:42:52 -0000	1.1
+++ gnu/javax/security/auth/login/ConfigFileTokenizer.java	14 Jun 2006 09:53:36 -0000	1.2
@@ -38,14 +38,17 @@
 
 package gnu.javax.security.auth.login;
 
+import gnu.classpath.Configuration;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
+import java.util.logging.Logger;
 
 /**
  * A UTF-8 friendly, JAAS Login Module Configuration file tokenizer written in
  * the deault syntax. This class emulates, to a certain extent, the behavior of
- * a {@link java.io.SrteamTokenizer} instance <code>st</code>, when set as
+ * a {@link java.io.StreamTokenizer} instance <code>st</code>, when set as
  * follows:
  * 
  *  <pre>
@@ -76,12 +79,7 @@
  */
 public class ConfigFileTokenizer
 {
-  // Constants and fields
-  // --------------------------------------------------------------------------
-
-  private static final boolean DEBUG = false;
-  private static final void debug(String m) {if (DEBUG) System.err.println(m);};
-
+  private static final Logger log = Logger.getLogger(ConfigFileParser.class.getName());
   /** A constant indicating that the end of the stream has been read. */
   public static final int TT_EOF = -1;
   /** A constant indicating that a word token has been read. */
@@ -235,9 +233,12 @@
 
   private void abort(String m) throws IOException
   {
-    debug("DEBUG: " + m);
-    debug("DEBUG: sb = " + sb);
-    debug("DEBUG: sbNdx = " + sbNdx);
+    if (Configuration.DEBUG)
+      {
+        log.fine(m);
+        log.fine("sb = " + sb);
+        log.fine("sbNdx = " + sbNdx);
+      }
     throw new IOException(m);
   }
 }



From MAILER-DAEMON Wed Jun 14 07:01:34 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqT7u-0002JC-E3
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 07:01:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqT7s-0002Im-Om
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 07:01:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqT7r-0002Ia-RD
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 07:01:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqT7r-0002IX-M2
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 07:01:31 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqTH1-0002tT-6h
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 07:10:59 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqT7p-0000u8-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 07:01:29 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FqT7n-0000u3-VL
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 11:01:29 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqT7n-0000u3-VL@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 14 Jun 2006 11:01:27 +0000
Subject: [commit-cp] classpath/javax/swing JComponent.java RepaintMa...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 11:01:33 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/14 11:01:27

Modified files:
	javax/swing    : JComponent.java RepaintManager.java 
	                 SwingUtilities.java 
	.              : ChangeLog 

Log message:
	2006-06-14  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/JComponent.java
		(isRepainting): New flag.
		(paintImmediately2): Set isRepainting flag.
		(getRoot): Removed obsolete method.
		(paintDoubleBuffered): Differenciate between paint calls from
		RepaintManager and from AWT refresh. Call
		RepaintManager.commitBuffer with this and local coordinates.
		(findOpaqueParent): Stop searching at heavyweight component. These
		are always opaque.
		(paintChildrenOptimized): Don't paint heavyweight children. These
		should care for themselves.
		(paintChildrenWithOverlap): Don't paint heavyweight children. These
		should care for themselves.
		* javax/swing/RepaintManager.java
		(getOffscreenBuffer): Associate offscreen buffer with toplevel
		windows only.
		(getVolatileOffscreenBuffer): Associate offscreen buffer with
		toplevel windows only.
		(getRoot): Removed obsolete method.
		(commitBuffer): Blit buffer on nearest heavyweight.
		(blitBuffer): New helper method.
		(getHeavyweightParent): New helper method.
		(commitRemainingBuffers): Call blitBuffer instead of commitBuffer.
		* javax/swing/SwingUtilities.java
		(convertRectangleToAncestor): New helper method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.126&r2=1.127
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/RepaintManager.java?cvsroot=classpath&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/SwingUtilities.java?cvsroot=classpath&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7806&r2=1.7807

Patches:



Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7806
retrieving revision 1.7807
diff -u -b -r1.7806 -r1.7807
--- ChangeLog	14 Jun 2006 09:53:35 -0000	1.7806
+++ ChangeLog	14 Jun 2006 11:01:25 -0000	1.7807
@@ -1,3 +1,31 @@
+2006-06-14  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/JComponent.java
+	(isRepainting): New flag.
+	(paintImmediately2): Set isRepainting flag.
+	(getRoot): Removed obsolete method.
+	(paintDoubleBuffered): Differenciate between paint calls from
+	RepaintManager and from AWT refresh. Call
+	RepaintManager.commitBuffer with this and local coordinates.
+	(findOpaqueParent): Stop searching at heavyweight component. These
+	are always opaque.
+	(paintChildrenOptimized): Don't paint heavyweight children. These
+	should care for themselves.
+	(paintChildrenWithOverlap): Don't paint heavyweight children. These
+	should care for themselves.
+	* javax/swing/RepaintManager.java
+	(getOffscreenBuffer): Associate offscreen buffer with toplevel
+	windows only.
+	(getVolatileOffscreenBuffer): Associate offscreen buffer with
+	toplevel windows only.
+	(getRoot): Removed obsolete method.
+	(commitBuffer): Blit buffer on nearest heavyweight.
+	(blitBuffer): New helper method.
+	(getHeavyweightParent): New helper method.
+	(commitRemainingBuffers): Call blitBuffer instead of commitBuffer.
+	* javax/swing/SwingUtilities.java
+	(convertRectangleToAncestor): New helper method.
+
 2006-06-14  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	* gnu/javax/security/auth/login/ConfigFileTokenizer.java: Fixed a typo.



From MAILER-DAEMON Wed Jun 14 08:35:25 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqUai-0008L6-TJ
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 08:35:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqUag-0008HZ-7w
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 08:35:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqUad-0008FG-UN
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 08:35:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqUad-0008Ez-Lt
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 08:35:19 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqUjo-0002V5-9N
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 08:44:48 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqUac-0005AZ-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 08:35:18 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FqUac-0005AM-6L
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 12:35:18 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqUac-0005AM-6L@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Wed, 14 Jun 2006 12:35:18 +0000
Subject: [commit-cp] classpath ChangeLog configure.ac m4/acinclude.m4
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 12:35:22 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/14 12:35:17

Modified files:
	.              : ChangeLog configure.ac 
	m4             : acinclude.m4 

Log message:
		PR java/28024:
		* m4/acinclude.m4 (REGEN_WITH_JAY): Use backquote, not $(...).
		* configure.ac (QT_INCLUDE_DIR): Use backquote, not $(...).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7807&r2=1.7808
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&r1=1.160&r2=1.161
http://cvs.savannah.gnu.org/viewcvs/classpath/m4/acinclude.m4?cvsroot=classpath&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7807
retrieving revision 1.7808
diff -u -b -r1.7807 -r1.7808
--- ChangeLog	14 Jun 2006 11:01:25 -0000	1.7807
+++ ChangeLog	14 Jun 2006 12:35:16 -0000	1.7808
@@ -1,3 +1,9 @@
+2006-06-14  Tom Tromey  <tromey@redhat.com>
+
+	PR java/28024:
+	* m4/acinclude.m4 (REGEN_WITH_JAY): Use backquote, not $(...).
+	* configure.ac (QT_INCLUDE_DIR): Use backquote, not $(...).
+
 2006-06-14  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/JComponent.java

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- configure.ac	7 Jun 2006 15:09:39 -0000	1.160
+++ configure.ac	14 Jun 2006 12:35:17 -0000	1.161
@@ -438,7 +438,7 @@
     if test "x$HAVE_QT4" = "xyes"; then
       dnl Check needed because in some cases the QtGui includedir
       dnl doesn't contain the subsystem dir.
-      QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui)
+      QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtGui`
       EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
       AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget],
       AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]),

Index: m4/acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- m4/acinclude.m4	27 Mar 2006 17:47:29 -0000	1.11
+++ m4/acinclude.m4	14 Jun 2006 12:35:17 -0000	1.12
@@ -409,13 +409,13 @@
         AC_MSG_ERROR("jay executable not found");
       fi
     else
-      JAY_DIR_PATH=$(dirname "${withval}")
+      JAY_DIR_PATH=`dirname "${withval}"`
       JAY="${withval}"
       AC_SUBST(JAY)
     fi
     JAY_SKELETON="${JAY_DIR_PATH}/skeleton"
     AC_CHECK_FILE(${JAY_SKELETON}, AC_SUBST(JAY_SKELETON),
-	AC_MSG_ERROR("Expected skeleton file in $(dirname ${withval})"))
+	AC_MSG_ERROR("Expected skeleton file in `dirname ${withval}`"))
     JAY_FOUND=yes
   ],
   [



From MAILER-DAEMON Wed Jun 14 09:00:16 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqUym-0003SO-KL
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 09:00:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqUyk-0003RK-DG
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 09:00:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqUyi-0003Qm-LO
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 09:00:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqUyi-0003Qj-FP
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 09:00:12 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqV7t-0004xe-5S
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 09:09:41 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqUyh-0007Hg-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 09:00:11 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FqUyg-0007Ha-5M
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 13:00:11 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqUyg-0007Ha-5M@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Wed, 14 Jun 2006 13:00:10 +0000
Subject: [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 13:00:14 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/14 13:00:09

Modified files:
	.              : ChangeLog 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_GtkImage.c 

Log message:
	       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
	       (Java_gnu_java_awt_peer_gtk_GtkImage_getPixels): Return when array
	       cannot be allocated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7808&r2=1.7809
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c?cvsroot=classpath&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7808
retrieving revision 1.7809
diff -u -b -r1.7808 -r1.7809
--- ChangeLog	14 Jun 2006 12:35:16 -0000	1.7808
+++ ChangeLog	14 Jun 2006 13:00:09 -0000	1.7809
@@ -1,3 +1,9 @@
+2006-06-14  Mark Wielaard  <mark@klomp.org>
+
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
+	(Java_gnu_java_awt_peer_gtk_GtkImage_getPixels): Return when array
+	cannot be allocated.
+
 2006-06-14  Tom Tromey  <tromey@redhat.com>
 
 	PR java/28024:

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c	8 Jun 2006 11:09:04 -0000	1.24
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c	14 Jun 2006 13:00:09 -0000	1.25
@@ -166,6 +166,11 @@
   rowstride = gdk_pixbuf_get_rowstride (pixbuf);
 
   result_array = (*env)->NewIntArray (env, (width * height));
+  if (result_array == NULL)
+    {
+      gdk_threads_leave ();
+      return NULL;
+    }
 
   dst = result_array_iter = 
     (*env)->GetIntArrayElements (env, result_array, NULL);



From MAILER-DAEMON Wed Jun 14 09:51:11 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqVm3-0006Oe-8P
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 09:51:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqVm1-0006Mg-UW
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 09:51:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqVm1-0006LD-9G
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 09:51:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqVm0-0006L0-Sv
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 09:51:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqVvC-0000yT-37
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:00:38 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqVlz-0001mb-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 09:51:07 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FqVly-0001mX-P3
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 13:51:07 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqVly-0001mX-P3@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 14 Jun 2006 13:51:06 +0000
Subject: [commit-cp] classpath native/jni/gtk-peergnu_java_awt_peer_...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 13:51:10 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/14 13:51:06

Modified files:
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_CairoGraphics2D.c 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 
	include        : gnu_java_awt_peer_gtk_CairoGraphics2D.h 
	.              : ChangeLog 

Log message:
	2006-06-14  Roman Kennke  <kennke@aicas.com>
	
		* gnu/java/awt/peer/gtk/CairoGraphics2D.java
		(cairoDrawLine): New native method.
		(cairoDrawRect): New native method.
		(cairoFillRect): New native method.
		(drawLine): Use special native method.
		(drawRect): Use special native method.
		(fillRect): Use special native method.
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
		(cairoDrawLine): New native method.
		(cairoDrawRect): New native method.
		(cairoFillRect): New native method.
		* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Regenerated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c?cvsroot=classpath&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7809&r2=1.7810

Patches:
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	12 Jun 2006 10:32:44 -0000	1.10
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	14 Jun 2006 13:51:04 -0000	1.11
@@ -665,6 +665,46 @@
     }
 }
 
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawLine
+(JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused)),
+ jlong pointer, jdouble x1, jdouble y1, jdouble x2, jdouble y2)
+{
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
+  g_assert (gr != NULL);
+
+  cairo_new_path(gr->cr);
+  cairo_move_to(gr->cr, x1, y1);
+  cairo_line_to(gr->cr, x2, y2);
+  cairo_stroke(gr->cr);
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawRect
+(JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused)),
+ jlong pointer, jdouble x, jdouble y, jdouble w, jdouble h)
+{
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
+  g_assert (gr != NULL);
+
+  cairo_new_path(gr->cr);
+  cairo_rectangle(gr->cr, x, y, w, h);
+  cairo_stroke(gr->cr);
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFillRect
+(JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused)),
+ jlong pointer, jdouble x, jdouble y, jdouble w, jdouble h)
+{
+  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer);
+  g_assert (gr != NULL);
+
+  cairo_new_path(gr->cr);
+  cairo_rectangle(gr->cr, x, y, w, h);
+  cairo_fill(gr->cr);
+}
+
 
 /************************** FONT STUFF ****************************/
 static void

Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java	13 Jun 2006 12:59:22 -0000	1.22
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java	14 Jun 2006 13:51:04 -0000	1.23
@@ -66,7 +66,6 @@
 import java.awt.geom.Arc2D;
 import java.awt.geom.Area;
 import java.awt.geom.GeneralPath;
-import java.awt.geom.Line2D;
 import java.awt.geom.NoninvertibleTransformException;
 import java.awt.geom.PathIterator;
 import java.awt.geom.Point2D;
@@ -427,6 +426,46 @@
    */
   private native void cairoSurfaceSetFilter(long pointer, int filter);
 
+  /**
+   * Draws a line from (x1,y1) to (x2,y2).
+   *
+   * @param pointer the native pointer
+   *
+   * @param x1 the x coordinate of the starting point
+   * @param y1 the y coordinate of the starting point
+   * @param x2 the x coordinate of the end point
+   * @param y2 the y coordinate of the end point
+   */
+  private native void cairoDrawLine(long pointer, double x1, double y1,
+                                    double x2, double y2);
+
+  /**
+   * Draws a rectangle at starting point (x,y) and with the specified width
+   * and height.
+   *
+   * @param pointer the native pointer
+   * @param x the x coordinate of the upper left corner
+   * @param y the y coordinate of the upper left corner
+   * @param w the width of the rectangle
+   * @param h the height of the rectangle
+   */
+  private native void cairoDrawRect(long pointer, double x, double y, double w,
+                                    double h);
+
+  /**
+   * Fills a rectangle at starting point (x,y) and with the specified width
+   * and height.
+   *
+   * @param pointer the native pointer
+   * @param x the x coordinate of the upper left corner
+   * @param y the y coordinate of the upper left corner
+   * @param w the width of the rectangle
+   * @param h the height of the rectangle
+   */
+  private native void cairoFillRect(long pointer, double x, double y, double w,
+                                    double h);
+
+
   ///////////////////////// TRANSFORMS ///////////////////////////////////
   /**
    * Set the current transform
@@ -940,12 +979,15 @@
 
   public void drawLine(int x1, int y1, int x2, int y2)
   {
-    draw(new Line2D.Double(x1, y1, x2, y2));
+    cairoDrawLine(nativePointer, shifted(x1, shiftDrawCalls),
+                  shifted(y1, shiftDrawCalls), shifted(x2, shiftDrawCalls),
+                  shifted(y2, shiftDrawCalls));
   }
 
   public void drawRect(int x, int y, int width, int height)
   {
-    draw(new Rectangle(x, y, width, height));
+    cairoDrawRect(nativePointer, shifted(x, shiftDrawCalls),
+                  shifted(y, shiftDrawCalls), width, height);
   }
 
   public void fillArc(int x, int y, int width, int height, int startAngle,
@@ -958,7 +1000,7 @@
 
   public void fillRect(int x, int y, int width, int height)
   {
-    fill(new Rectangle(x, y, width, height));
+    cairoFillRect(nativePointer, x, y, width, height);
   }
 
   public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints)

Index: include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	12 Jun 2006 10:32:44 -0000	1.6
+++ include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	14 Jun 2006 13:51:04 -0000	1.7
@@ -37,6 +37,9 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip (JNIEnv *env, jobject, jlong);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip (JNIEnv *env, jobject, jlong);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter (JNIEnv *env, jobject, jlong, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawLine (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawRect (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFillRect (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
 
 #ifdef __cplusplus
 }

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7809
retrieving revision 1.7810
diff -u -b -r1.7809 -r1.7810
--- ChangeLog	14 Jun 2006 13:00:09 -0000	1.7809
+++ ChangeLog	14 Jun 2006 13:51:04 -0000	1.7810
@@ -1,3 +1,18 @@
+2006-06-14  Roman Kennke  <kennke@aicas.com>
+
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
+	(cairoDrawLine): New native method.
+	(cairoDrawRect): New native method.
+	(cairoFillRect): New native method.
+	(drawLine): Use special native method.
+	(drawRect): Use special native method.
+	(fillRect): Use special native method.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
+	(cairoDrawLine): New native method.
+	(cairoDrawRect): New native method.
+	(cairoFillRect): New native method.
+	* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Regenerated.
+
 2006-06-14  Mark Wielaard  <mark@klomp.org>
 
 	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c



From MAILER-DAEMON Wed Jun 14 09:59:32 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqVu8-0004p4-8c
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 09:59:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqVu7-0004ox-B8
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 09:59:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqVu5-0004nR-CH
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 09:59:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqVu5-0004nG-1S
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 09:59:29 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqW3G-0001hy-Ag
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:08:58 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqVu4-00027m-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 09:59:28 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1FqVu3-00027i-La
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 13:59:27 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqVu3-00027i-La@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Wed, 14 Jun 2006 13:59:27 +0000
Subject: [commit-cp] classpath/javax/swing AbstractButton.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 13:59:31 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/14 13:59:27

Modified files:
	javax/swing    : AbstractButton.java 

Log message:
		2006-06-14  Tania Bento  <tbento@redhat.com>
	
	        * javax/swing/AbstractButton.java
	        (AbstractButton): Set focusable to false, not true.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/AbstractButton.java?cvsroot=classpath&r1=1.58&r2=1.59

Patches:
Index: AbstractButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/AbstractButton.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- AbstractButton.java	8 May 2006 08:57:57 -0000	1.58
+++ AbstractButton.java	14 Jun 2006 13:59:27 -0000	1.59
@@ -866,7 +866,7 @@
     borderPainted = true;
     contentAreaFilled = true;
     focusPainted = true;
-    setFocusable(true);
+    setFocusable(false);
     setAlignmentX(CENTER_ALIGNMENT);
     setAlignmentY(CENTER_ALIGNMENT);
     setDisplayedMnemonicIndex(-1);



From MAILER-DAEMON Wed Jun 14 10:00:09 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqVuj-0004rn-E8
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 10:00:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqVui-0004rg-Ll
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:00:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqVui-0004rU-5n
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:00:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqVuh-0004rN-VL
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:00:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqW3t-0001kz-8A
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:09:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqVug-0002AP-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 10:00:06 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1FqVuf-0002AF-Pl
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 14:00:06 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqVuf-0002AF-Pl@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Wed, 14 Jun 2006 14:00:05 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JMenuItem.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 14:00:08 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/14 14:00:05

Modified files:
	.              : ChangeLog 
	javax/swing    : JMenuItem.java 

Log message:
		2006-06-14  Tania Bento  <tbento@redhat.com>
	
	        * javax/swing/JMenuItem.java
	        (init): Changed horizontalAlignment from JButton.LEFT to JButton.LEADING.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7810&r2=1.7811
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JMenuItem.java?cvsroot=classpath&r1=1.31&r2=1.32

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7810
retrieving revision 1.7811
diff -u -b -r1.7810 -r1.7811
--- ChangeLog	14 Jun 2006 13:51:04 -0000	1.7810
+++ ChangeLog	14 Jun 2006 14:00:02 -0000	1.7811
@@ -1,3 +1,18 @@
+2006-06-14  Tania Bento  <tbento@redhat.com>
+
+	* javax/swing/AbstractButton.java
+	(AbstractButton): Set focusable to false, not true.
+
+2006-06-14  Tania Bento  <tbento@redhat.com>
+
+	* javax/swing/JMenuItem.java
+	(init): Changed horizontalAlignment from JButton.LEFT to JButton.LEADING.
+
+2006-06-14  Tania Bento  <tbento@redhat.com>
+
+	* javax/swing/JCheckBoxMenuItem.java
+	(JCheckBoxMenuItem): Added check to set the selected state.
+
 2006-06-14  Roman Kennke  <kennke@aicas.com>
 
 	* gnu/java/awt/peer/gtk/CairoGraphics2D.java

Index: javax/swing/JMenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JMenuItem.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- javax/swing/JMenuItem.java	31 May 2006 12:21:34 -0000	1.31
+++ javax/swing/JMenuItem.java	14 Jun 2006 14:00:05 -0000	1.32
@@ -184,7 +184,7 @@
       out statement below for now. */
     //borderPainted = false;
     focusPainted = false;
-    horizontalAlignment = JButton.LEFT;
+    horizontalAlignment = JButton.LEADING;
     horizontalTextPosition = JButton.TRAILING;
   }
 



From MAILER-DAEMON Wed Jun 14 10:00:46 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqVvK-0004xN-9E
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 10:00:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqVvI-0004ww-F8
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:00:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqVvG-0004wY-6a
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:00:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqVvF-0004wR-U9
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:00:42 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqW4R-0001oA-1c
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:10:11 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqVvE-0002Cf-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 10:00:40 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1FqVvD-0002CV-Mj
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 14:00:40 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqVvD-0002CV-Mj@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Wed, 14 Jun 2006 14:00:39 +0000
Subject: [commit-cp] classpath/javax/swing JCheckBoxMenuItem.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 14:00:44 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/14 14:00:39

Modified files:
	javax/swing    : JCheckBoxMenuItem.java 

Log message:
		2006-06-14  Tania Bento  <tbento@redhat.com>
	
	        * javax/swing/JCheckBoxMenuItem.java
	        (JCheckBoxMenuItem): Added check to set the selected state.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JCheckBoxMenuItem.java?cvsroot=classpath&r1=1.16&r2=1.17

Patches:
Index: JCheckBoxMenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JCheckBoxMenuItem.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- JCheckBoxMenuItem.java	14 May 2006 21:00:28 -0000	1.16
+++ JCheckBoxMenuItem.java	14 Jun 2006 14:00:39 -0000	1.17
@@ -1,39 +1,39 @@
 /* JCheckBoxMenuItem.java --
    Copyright (C) 2002, 2004, 2006, 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 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;
@@ -43,20 +43,20 @@
 import javax.accessibility.AccessibleRole;
 
 /**
- * A menu item that displays a checkbox. Its behaviour is very similar
- * to {@link JCheckBox}. Just like the <code>JCheckBox</code>, user can check
+ * A menu item that displays a checkbox. Its behaviour is very similar to
+ * {@link JCheckBox}. Just like the <code>JCheckBox</code>, user can check
  * and uncheck this menu item by clicking on it. Also
- * {@link AbstractButton#setSelected} and {@link #setState} can be use used
- * for the same purpose.
- * <code>JCheckBoxMenuItem</code> uses
+ * {@link AbstractButton#setSelected} and {@link #setState} can be use used for
+ * the same purpose. <code>JCheckBoxMenuItem</code> uses
  * <code>ToggleButtonModel</code> to keep track of its selection.
  *
  * @author original author unknown
  */
-public class JCheckBoxMenuItem extends JMenuItem implements SwingConstants,
-                                                            Accessible
+public class JCheckBoxMenuItem
+    extends JMenuItem
+    implements SwingConstants, Accessible
 {
-  private static final long serialVersionUID = -6676402307973384715L;
+  private static final long serialVersionUID = - 6676402307973384715L;
 
   /** name for the UI delegate for this menuItem. */
   private static final String uiClassID = "CheckBoxMenuItemUI";
@@ -65,8 +65,8 @@
   private boolean state;
 
   /**
-   * This array contains text of this menu item if this menu item is in
-   * checked state and null it is not.
+   * This array contains text of this menu item if this menu item is in checked
+   * state and null it is not.
    */
   private Object[] selectedObjects = new Object[1];
 
@@ -121,12 +121,12 @@
   }
 
   /**
-   * Creates a new JCheckBoxMenuItem object using specified label and
-   * marked as checked if given 'state' is true.
+   * Creates a new JCheckBoxMenuItem object using specified label and marked as
+   * checked if given 'state' is true.
    *
    * @param text Label for this menu item
-   * @param state <code>true</code> if this item should be in checked state and
-   *     <code>false</code> otherwise
+   * @param state <code>true</code> if this item should be in checked state
+   *          and <code>false</code> otherwise
    */
   public JCheckBoxMenuItem(String text, boolean state)
   {
@@ -134,19 +134,20 @@
   }
 
   /**
-   * Creates a new JCheckBoxMenuItem object with given label, icon,
-   * and marked as checked if given 'state' is true.
+   * Creates a new JCheckBoxMenuItem object with given label, icon, and marked
+   * as checked if given 'state' is true.
    *
    * @param text Label for this menu item
    * @param icon icon for this menu item
-   * @param state <code>true</code> if this item should be in checked state and
-   *     false otherwise
+   * @param state <code>true</code> if this item should be in checked state
+   *          and false otherwise
    */
   public JCheckBoxMenuItem(String text, Icon icon, boolean state)
   {
     super(text, icon);
     setModel(new JToggleButton.ToggleButtonModel());
     this.state = state;
+    if (state == true)
     this.setVisible(true);
   }
 
@@ -164,8 +165,8 @@
   /**
    * Returns checked state for this check box menu item.
    *
-   * @return Returns true if this menu item is in checked state
-   * and false otherwise.
+   * @return Returns true if this menu item is in checked state and false
+   *         otherwise.
    */
   public boolean getState()
   {
@@ -173,9 +174,8 @@
   }
 
   /**
-   * Sets state for this check box menu item. If
-   * given 'state' is true, then mark menu item as checked,
-   * and uncheck this menu item otherwise.
+   * Sets state for this check box menu item. If given 'state' is true, then
+   * mark menu item as checked, and uncheck this menu item otherwise.
    *
    * @param state new state for this menu item
    */
@@ -185,11 +185,11 @@
   }
 
   /**
-   * This method returns array containing label of this
-   * menu item if it is selected and null otherwise.
+   * This method returns array containing label of this menu item if it is
+   * selected and null otherwise.
    *
-   * @return Array containing label of this
-   *     menu item if this menu item is selected or null otherwise.
+   * @return Array containing label of this menu item if this menu item is
+   *         selected or null otherwise.
    */
   public Object[] getSelectedObjects()
   {
@@ -202,9 +202,8 @@
   }
 
   /**
-    * This method overrides JComponent.requestFocus with an empty
-    * implementation, since JCheckBoxMenuItems should not
-    * receive focus in general.
+   * This method overrides JComponent.requestFocus with an empty implementation,
+   * since JCheckBoxMenuItems should not receive focus in general.
     */
   public void requestFocus()
   {
@@ -248,7 +247,8 @@
    * 
    * @see JCheckBoxMenuItem#getAccessibleContext()
    */
-  protected class AccessibleJCheckBoxMenuItem extends AccessibleJMenuItem
+  protected class AccessibleJCheckBoxMenuItem
+      extends AccessibleJMenuItem
   {
     private static final long serialVersionUID = 1079958073579370777L;
 



From MAILER-DAEMON Wed Jun 14 10:13:00 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqW7A-0006mW-OK
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 10:13:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqW78-0006jy-Sh
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:12:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqW76-0006gy-MF
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:12:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqW76-0006go-Hz
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:12:56 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqWGG-0002rG-BT
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:22:25 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqW70-0002pu-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 10:12:50 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1FqW70-0002pr-DL
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 14:12:50 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqW70-0002pr-DL@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Wed, 14 Jun 2006 14:12:50 +0000
Subject: [commit-cp] classpath/javax/swing JCheckBoxMenuItem.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 14:12:59 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/14 14:12:50

Modified files:
	javax/swing    : JCheckBoxMenuItem.java 

Log message:
		2006-06-14  Tania Bento  <tbento@redhat.com>
	
	        * javax/swing/JCheckBoxMenuItem.java
	        (JCheckBoxMenuItem): Added check to set the selected state.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JCheckBoxMenuItem.java?cvsroot=classpath&r1=1.17&r2=1.18

Patches:
Index: JCheckBoxMenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JCheckBoxMenuItem.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- JCheckBoxMenuItem.java	14 Jun 2006 14:00:39 -0000	1.17
+++ JCheckBoxMenuItem.java	14 Jun 2006 14:12:50 -0000	1.18
@@ -148,7 +148,7 @@
     setModel(new JToggleButton.ToggleButtonModel());
     this.state = state;
     if (state == true)
-      this.setVisible(true);
+      this.setSelected(true);
   }
 
   /**



From MAILER-DAEMON Wed Jun 14 10:37:54 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqWVG-0004rF-5g
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 10:37:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqWVF-0004qo-Dq
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:37:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqWVE-0004qZ-Tr
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:37:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqWVE-0004qQ-Nr
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:37:52 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqWeQ-00058D-GF
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:47:22 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqWVD-0004r8-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 10:37:51 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FqWVD-0004r1-3F
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 14:37:51 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqWVD-0004r1-3F@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Wed, 14 Jun 2006 14:37:51 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/net/IndexListParse...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 14:37:53 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/14 14:37:50

Modified files:
	.              : ChangeLog 
	gnu/java/net   : IndexListParser.java 
	gnu/java/net/loader: JarURLLoader.java 

Log message:
		* gnu/java/net/loader/JarURLLoader.java (initialize): Skip our own
		jar.
		* gnu/java/net/IndexListParser.java (IndexListParser): Call clearAll
		when index entry does not exist.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7811&r2=1.7812
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/net/IndexListParser.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/net/loader/JarURLLoader.java?cvsroot=classpath&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7811
retrieving revision 1.7812
diff -u -b -r1.7811 -r1.7812
--- ChangeLog	14 Jun 2006 14:00:02 -0000	1.7811
+++ ChangeLog	14 Jun 2006 14:37:47 -0000	1.7812
@@ -1,3 +1,10 @@
+2006-06-14  Tom Tromey  <tromey@redhat.com>
+
+	* gnu/java/net/loader/JarURLLoader.java (initialize): Skip our own
+	jar.
+	* gnu/java/net/IndexListParser.java (IndexListParser): Call clearAll
+	when index entry does not exist.
+
 2006-06-14  Tania Bento  <tbento@redhat.com>
 
 	* javax/swing/AbstractButton.java

Index: gnu/java/net/IndexListParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/IndexListParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/java/net/IndexListParser.java	19 May 2006 20:58:59 -0000	1.3
+++ gnu/java/net/IndexListParser.java	14 Jun 2006 14:37:50 -0000	1.4
@@ -125,7 +125,11 @@
 
         br.close();
       }
-    // else INDEX.LIST does not exist
+    else
+      {
+        // INDEX.LIST does not exist
+        clearAll();
+      }
     }
     catch (Exception ex)
     {

Index: gnu/java/net/loader/JarURLLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/loader/JarURLLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/java/net/loader/JarURLLoader.java	21 May 2006 11:35:08 -0000	1.4
+++ gnu/java/net/loader/JarURLLoader.java	14 Jun 2006 14:37:50 -0000	1.5
@@ -135,6 +135,11 @@
                 try
                   {
                     URL subURL = new URL(baseURL, e);
+                    // We've seen at least one jar file whose Class-Path
+                    // attribute includes the original jar.  If we process
+                    // that normally we end up with infinite recursion.
+                    if (subURL.equals(baseURL))
+                      continue;
                     JarURLLoader subLoader = new JarURLLoader(classloader,
                                                               cache, factory,
                                                               subURL, subURL);



From MAILER-DAEMON Wed Jun 14 10:47:54 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqWew-0001j2-IO
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 10:47:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqWeu-0001iP-Mi
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:47:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqWeu-0001i6-1h
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:47:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqWet-0001i0-R4
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:47:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqWo5-0005yH-Kv
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:57:21 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqWes-00068C-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 10:47:50 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FqWeq-000683-Ga
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 14:47:50 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqWeq-000683-Ga@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Wed, 14 Jun 2006 14:47:48 +0000
Subject: [commit-cp] classpath/java/io File.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 14:47:53 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/14 14:47:48

Modified files:
	java/io        : File.java 
	.              : ChangeLog 

Log message:
		* java/io/File.java (getParent): Javadoc fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/io/File.java?cvsroot=classpath&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7812&r2=1.7813

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7812
retrieving revision 1.7813
diff -u -b -r1.7812 -r1.7813
--- ChangeLog	14 Jun 2006 14:37:47 -0000	1.7812
+++ ChangeLog	14 Jun 2006 14:47:47 -0000	1.7813
@@ -1,5 +1,9 @@
 2006-06-14  Tom Tromey  <tromey@redhat.com>
 
+	* java/io/File.java (getParent): Javadoc fix.
+
+2006-06-14  Tom Tromey  <tromey@redhat.com>
+
 	* gnu/java/net/loader/JarURLLoader.java (initialize): Skip our own
 	jar.
 	* gnu/java/net/IndexListParser.java (IndexListParser): Call clearAll



From MAILER-DAEMON Wed Jun 14 10:56:22 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqWn8-0004Y7-Ea
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 10:56:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqWn6-0004WV-PM
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:56:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqWn5-0004Uz-98
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:56:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqWn4-0004Uo-RQ
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 10:56:18 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqWwG-0006vP-Ce
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 11:05:48 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqWn3-0006bD-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 10:56:17 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FqWn2-0006b2-LG
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 14:56:17 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqWn2-0006b2-LG@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 14 Jun 2006 14:56:16 +0000
Subject: [commit-cp] classpath ChangeLog examples/gnu/classpath/exam...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 14:56:21 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/14 14:56:16

Modified files:
	.              : ChangeLog 
Added files:
	examples/gnu/classpath/examples/awt: AicasGraphicsBenchmark.java 
	                                     aicas.png palme.gif 

Log message:
	2006-06-14  Roman Kennke  <kennke@aicas.com>
	
		* examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java:
		New file. This is a benchmark for AWT 1.1 style graphics operations.
		* examples/gnu/classpath/examples/awt/palme.gif: New file.
		* examples/gnu/classpath/examples/awt/aicas.gif: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7813&r2=1.7814
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/awt/aicas.png?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/awt/palme.gif?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7813
retrieving revision 1.7814
diff -u -b -r1.7813 -r1.7814
--- ChangeLog	14 Jun 2006 14:47:47 -0000	1.7813
+++ ChangeLog	14 Jun 2006 14:56:15 -0000	1.7814
@@ -1,3 +1,10 @@
+2006-06-14  Roman Kennke  <kennke@aicas.com>
+
+	* examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java:
+	New file. This is a benchmark for AWT 1.1 style graphics operations.
+	* examples/gnu/classpath/examples/awt/palme.gif: New file.
+	* examples/gnu/classpath/examples/awt/aicas.gif: New file.
+
 2006-06-14  Tom Tromey  <tromey@redhat.com>
 
 	* java/io/File.java (getParent): Javadoc fix.

Index: examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
===================================================================
RCS file: examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
diff -N examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java	14 Jun 2006 14:56:16 -0000	1.1
@@ -0,0 +1,1018 @@
+/* AnimationApplet.java -- An example of an old-style AWT applet
+   Copyright (C) 2006 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath examples.
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA. */
+
+package gnu.classpath.examples.awt;
+
+import java.awt.BorderLayout;
+import java.awt.Canvas;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.Insets;
+import java.awt.Label;
+import java.awt.Panel;
+import java.awt.Toolkit;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class AicasGraphicsBenchmark extends Panel
+{
+  /**
+   * Default number of test-iterations.
+   */
+  private static final int DEFAULT_TEST_SIZE = 1000;
+
+  /**
+   * Default screen size.
+   */
+  private static final int DEFAULT_SCREEN_WIDTH  = 320;
+  private static final int DEFAULT_SCREEN_HEIGHT = 240;
+
+  /**
+   * AWT tests.
+   */
+  private static final int AWTTEST_LINES = 1 << 0;
+  private static final int AWTTEST_RECT = 1 << 1;
+  private static final int AWTTEST_POLYLINE = 1 << 2;
+  private static final int AWTTEST_POLYGON = 1 << 3;
+  private static final int AWTTEST_ARC = 1 << 4;
+  private static final int AWTTEST_OVAL = 1 << 5;
+  private static final int AWTTEST_ROUNDRECT = 1 << 6;
+  private static final int AWTTEST_STRING = 1 << 7;
+  private static final int AWTTEST_TRANSPARENTIMAGE = 1 << 8;
+  private static final int AWTTEST_IMAGE = 1 << 9;
+
+  private static final int AWTTEST_NONE = 0;
+  private static final int AWTTEST_ALL  =   AWTTEST_LINES
+                                          | AWTTEST_RECT
+                                          | AWTTEST_POLYLINE
+                                          | AWTTEST_POLYGON
+                                          | AWTTEST_ARC
+                                          | AWTTEST_OVAL
+                                          | AWTTEST_ROUNDRECT
+                                          | AWTTEST_STRING
+                                          | AWTTEST_TRANSPARENTIMAGE
+                                          | AWTTEST_IMAGE
+                                          ;
+
+  int iterations = 1;
+  private int screenWidth = DEFAULT_SCREEN_WIDTH;  
+  private int screenHeight = DEFAULT_SCREEN_HEIGHT;  
+  boolean doubleBufferFlag = true;
+  private int awtTests = AWTTEST_ALL;
+
+  private Label testLabel;
+
+  private String testContext = "";
+
+  Logger logger = Logger.getLogger("AicasGraphicsBenchmark");
+
+  private Image pngTestImage;
+  private Image gifTestImage;
+
+  private TestSet testSetMap = new TestSet();
+
+  public AicasGraphicsBenchmark()
+  {
+    pngTestImage = loadImage("aicas.png");
+    gifTestImage = loadImage("palme.gif");
+
+    setLayout(new BorderLayout());
+    testLabel = new Label();
+    add(testLabel,BorderLayout.NORTH);
+    add(new GraphicsTest(),BorderLayout.CENTER);
+  }
+
+  void setTestContext(String testName)
+  {
+    logger.logp(Level.INFO, "AicasGraphicsBenchmark", "recordTest",
+                "--- Starting new test context: " + testName);
+    testContext = testName;
+    testLabel.setText(testName);
+  }
+
+  private void recordTest(String testName, long time)
+  {
+    logger.logp(Level.INFO, "AicasGraphicsBenchmark", "recordTest",
+                testContext + ": " + testName + " duration (ms): " + time);
+    TestRecorder recorder = testSetMap.getTest(testName);
+    if (recorder == null)
+      {
+        recorder = new TestRecorder(testName);
+        testSetMap.putTest(testName,recorder);
+      }
+    recorder.addRun(time);
+  }
+
+  void printReport()
+  {
+    for (Iterator i = testSetMap.testIterator(); i.hasNext(); )
+    {
+      TestRecorder recorder = testSetMap.getTest((String)i.next());
+      System.out.println("TEST " + recorder.getTestName() + ": average "
+                         + recorder.getAverage() + "ms ["
+                         + recorder.getMinTime() + "-" + recorder.getMaxTime()
+                         + "]");
+    }
+  }
+
+  public static void main(String[] args)
+  {
+    int awtTests;
+    int i;
+    boolean endOfOptionsFlag;
+    AicasGraphicsBenchmark speed= new AicasGraphicsBenchmark();
+
+    // Parse arguments.
+    i = 0;
+    endOfOptionsFlag = false;
+    awtTests = AWTTEST_NONE;
+    while (i < args.length)
+      {
+        if (!endOfOptionsFlag)
+          {
+            if (args[i].equals("--help") || args[i].equals("-help")
+                || args[i].equals("-h"))
+              {
+                System.out.println("Usage: AicasGraphicsBenchmark [<options>] [<test>  ...]");
+                System.out.println("");
+                System.out.println("Options: -i|--iterations=<n|-1> - number of iterations (-1 is infinite)");
+                System.out.println("         -w|--width=<n>         - screen width; default "+DEFAULT_SCREEN_WIDTH);
+                System.out.println("         -h|--height=<n>        - screen height; default "+DEFAULT_SCREEN_HEIGHT);
+                System.out.println("         -n|--noDoubleBuffer    - disable double-buffering test");
+                System.out.println("");
+                System.out.println("Tests: line");
+                System.out.println("       rect");
+                System.out.println("       polyline");
+                System.out.println("       polygon");
+                System.out.println("       arc");
+                System.out.println("       oval");
+                System.out.println("       roundrect");
+                System.out.println("       string");
+                System.out.println("       transparentimage");
+                System.out.println("       image");
+                System.exit(1);
+              }
+            else if ((args[i].startsWith("-i=")
+                || args[i].startsWith("--iterations=")))
+              {
+                speed.iterations =
+                  Integer.parseInt(args[i].substring(args[i].indexOf('=') + 1));
+                i += 1;
+                continue;
+              }
+            else if ((args[i].equals("-i") || args[i].equals("--iterations")))
+              {
+                if ((i + 1) >= args.length)
+                  {
+                    System.err.println("ERROR: No argument given for option '"
+                                       + args[i] + "'!");
+                    System.exit(2);
+                  }
+                speed.iterations = Integer.parseInt(args[i + 1]);
+                i += 2;
+                continue;
+              }
+            else if ((args[i].startsWith("-w=")
+                || args[i].startsWith("--width=")))
+              {
+                speed.screenWidth =
+                  Integer.parseInt(args[i].substring(args[i].indexOf('=') + 1));
+                i += 1;
+                continue;
+              }
+            else if ((args[i].equals("-w") || args[i].equals("--width")))
+              {
+                if ((i + 1) >= args.length)
+                  {
+                    System.err.println("ERROR: No argument given for option '"
+                                       + args[i] + "'!");
+                    System.exit(2);
+                  }
+                speed.screenWidth = Integer.parseInt(args[i + 1]);
+                i += 2;
+                continue;
+              }
+            else if ((args[i].startsWith("-h=")
+                || args[i].startsWith("--height=")))
+              {
+                speed.screenHeight =
+                  Integer.parseInt(args[i].substring(args[i].indexOf('=') + 1));
+                i+=1;
+                continue;
+              }
+            else if ((args[i].equals("-h") || args[i].equals("--height")))
+              {
+                if ((i+1) >= args.length)
+                  {
+                    System.err.println("ERROR: No argument given for option '"
+                                       + args[i] + "'!");
+                    System.exit(2);
+                  }
+                speed.screenHeight = Integer.parseInt(args[i + 1]);
+                i += 2;
+                continue;
+              }
+            else if ((args[i].equals("-n")
+                || args[i].equals("--noDoubleBuffer")))
+              {
+                speed.doubleBufferFlag = false;
+                i += 1;
+                continue;
+              }
+            else if (args[i].equals("--"))
+              {
+                endOfOptionsFlag = true;
+                i += 1;
+                continue;
+              }
+            else if (args[i].startsWith("-"))
+              {
+                System.err.println("ERROR: Unknown option '" + args[i] + "'!");
+                System.exit(2);
+              }
+          }
+        StringTokenizer tokenizer = new StringTokenizer(args[i], " +,");
+        while (tokenizer.hasMoreTokens())
+          {
+            String s = tokenizer.nextToken().toLowerCase();
+            if (s.equals("line"))
+              awtTests |= AWTTEST_LINES;
+            else if (s.equals("rect"))
+              awtTests |= AWTTEST_RECT;
+            else if (s.equals("polyline"))
+              awtTests |= AWTTEST_POLYLINE;
+            else if (s.equals("polygon"))
+              awtTests |= AWTTEST_POLYGON;
+            else if (s.equals("arc"))
+              awtTests |= AWTTEST_ARC;
+            else if (s.equals("oval"))
+              awtTests |= AWTTEST_OVAL;
+            else if (s.equals("roundrect"))
+              awtTests |= AWTTEST_ROUNDRECT;
+            else if (s.equals("string"))
+              awtTests |= AWTTEST_STRING;
+            else if (s.equals("transparentimage"))
+              awtTests |= AWTTEST_TRANSPARENTIMAGE;
+            else if (s.equals("image"))
+              awtTests |= AWTTEST_IMAGE;
+            else
+              {
+                System.err.println("Unknown AWT test '" + s + "'!");
+                System.exit(2);
+              }
+          }
+        i += 1;
+      }
+    if (awtTests != AWTTEST_NONE)
+      speed.awtTests = awtTests;
+
+    // Create graphics.
+    final Frame frame = new Frame("AicasGraphicsBenchmark");
+
+    frame.addWindowListener(new WindowAdapter()
+    {
+      public void windowClosing(WindowEvent e)
+      {
+        frame.setVisible(false);
+        System.exit(0);
+      }
+    });
+
+    frame.add(speed,BorderLayout.CENTER);
+    frame.setSize(speed.screenWidth,speed.screenHeight);
+    frame.setVisible(true);
+
+    // Insets are correctly set only after the native peer was created.
+    Insets insets = frame.getInsets();
+    // The internal size of the frame should be 320x240.
+    frame.setSize(320 + insets.right + insets.left,
+                  240 + insets.top + insets.bottom);
+  }
+
+  private Image loadImage(String imageName)
+  {
+    Image result = null;
+    logger.logp(Level.INFO, "AicasGraphicsBenchmark", "loadImage",
+                "Loading image: " + imageName);
+    URL url = getClass().getResource(imageName);
+    if (url != null)
+      {
+        result = Toolkit.getDefaultToolkit().getImage(url);
+        prepareImage(result, this);
+      }
+    else
+      {
+        logger.logp(Level.WARNING, "AicasGraphicsBenchmark", "loadImage",
+                    "Could not locate image resource in class path: "
+                    + imageName);
+      }
+    return result;
+  }
+
+  /**
+   * Executes the test methods.
+   *
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  void runTestSet(Graphics g, Dimension size)
+  {
+    if ((awtTests & AWTTEST_LINES) != 0)
+      test_drawLine(g, size);
+    if ((awtTests & AWTTEST_RECT) != 0)
+      test_drawRect(g, size);
+    if ((awtTests & AWTTEST_RECT) != 0)
+      test_fillRect(g, size);
+    if ((awtTests & AWTTEST_POLYLINE) != 0)
+      test_drawPolyline(g, size);
+    if ((awtTests & AWTTEST_POLYGON) != 0)
+      test_drawPolygon(g, size);
+    if ((awtTests & AWTTEST_POLYGON) != 0)
+      test_fillPolygon(g,size);
+    if ((awtTests & AWTTEST_ARC) != 0)
+      test_drawArc(g,size);
+    if ((awtTests & AWTTEST_ARC) != 0)
+      test_fillArc(g,size);
+    if ((awtTests & AWTTEST_OVAL) != 0)
+      test_drawOval(g, size);
+    if ((awtTests & AWTTEST_OVAL) != 0)
+      test_fillOval(g, size);
+    if ((awtTests & AWTTEST_ROUNDRECT) != 0)
+      test_fillRoundRect(g, size);
+    if ((awtTests & AWTTEST_STRING) != 0)
+      test_drawString(g, size);
+    if ((awtTests & AWTTEST_TRANSPARENTIMAGE) != 0)
+      test_drawTransparentImage(g,size);
+    if ((awtTests & AWTTEST_IMAGE) != 0)
+      test_drawImage(g,size);
+  }
+
+  /**
+   * Gets a new random Color.
+   *
+   * @returna new random Color
+   */
+  private Color getNextColor()
+  {
+    return new Color((int) (Math.random() * 254) + 1,
+                     (int) (Math.random() * 254) + 1,
+                     (int) (Math.random() * 254) + 1);
+  }
+
+  /**
+   * Draws random lines within the given dimensions.
+   *
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_drawLine(Graphics g, Dimension size)
+  {
+    int maxTests = DEFAULT_TEST_SIZE;
+    int minSize = 10;
+    long startTime = System.currentTimeMillis();
+    for (int i=0; i < maxTests; i += 1)
+      {
+        g.setColor(getNextColor());
+        int x1 = (int) (Math.random() * (size.width-minSize));
+        int y1 = (int) (Math.random() * (size.height-minSize));
+        int x2 = (int) (Math.random() * (size.width-minSize));
+        int y2 = (int) (Math.random() * (size.height-minSize));
+        g.drawLine(x1, y1, x2, y2);
+      }
+    long endTime = System.currentTimeMillis();
+    recordTest("drawLine " + maxTests + " times", (endTime-startTime));
+  }
+
+  /**
+   * Draws random rectangles within the given dimensions.
+   *
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_drawRect(Graphics g, Dimension size)
+  {
+    int maxTests = DEFAULT_TEST_SIZE;
+    int minSize = 10;
+    long startTime = System.currentTimeMillis();
+    for (int i=0; i < maxTests; i += 1)
+      {
+        g.setColor(getNextColor());
+        int x1 = (int) (Math.random() * (size.width-minSize));
+        int y1 = (int) (Math.random() * (size.height-minSize));
+        int x2 = (int) (Math.random() * (size.width-minSize));
+        int y2 = (int) (Math.random() * (size.height-minSize));
+        g.drawRect(x1, y1, x2, y2);
+      }
+    long endTime = System.currentTimeMillis();
+    recordTest("drawRect " + maxTests + " times", (endTime-startTime));
+  }
+
+  /**
+   * Draws random rectangles within the given dimensions.
+   *
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_fillRect(Graphics g, Dimension size)
+  {
+    int maxTests = DEFAULT_TEST_SIZE;
+    int minSize = 10;
+    long startTime = System.currentTimeMillis();
+    for (int i = 0; i < maxTests; i += 1)
+      {
+        g.setColor(getNextColor());
+        int x1 = (int) (Math.random() * (size.width-minSize));
+        int y1 = (int) (Math.random() * (size.height-minSize));
+        int x2 = (int) (Math.random() * (size.width-minSize));
+        int y2 = (int) (Math.random() * (size.height-minSize));
+        g.fillRect(x1, y1, x2, y2);
+      }
+    long endTime = System.currentTimeMillis();
+    recordTest("fillRect " + maxTests + " times", (endTime-startTime));
+  }
+
+  /**
+   * Draws random polylines within the given dimensions.
+   *
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_drawPolyline(Graphics g, Dimension size)
+  {
+    int maxTests = DEFAULT_TEST_SIZE;
+    long startTime = System.currentTimeMillis();
+    for (int i=0; i < maxTests; i += 1)
+      {
+        g.setColor(getNextColor());
+        int points = (int)(Math.random() * 6) + 3;
+        int[] x_coords = new int[points];
+        int[] y_coords = new int[points];
+        for (int j = 0; j < points; j+=1)
+          {
+            x_coords[j] = (int)(Math.random() * (size.width));
+            y_coords[j] = (int)(Math.random() * (size.height));
+          }
+        g.drawPolyline(x_coords,y_coords, points);
+      }
+    long endTime = System.currentTimeMillis();
+    recordTest("drawPolyline " + maxTests + " times", (endTime-startTime));
+  }
+
+  /**
+   * Draws random polygons within the given dimensions.
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_drawPolygon(Graphics g, Dimension size)
+  {
+    int maxTests = DEFAULT_TEST_SIZE;
+    long startTime = System.currentTimeMillis();
+    for (int i=0; i < maxTests; i += 1)
+      {
+        g.setColor(getNextColor());
+        int points = (int) (Math.random() * 6) + 3;
+        int[] xcoords = new int[points];
+        int[] ycoords = new int[points];
+        for(int j = 0; j < points; j+=1)
+          {
+            xcoords[j] = (int) (Math.random() * (size.width));
+            ycoords[j] = (int) (Math.random() * (size.height));
+          }
+        g.drawPolygon(xcoords, ycoords, points);
+      }
+    long endTime = System.currentTimeMillis();
+    recordTest("drawPolygon " + maxTests + " times", (endTime-startTime));
+  }
+
+  /**
+   * Draws random filled polygons within the given dimensions.
+   *
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_fillPolygon(Graphics g, Dimension size)
+  {
+    int maxTests = DEFAULT_TEST_SIZE;
+    long startTime = System.currentTimeMillis();
+    for (int i=0; i < maxTests; i += 1)
+      {
+        g.setColor(getNextColor());
+        int points = (int) (Math.random() * 6) + 3;
+        int[] xcoords = new int[points];
+        int[] ycoords = new int[points];
+        for (int j = 0; j < points; j+=1)
+          {
+            xcoords[j] = (int) (Math.random() * (size.width));
+            ycoords[j] = (int) (Math.random() * (size.height));
+          }
+        g.fillPolygon(xcoords, ycoords, points);
+      }
+    long endTime = System.currentTimeMillis();
+    recordTest("fillPolygon " + maxTests + " times", (endTime-startTime));
+  }
+
+  /**
+   * Draws random arcs within the given dimensions.
+   *
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_drawArc(Graphics g, Dimension size)
+  {
+    int maxTests = DEFAULT_TEST_SIZE;
+    int minSize;
+    long startTime;
+    long endTime;
+    minSize = 10;
+    startTime = System.currentTimeMillis();
+    for (int i=0; i < maxTests; i += 1)
+      {
+        g.setColor(getNextColor());
+        int x = (int) (Math.random() * (size.width - minSize + 1));
+        int y = (int) (Math.random() * (size.height - minSize + 1));
+        int width = (int) (Math.random() * (size.width - x - minSize) + minSize);
+        int height = (int) (Math.random() * (size.height - y - minSize) + minSize);
+        int startAngle = (int) (Math.random() * 360);
+        int arcAngle = (int) (Math.random() * 360 - startAngle);
+        g.drawArc(x, y, width, height, startAngle, arcAngle);
+      }
+    endTime = System.currentTimeMillis();
+    recordTest("drawArc " + maxTests + " times", (endTime-startTime));
+  }
+
+  /**
+   * Draws random filled arcs within the given dimensions.
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_fillArc(Graphics g, Dimension size)
+  {
+    int maxTests = DEFAULT_TEST_SIZE;
+    int minSize;
+    long startTime;
+    long endTime;
+    minSize = 10;
+    startTime = System.currentTimeMillis();
+    for (int i = 0; i < maxTests; i += 1)
+    {
+      g.setColor(getNextColor());
+      int x = (int) (Math.random() * (size.width - minSize + 1));
+      int y = (int) (Math.random() * (size.height - minSize + 1));
+      int width = (int)(Math.random() * (size.width - x - minSize) + minSize);
+      int height = (int)(Math.random() * (size.height - y - minSize) + minSize);
+      int startAngle = (int)(Math.random() * 360);
+      int arcAngle = (int)(Math.random() * 360);
+      g.fillArc(x, y, width, height, startAngle, arcAngle);
+
+    }
+    endTime = System.currentTimeMillis();
+    recordTest("fillArc " + maxTests + " times", (endTime - startTime));
+  }
+
+  /**
+   * Draws random ovals within the given dimensions.
+   *
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_drawOval(Graphics g, Dimension size)
+  {
+    int maxTests = DEFAULT_TEST_SIZE;
+    int minSize;
+    long startTime;
+    long endTime;
+    minSize = 10;
+    startTime = System.currentTimeMillis();
+    for (int i = 0; i < maxTests; i += 1)
+      {
+        g.setColor(getNextColor());
+        int x = (int)(Math.random() * (size.width - minSize + 1));
+        int y = (int)(Math.random() * (size.height - minSize + 1));
+        int width = (int)(Math.random() * (size.width - x - minSize) + minSize);
+        int height = (int)(Math.random() * (size.height - y - minSize) + minSize);
+        g.drawOval(x, y, Math.min(width, height), Math.min(width, height));
+      }
+    endTime = System.currentTimeMillis();
+    recordTest("drawOval " + maxTests + " times", (endTime-startTime));
+  }
+
+  /**
+   * Draws random filled ovals within the given dimensions.
+   *
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_fillOval(Graphics g, Dimension size)
+  {
+    int maxTests = DEFAULT_TEST_SIZE;
+    int minSize;
+    long startTime;
+    long endTime;
+    minSize = 10;
+    startTime = System.currentTimeMillis();
+    for (int i = 0; i < maxTests; i += 1)
+      {
+        g.setColor(getNextColor());
+        int x = (int) (Math.random() * (size.width - minSize + 1));
+        int y = (int) (Math.random() * (size.height - minSize + 1));
+        int width = (int) (Math.random() * (size.width - x - minSize) + minSize);
+        int height = (int) (Math.random() * (size.height - y - minSize) + minSize);
+        g.fillOval(x, y, width,height);
+      }
+    endTime = System.currentTimeMillis();
+    recordTest("fillOval " + maxTests + " times", (endTime-startTime));
+  }
+
+  /**
+   * Draws random filled rounded rectangles within the given dimensions.
+   *
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_fillRoundRect(Graphics g, Dimension size)
+  {
+    int maxTests = DEFAULT_TEST_SIZE;
+    int minSize;
+    long startTime;
+    long endTime;
+    minSize = 10;
+    startTime = System.currentTimeMillis();
+    for (int i=0; i < maxTests; i+=1)
+      {
+        g.setColor(getNextColor());
+        int x = (int) (Math.random() * (size.width - minSize + 1));
+        int y = (int) (Math.random() * (size.height - minSize + 1));
+        int width = (int) (Math.random() * (size.width - x - minSize) + minSize);
+        int height = (int) (Math.random() * (size.height - y - minSize) + minSize);
+        int arcWidth = (int) (Math.random() * (width - 1) + 1);
+        int arcHeight = (int) (Math.random() * (height - 1) + 5);
+        g.fillRoundRect(x, y, width, height, arcWidth, arcHeight);
+      }
+    endTime = System.currentTimeMillis();
+    recordTest("fillRoundRect " + maxTests + " times", (endTime-startTime));
+  }
+
+  /**
+   * Draws random images within the given dimensions.
+   *
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_drawImage(Graphics g, Dimension size)
+  {
+    if (gifTestImage == null)
+      {
+        logger.logp(Level.WARNING, "AicasGraphicsBenchmark", "runTestSet",
+                    "Skipping 'test_drawImage' due to missing resource.");
+        return;
+      }
+    
+    int maxTests = DEFAULT_TEST_SIZE / 2;
+    if(maxTests == 0)
+      maxTests = 1;
+    int imageWidth = gifTestImage.getWidth(this);
+    int imageHeight = gifTestImage.getHeight(this);
+    long  startTime = System.currentTimeMillis();
+    for (int i = 0; i < maxTests; i += 1)
+      {
+        g.setColor(getNextColor());
+        int x = (int) (Math.random() * (size.width - imageWidth + 1));
+        int y = (int) (Math.random() * (size.height - imageHeight + 1));
+        g.drawImage(gifTestImage, x, y, this);
+      }
+    long endTime = System.currentTimeMillis();
+    recordTest("drawImage " + maxTests + " times", (endTime-startTime));
+  }
+
+  /**
+   * Draws random transparent images within the given dimensions.
+   *
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_drawTransparentImage(Graphics g, Dimension size)
+  {
+    if (pngTestImage == null)
+      {
+        logger.logp(Level.WARNING, "AicasGraphicsBenchmark", "runTestSet",
+                    "Skipping 'test_drawTransparentImage' due to missing resource.");
+        return;
+      }
+
+    
+    int maxTests = DEFAULT_TEST_SIZE / 5;
+    if(maxTests == 0)
+      maxTests = 1;
+    int imageWidth = pngTestImage.getWidth(this);
+    int imageHeight = pngTestImage.getHeight(this);
+    long  startTime = System.currentTimeMillis();
+    for (int i = 0; i < maxTests; i += 1)
+      {
+        g.setColor(getNextColor());
+        int x = (int) (Math.random() * (size.width - imageWidth + 1));
+        int y = (int) (Math.random() * (size.height - imageHeight + 1));
+        g.drawImage(pngTestImage, x, y, this);
+      }
+    long endTime = System.currentTimeMillis();
+    recordTest("draw transparent image " + maxTests + " times",
+               (endTime-startTime));
+  }
+
+  /**
+   * Draws random strings within the given dimensions.
+   *
+   * @param g The Graphics object that is used to paint.
+   * @param size The size of the canvas.
+   */
+  private void test_drawString(Graphics g, Dimension size)
+  {
+      int maxTests = DEFAULT_TEST_SIZE;
+      String testString = "HelloWorld";
+      int stringWidth = g.getFontMetrics().stringWidth(testString);
+      int stringHeight = g.getFontMetrics().getHeight();
+      
+      long startTime = System.currentTimeMillis();
+      for(int i = 0; i < maxTests; i += 1)
+        {
+          g.setColor(getNextColor());
+          g.drawString(testString, (int) (Math.random() * (size.width - stringWidth + 1)),(int)(Math.random() * (size.height - stringHeight + 1)) + stringHeight);
+        }
+      long endTime = System.currentTimeMillis();
+      recordTest("drawString " + maxTests + " times", (endTime-startTime));
+  }
+
+  private class GraphicsTest extends Canvas implements Runnable
+  {
+    Thread paintThread;
+    boolean done = false;
+    boolean doPaint = false;
+    boolean withClipping = false;
+
+    public GraphicsTest()
+    {
+      paintThread = new Thread(this);
+      paintThread.start();
+    }
+
+    public void run()
+    {
+      int runCount = 0;
+      while (!done)
+        {
+          runCount++;
+
+          try
+            {
+              synchronized (this)
+                {
+                  while (!doPaint)
+                    {
+                      try
+                        {
+                          wait(200);
+                        }
+                      catch (InterruptedException exception)
+                        {
+                          return;
+                        }
+                    }
+                }
+
+              if (iterations != 0)
+                System.out.println("--- run...(" + runCount + "/" + iterations
+                                   + ") ------------------------------------------------------");
+
+              Graphics g = getGraphics();
+              Dimension size = getSize();
+              logger.logp(Level.INFO, "AicasGraphicsBenchmark.GraphicsTest", "run",
+              "Start testing non-double-buffered drawing");
+              runSet_noClipping(g,size);
+              runSet_zeroClipping(g, size);
+              runSet_withClipping(g, size);
+              g.dispose();
+
+              if (doubleBufferFlag)
+                {
+                  logger.logp(Level.INFO, "AicasGraphicsBenchmark.GraphicsTest",
+                              "run", "Start testing double-buffered drawing");
+                  Graphics canvas = getGraphics();
+                  Image doublebuffer = createImage(size.width,size.height);
+                  g = doublebuffer.getGraphics();
+                  runSet_noClipping(g,size);
+                  g.dispose();
+                  canvas.drawImage(doublebuffer, 0, 0, this);
+
+                  g = doublebuffer.getGraphics();
+                  runSet_withClipping(g, size);
+                  g.dispose();
+                  canvas.drawImage(doublebuffer, 0, 0, this);
+
+                  g = doublebuffer.getGraphics();
+                  runSet_zeroClipping(g, size);
+                  g.dispose();
+                  canvas.drawImage(doublebuffer, 0, 0, this);
+                  canvas.dispose();
+                }
+
+              printReport();
+
+              if (iterations != 0)
+                {
+                  if (iterations != -1)
+                    iterations--;
+                }
+              else
+                {
+                  System.out.println("--- done --------------------------------------------------------");
+                  synchronized (this)
+                    {
+                      doPaint = false;
+                    }
+                  done = true;
+                }
+            }
+          catch (Error error)
+            {
+              System.err.println("Error: " + error);
+              System.exit(129);
+            }
+        }
+      System.exit(0);
+    }
+
+    private void runSet_zeroClipping(Graphics g, Dimension size)
+    {
+      int clipped_width;
+      int clipped_height;
+      int clipped_x;
+      int clipped_y;
+
+      clipped_width = 0;
+      clipped_height = 0;
+      clipped_x = (size.width) / 2;
+      clipped_y = (size.height) / 2;
+      g.setClip(0, 0, size.width, size.height);
+      g.setColor(Color.BLACK);
+      g.fillRect(0, 0, size.width, size.height);
+      g.setColor(Color.WHITE);
+      g.drawRect(0, 0, size.width - 1, size.height - 1);
+      g.fillRect(clipped_x - 1, clipped_y - 1, clipped_width + 2, clipped_height + 2);
+
+      g.clipRect(clipped_x, clipped_y, clipped_width, clipped_height);
+      g.setColor(Color.BLACK);
+      g.fillRect(0, 0, size.width, size.height);
+
+      setTestContext("clipping to zero");
+
+      runTestSet(g, size);
+    }
+
+    private void runSet_withClipping(Graphics g, Dimension size)
+    {
+      int clipped_width = 2 * size.width / 3;
+      int clipped_height = 2 * size.height / 3;
+      int clipped_x = (size.width - clipped_width) / 2;
+      int clipped_y = (size.height - clipped_height) / 2;
+
+      g.setClip(0,0,size.width,size.height);
+
+      g.setColor(Color.BLACK);
+      g.fillRect(0, 0, size.width, size.height);
+      g.setColor(Color.GREEN);
+      g.drawRect(0, 0, size.width - 1, size.height - 1);
+      g.setColor(Color.WHITE);
+      g.fillRect(clipped_x - 1, clipped_y - 1, clipped_width + 2, clipped_height + 2);
+
+      g.clipRect(clipped_x, clipped_y, clipped_width, clipped_height);
+      g.setColor(Color.BLACK);
+      g.fillRect(0, 0, size.width, size.height);
+
+      setTestContext("with clipping");
+
+      runTestSet(g, size);
+    }
+
+    public void runSet_noClipping(Graphics g, Dimension size)
+    {
+      g.setColor(Color.BLACK);
+      g.fillRect(0, 0, size.width, size.height);
+
+      setTestContext("without clipping");
+
+      runTestSet(g, size);
+    }
+
+    public void paint(Graphics g)
+    {
+      synchronized(this)
+        {
+          doPaint=true;
+          notify();
+        }
+    }
+  }
+}
+
+class TestContext
+{
+}
+
+class TestSet
+{
+  private Map testsMap = new TreeMap();
+
+  public void putTest(String testName, TestRecorder recoder)
+  {
+    testsMap.put(testName,recoder);
+  }
+
+  public TestRecorder getTest(String testName)
+  {
+    return (TestRecorder)testsMap.get(testName);
+  }
+
+  public Iterator testIterator()
+  {
+    return testsMap.keySet().iterator();
+  }
+}
+
+class TestRecorder
+{
+  String test;
+  long   totalTime = 0;
+  long   minTime   = Long.MAX_VALUE;
+  long   maxTime   = Long.MIN_VALUE;
+  int    runCount  = 0;
+
+  /**
+   * @return Returns the maxTime.
+   */
+  public final long getMaxTime()
+  {
+    return maxTime;
+  }
+
+  /**
+   * @return Returns the minTime.
+   */
+  public final long getMinTime()
+  {
+    return minTime;
+  }
+
+  /**
+   * @return Returns the test name.
+   */
+  public final String getTestName()
+  {
+    return test;
+  }
+
+  public final double getAverage()
+  {
+    return ((double)totalTime) / ((double)runCount);
+  }
+
+  public TestRecorder(String testName)
+  {
+    test = testName;
+  }
+
+  public void addRun(long time)
+  {
+    totalTime += time;
+    if(minTime > time)
+      minTime = time;
+    if(maxTime < time)
+      maxTime = time;
+    runCount += 1;
+  }
+}

Index: examples/gnu/classpath/examples/awt/aicas.png
===================================================================
RCS file: examples/gnu/classpath/examples/awt/aicas.png
diff -N examples/gnu/classpath/examples/awt/aicas.png
Binary files /dev/null and /tmp/cvsiwjjf1 differ

Index: examples/gnu/classpath/examples/awt/palme.gif
===================================================================
RCS file: examples/gnu/classpath/examples/awt/palme.gif
diff -N examples/gnu/classpath/examples/awt/palme.gif
Binary files /dev/null and /tmp/cvsRhrISZ differ



From MAILER-DAEMON Wed Jun 14 12:12:03 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqXyN-00074Z-Gm
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 12:12:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqXyL-00071e-Ow
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 12:12:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqXyK-000709-QD
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 12:12:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqXyK-000700-NA
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 12:12:00 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqY7X-0001Fa-Gx
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 12:21:31 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqXyK-00052Q-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 12:12:00 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FqXyI-00052H-O2
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 16:12:00 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqXyI-00052H-O2@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 14 Jun 2006 16:11:58 +0000
Subject: [commit-cp] classpath/javax/swing RepaintManager.java Chang...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 16:12:02 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/14 16:11:58

Modified files:
	javax/swing    : RepaintManager.java 
	.              : ChangeLog 

Log message:
	2006-06-14  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/RepaintManager.java
		(MERGE_REGIONS): New constant flag.
		(commitBuffer): Exclude the merging of regions by default. This
		was causing painting artifacts in some applications, especially
		when different areas of the GUI are updated synchronously.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/RepaintManager.java?cvsroot=classpath&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7814&r2=1.7815

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7814
retrieving revision 1.7815
diff -u -b -r1.7814 -r1.7815
--- ChangeLog	14 Jun 2006 14:56:15 -0000	1.7814
+++ ChangeLog	14 Jun 2006 16:11:57 -0000	1.7815
@@ -1,5 +1,13 @@
 2006-06-14  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/RepaintManager.java
+	(MERGE_REGIONS): New constant flag.
+	(commitBuffer): Exclude the merging of regions by default. This
+	was causing painting artifacts in some applications, especially
+	when different areas of the GUI are updated synchronously.
+
+2006-06-14  Roman Kennke  <kennke@aicas.com>
+
 	* examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java:
 	New file. This is a benchmark for AWT 1.1 style graphics operations.
 	* examples/gnu/classpath/examples/awt/palme.gif: New file.



From MAILER-DAEMON Wed Jun 14 12:26:11 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqYC3-0005kY-Gw
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 12:26:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqYC2-0005iy-AZ
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 12:26:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqYC1-0005iS-UK
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 12:26:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqYC1-0005iJ-Je
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 12:26:09 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqYLE-0002bM-ET
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 12:35:40 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqYC0-00066Q-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 12:26:08 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FqYC0-00066N-Em
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 16:26:08 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqYC0-00066N-Em@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Wed, 14 Jun 2006 16:26:08 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/Component.java jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 16:26:10 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/14 16:26:08

Modified files:
	.              : ChangeLog 
	java/awt       : Component.java TextComponent.java 

Log message:
	2006-06-14  Lillian Angel  <langel@redhat.com>
	
	        * java/awt/Component.java
	        (ignoreOldMouseEvents): New helper function.
	        (translateEvent): Changed to be non-static and use new helper.
	        * java/awt/TextComponent.java
	        (ignoreOldMouseEvents): New helper function.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7815&r2=1.7816
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Component.java?cvsroot=classpath&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/TextComponent.java?cvsroot=classpath&r1=1.21&r2=1.22

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7815
retrieving revision 1.7816
diff -u -b -r1.7815 -r1.7816
--- ChangeLog	14 Jun 2006 16:11:57 -0000	1.7815
+++ ChangeLog	14 Jun 2006 16:26:07 -0000	1.7816
@@ -1,3 +1,11 @@
+2006-06-14  Lillian Angel  <langel@redhat.com>
+
+	* java/awt/Component.java
+	(ignoreOldMouseEvents): New helper function.
+	(translateEvent): Changed to be non-static and use new helper.
+	* java/awt/TextComponent.java
+	(ignoreOldMouseEvents): New helper function.
+
 2006-06-14  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/RepaintManager.java

Index: java/awt/Component.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Component.java,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- java/awt/Component.java	13 Jun 2006 19:41:22 -0000	1.122
+++ java/awt/Component.java	14 Jun 2006 16:26:07 -0000	1.123
@@ -2318,6 +2318,17 @@
   }
 
   /**
+   * By default, no old mouse events should be ignored.
+   * This can be overridden by subclasses.
+   * 
+   * @return false, no mouse events are ignored.
+   */
+  boolean ignoreOldMouseEvents()
+  {
+    return false;
+  }
+  
+  /**
    * AWT 1.0 event handler.
    *
    * This method simply calls handleEvent and returns the result.
@@ -4801,7 +4812,7 @@
    *
    * @return an AWT 1.0 event representing e
    */
-  static Event translateEvent (AWTEvent e)
+  Event translateEvent (AWTEvent e)
   {
     Object target = e.getSource ();
     Event translated = null;
@@ -4864,7 +4875,7 @@
         if ((mods & InputEvent.ALT_DOWN_MASK) != 0)
           oldMods |= Event.ALT_MASK;
 
-        if (e instanceof MouseEvent)
+        if (e instanceof MouseEvent && !ignoreOldMouseEvents())
           {
             if (id == MouseEvent.MOUSE_PRESSED)
               oldID = Event.MOUSE_DOWN;

Index: java/awt/TextComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/TextComponent.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- java/awt/TextComponent.java	20 Sep 2005 01:05:28 -0000	1.21
+++ java/awt/TextComponent.java	14 Jun 2006 16:26:08 -0000	1.22
@@ -734,8 +734,17 @@
     return null;
   }
   
-  
-
+  /**
+   * All old mouse events for this component should
+   * be ignored.
+   * 
+   * @return true to ignore all old mouse events.
+   */
+  boolean
+  ignoreOldMouseEvents()
+  {
+    return true;
+  }
 
 } // class TextComponent
 



From MAILER-DAEMON Wed Jun 14 13:23:13 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqZ5F-0002Xw-15
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 13:23:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqZ5D-0002Xb-CO
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 13:23:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqZ5C-0002Wh-83
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 13:23:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqZ5C-0002We-5x
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 13:23:10 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqZEP-0007ht-KX
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 13:32:41 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqZ5B-0001Z1-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 13:23:09 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FqZ5A-0001Yy-8R
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 17:23:09 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqZ5A-0001Yy-8R@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Wed, 14 Jun 2006 17:23:08 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Compo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 17:23:11 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/14 17:23:08

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: ComponentGraphics.java 

Log message:
	       * gnu/java/awt/peer/gtk/ComponentGraphics.java (drawLine): Lock and
	       call super.
	       (drawRect): Likewise.
	       (fillRect): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7816&r2=1.7817
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java?cvsroot=classpath&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7816
retrieving revision 1.7817
diff -u -b -r1.7816 -r1.7817
--- ChangeLog	14 Jun 2006 16:26:07 -0000	1.7816
+++ ChangeLog	14 Jun 2006 17:23:07 -0000	1.7817
@@ -1,3 +1,10 @@
+2006-06-14  Mark Wielaard  <mark@klomp.org>
+
+	* gnu/java/awt/peer/gtk/ComponentGraphics.java (drawLine): Lock and
+	call super.
+	(drawRect): Likewise.
+	(fillRect): Likewise.
+
 2006-06-14  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/Component.java

Index: gnu/java/awt/peer/gtk/ComponentGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gnu/java/awt/peer/gtk/ComponentGraphics.java	13 Jun 2006 12:59:22 -0000	1.16
+++ gnu/java/awt/peer/gtk/ComponentGraphics.java	14 Jun 2006 17:23:07 -0000	1.17
@@ -359,5 +359,44 @@
     return super.drawImage(bimg, x, y, width, height, observer);
   }
 
+  public void drawLine(int x1, int y1, int x2, int y2)
+  {
+    lock();
+    try
+      {
+        super.drawLine(x1, y1, x2, y2);
+      }
+    finally
+      {
+        unlock();
+      }
+  }
+
+  public void drawRect(int x, int y, int width, int height)
+  {
+    lock();
+    try
+      {
+        super.drawRect(x, y, width, height);
+      }
+    finally
+      {
+        unlock();
+      }
+  }
+
+  public void fillRect(int x, int y, int width, int height)
+  {
+    lock();
+    try
+      {
+        super.fillRect(x, y, width, height);
+      }
+    finally
+      {
+        unlock();
+      }
+  }
+
 }
 



From MAILER-DAEMON Wed Jun 14 15:09:48 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqakO-0007GW-KB
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 15:09:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqakO-0007FN-1s
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 15:09:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqakN-0007EK-Ey
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 15:09:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqakN-0007E5-0i
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 15:09:47 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fqatb-0006vH-Fy
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 15:19:19 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqakH-0005Ww-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 15:09:41 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FqakG-0005Wt-I3
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 19:09:41 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqakG-0005Wt-I3@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Wed, 14 Jun 2006 19:09:40 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/Component.java jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 19:09:48 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/14 19:09:40

Modified files:
	.              : ChangeLog 
	java/awt       : Component.java TextComponent.java 

Log message:
	2006-06-14  Lillian Angel  <langel@redhat.com>
	
	        * java/awt/Component.java
	        (ignoreOldMouseEvents): Made static.
	        (translateEvent): Made static.
	        * java/awt/TextComponent.java
	        (ignoreOldMouseEvents): Made static.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7817&r2=1.7818
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Component.java?cvsroot=classpath&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/TextComponent.java?cvsroot=classpath&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7817
retrieving revision 1.7818
diff -u -b -r1.7817 -r1.7818
--- ChangeLog	14 Jun 2006 17:23:07 -0000	1.7817
+++ ChangeLog	14 Jun 2006 19:09:39 -0000	1.7818
@@ -1,3 +1,11 @@
+2006-06-14  Lillian Angel  <langel@redhat.com>
+
+	* java/awt/Component.java
+	(ignoreOldMouseEvents): Made static.
+	(translateEvent): Made static.
+	* java/awt/TextComponent.java
+	(ignoreOldMouseEvents): Made static.
+
 2006-06-14  Mark Wielaard  <mark@klomp.org>
 
 	* gnu/java/awt/peer/gtk/ComponentGraphics.java (drawLine): Lock and

Index: java/awt/Component.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Component.java,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- java/awt/Component.java	14 Jun 2006 16:26:07 -0000	1.123
+++ java/awt/Component.java	14 Jun 2006 19:09:40 -0000	1.124
@@ -2323,7 +2323,7 @@
    * 
    * @return false, no mouse events are ignored.
    */
-  boolean ignoreOldMouseEvents()
+  static boolean ignoreOldMouseEvents()
   {
     return false;
   }
@@ -4812,7 +4812,7 @@
    *
    * @return an AWT 1.0 event representing e
    */
-  Event translateEvent (AWTEvent e)
+  static Event translateEvent (AWTEvent e)
   {
     Object target = e.getSource ();
     Event translated = null;

Index: java/awt/TextComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/TextComponent.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- java/awt/TextComponent.java	14 Jun 2006 16:26:08 -0000	1.22
+++ java/awt/TextComponent.java	14 Jun 2006 19:09:40 -0000	1.23
@@ -740,7 +740,7 @@
    * 
    * @return true to ignore all old mouse events.
    */
-  boolean
+  static boolean
   ignoreOldMouseEvents()
   {
     return true;



From MAILER-DAEMON Wed Jun 14 16:26:17 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqbwP-0003TD-Eq
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 16:26:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqbwN-0003S8-BS
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 16:26:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqbwM-0003Rk-OD
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 16:26:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqbwM-0003Rc-C4
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 16:26:14 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fqc5b-0002jk-G8
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 16:35:47 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqbwL-0008EX-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 16:26:13 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FqbwK-0008ES-N7
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 20:26:13 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqbwK-0008ES-N7@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Wed, 14 Jun 2006 20:26:12 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/management/Manage...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 20:26:15 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/14 20:26:12

Modified files:
	.              : ChangeLog 
	java/lang/management: ManagementPermission.java 
	javax/management: Attribute.java MBeanException.java 
	                  ReflectionException.java 

Log message:
	2006-06-14  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/management/ManagementPermission.java:
		Added serialization UID.
		* javax/management/Attribute.java: Likewise.
		* javax/management/MBeanException.java,
		* javax/management/ReflectionException.java:
		Added serialization UID and changed to extend
		javax.management.JMException.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7818&r2=1.7819
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ManagementPermission.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/Attribute.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/MBeanException.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/ReflectionException.java?cvsroot=classpath&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7818
retrieving revision 1.7819
diff -u -b -r1.7818 -r1.7819
--- ChangeLog	14 Jun 2006 19:09:39 -0000	1.7818
+++ ChangeLog	14 Jun 2006 20:26:11 -0000	1.7819
@@ -1,3 +1,13 @@
+2006-06-14  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/lang/management/ManagementPermission.java:
+	Added serialization UID.
+	* javax/management/Attribute.java: Likewise.
+	* javax/management/MBeanException.java,
+	* javax/management/ReflectionException.java:
+	Added serialization UID and changed to extend
+	javax.management.JMException.
+	
 2006-06-14  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/Component.java

Index: java/lang/management/ManagementPermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/management/ManagementPermission.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- java/lang/management/ManagementPermission.java	12 Jun 2006 08:43:00 -0000	1.1
+++ java/lang/management/ManagementPermission.java	14 Jun 2006 20:26:12 -0000	1.2
@@ -80,6 +80,11 @@
 {
 
   /**
+   * Compatible with JDK 1.5
+   */
+  private static final long serialVersionUID = 1897496590799378737L;
+
+  /**
    * Constructs a new <code>ManagementPermission</code>
    * for one of the two permission targets, "monitor"
    * and "control".

Index: javax/management/Attribute.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/management/Attribute.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/management/Attribute.java	9 Jan 2006 21:14:37 -0000	1.2
+++ javax/management/Attribute.java	14 Jun 2006 20:26:12 -0000	1.3
@@ -51,6 +51,11 @@
   implements Serializable
 {
   /**
+   * Compatible with JDK 1.5
+   */
+  private static final long serialVersionUID = 2484220110589082382L;
+
+  /**
    * The attribute name.
    */
   final String m_name;

Index: javax/management/MBeanException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/management/MBeanException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- javax/management/MBeanException.java	13 Jun 2006 20:54:01 -0000	1.1
+++ javax/management/MBeanException.java	14 Jun 2006 20:26:12 -0000	1.2
@@ -49,9 +49,14 @@
  * @since 1.5
  */
 public class MBeanException
-  extends Exception
+  extends JMException
 {
 
+  /**
+   * Compatible with JDK 1.5
+   */
+  private static final long serialVersionUID = 4066342430588744142L;
+
   /* Sun re-implemented causality -- don't know why, but
      serialization demands we do too... */
 

Index: javax/management/ReflectionException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/management/ReflectionException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- javax/management/ReflectionException.java	13 Jun 2006 20:54:01 -0000	1.1
+++ javax/management/ReflectionException.java	14 Jun 2006 20:26:12 -0000	1.2
@@ -49,9 +49,14 @@
  * @since 1.5
  */
 public class ReflectionException
-  extends Exception
+  extends JMException
 {
 
+  /**
+   * Compatible with JDK 1.5
+   */
+  private static final long serialVersionUID = 9170809325636915553L;
+
   /* Sun re-implemented causality -- don't know why, but
      serialization demands we do too... */
 



From MAILER-DAEMON Wed Jun 14 16:29:34 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqbzZ-00054s-WF
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 16:29:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqbzY-00054m-B4
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 16:29:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqbzW-000540-Si
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 16:29:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqbzW-00053q-Nd
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 16:29:30 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fqc8l-0002zu-Sd
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 16:39:03 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqbzW-0008K7-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 16:29:30 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FqbzU-0008K3-T2
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 20:29:30 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqbzU-0008K3-T2@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Wed, 14 Jun 2006 20:29:28 +0000
Subject: [commit-cp] classpath ChangeLog javax/naming/InitialContext...
	[generics-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 20:29:32 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics-branch
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/14 20:29:27

Modified files:
	.              : ChangeLog 
	javax/naming   : InitialContext.java 

Log message:
	2006-06-14  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* javax/naming/InitialContext.java:
		(list(javax.naming.Name)): Fixed generic type.
		(list(String)): Likewise.
		(listBindings(javax.naming.Name)): Likewise.
		(listBindings(String)): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.267&r2=1.2386.2.268
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/naming/InitialContext.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.7.2.5&r2=1.7.2.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.267
retrieving revision 1.2386.2.268
diff -u -b -r1.2386.2.267 -r1.2386.2.268
--- ChangeLog	11 Jun 2006 18:23:15 -0000	1.2386.2.267
+++ ChangeLog	14 Jun 2006 20:29:25 -0000	1.2386.2.268
@@ -1,3 +1,11 @@
+2006-06-14  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* javax/naming/InitialContext.java:
+	(list(javax.naming.Name)): Fixed generic type.
+	(list(String)): Likewise.
+	(listBindings(javax.naming.Name)): Likewise.
+	(listBindings(String)): Likewise.
+	
 2006-06-11  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	PR Classpath/26065

Index: javax/naming/InitialContext.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/InitialContext.java,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -b -r1.7.2.5 -r1.7.2.6
--- javax/naming/InitialContext.java	4 Jun 2006 21:26:33 -0000	1.7.2.5
+++ javax/naming/InitialContext.java	14 Jun 2006 20:29:26 -0000	1.7.2.6
@@ -424,25 +424,25 @@
   }
 
   /** @inheritDoc */  
-  public NamingEnumeration list (Name name) throws NamingException
+  public NamingEnumeration<NameClassPair> list (Name name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).list (name);
   }
 
   /** @inheritDoc */  
-  public NamingEnumeration list (String name) throws NamingException
+  public NamingEnumeration<NameClassPair> list (String name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).list (name);
   }
 
   /** @inheritDoc */  
-  public NamingEnumeration listBindings (Name name) throws NamingException
+  public NamingEnumeration<Binding> listBindings (Name name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).listBindings (name);
   }
 
   /** @inheritDoc */  
-  public NamingEnumeration listBindings (String name) throws NamingException
+  public NamingEnumeration<Binding> listBindings (String name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).listBindings (name);
   }



From MAILER-DAEMON Wed Jun 14 17:07:48 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fqcaa-0001WD-Fd
	for mharc-commit-classpath@gnu.org; Wed, 14 Jun 2006 17:07:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqcaZ-0001VV-6M
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 17:07:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqcaX-0001VH-7l
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 17:07:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqcaX-0001VE-24
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 17:07:45 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fqcjm-0005rv-JW
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 17:17:18 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqcaW-0002GZ-00
	for <commit-classpath@gnu.org>; Wed, 14 Jun 2006 17:07:44 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FqcaU-0002GV-VI
	for commit-classpath@gnu.org; Wed, 14 Jun 2006 21:07:44 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqcaU-0002GV-VI@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 14 Jun 2006 21:07:42 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/basic BasicComboBoxU...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jun 2006 21:07:47 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/14 21:07:42

Modified files:
	javax/swing/plaf/basic: BasicComboBoxUI.java 
	.              : ChangeLog 

Log message:
	2006-06-14  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/plaf/basic/BasicComboBoxUI.java
		(getAccessibleChildrenCount): Implemented.
		(getAccessibleChild): Implemented.
		(isNavigationKey): Implemented.
		(KeyHandler.keyPressed): Implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java?cvsroot=classpath&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7819&r2=1.7820

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7819
retrieving revision 1.7820
diff -u -b -r1.7819 -r1.7820
--- ChangeLog	14 Jun 2006 20:26:11 -0000	1.7819
+++ ChangeLog	14 Jun 2006 21:07:42 -0000	1.7820
@@ -1,3 +1,11 @@
+2006-06-14  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/plaf/basic/BasicComboBoxUI.java
+	(getAccessibleChildrenCount): Implemented.
+	(getAccessibleChild): Implemented.
+	(isNavigationKey): Implemented.
+	(KeyHandler.keyPressed): Implemented.
+
 2006-06-14  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/lang/management/ManagementPermission.java:



From MAILER-DAEMON Thu Jun 15 04:43:02 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqnRO-0001DN-8p
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 04:43:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqnRL-0001A1-OT
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 04:42:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqnRL-00018a-17
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 04:42:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqnRK-00018P-SQ
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 04:42:58 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fqnag-0006GS-Rq
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 04:52:39 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqnRJ-0001lb-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 04:42:57 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FqnRH-0001lY-Sh
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 08:42:56 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqnRH-0001lY-Sh@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Thu, 15 Jun 2006 08:42:55 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Cairo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 08:43:00 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/15 08:42:55

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 
	gnu/java/awt/print: PostScriptGraphics2D.java 
	java/awt       : Shape.java 

Log message:
	2006-06-15  David Gilbert  <david.gilbert@object-refinery.com>
	
		* gnu/java/awt/peer/gtk/CairoGraphics2D.java
		(draw(Shape)): Pass null transform to getPathIterator(),
		(getClip): Likewise,
		* gnu/java/print/PostscriptGraphics2D.java
		(drawStringShape): Pass null transform to getPathIterator(),
		(writeShape): Likewise,
		* java/awt/Shape.java: Small updates to API docs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7820&r2=1.7821
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/print/PostScriptGraphics2D.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Shape.java?cvsroot=classpath&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7820
retrieving revision 1.7821
diff -u -b -r1.7820 -r1.7821
--- ChangeLog	14 Jun 2006 21:07:42 -0000	1.7820
+++ ChangeLog	15 Jun 2006 08:42:52 -0000	1.7821
@@ -1,3 +1,13 @@
+2006-06-15  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
+	(draw(Shape)): Pass null transform to getPathIterator(),
+	(getClip): Likewise,
+	* gnu/java/print/PostscriptGraphics2D.java
+	(drawStringShape): Pass null transform to getPathIterator(),
+	(writeShape): Likewise,
+	* java/awt/Shape.java: Small updates to API docs.
+
 2006-06-14  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/plaf/basic/BasicComboBoxUI.java

Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java	14 Jun 2006 13:51:04 -0000	1.23
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java	15 Jun 2006 08:42:55 -0000	1.24
@@ -776,7 +776,7 @@
     else
       {
         GeneralPath p = new GeneralPath();
-        PathIterator pi = clip.getPathIterator(new AffineTransform());
+        PathIterator pi = clip.getPathIterator(null);
         p.append(pi, false);
         return p;
       }
@@ -904,8 +904,7 @@
         // See CubicSegment.getDisplacedSegments().
         if (stroke instanceof BasicStroke)
           {
-            PathIterator flatten = s.getPathIterator(new AffineTransform(),
-                                                       1.0);
+            PathIterator flatten = s.getPathIterator(null, 1.0);
             GeneralPath p = new GeneralPath();
             p.append(flatten, false);
             s = p;

Index: gnu/java/awt/print/PostScriptGraphics2D.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/print/PostScriptGraphics2D.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/java/awt/print/PostScriptGraphics2D.java	20 May 2006 07:56:42 -0000	1.1
+++ gnu/java/awt/print/PostScriptGraphics2D.java	15 Jun 2006 08:42:55 -0000	1.2
@@ -668,7 +668,7 @@
     saveAndInvertAxis();
 
     // draw the shape s with an inverted Y axis.
-    PathIterator pi = s.getPathIterator(new AffineTransform());
+    PathIterator pi = s.getPathIterator(null);
     float[] coords = new float[6];
 
     while (! pi.isDone())
@@ -872,7 +872,7 @@
   /** write a shape to the file */
   private void writeShape(Shape s)
   {
-    PathIterator pi = s.getPathIterator(new AffineTransform());
+    PathIterator pi = s.getPathIterator(null);
     float[] coords = new float[6];
 
     while (! pi.isDone())

Index: java/awt/Shape.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/Shape.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- java/awt/Shape.java	2 Jul 2005 20:32:26 -0000	1.8
+++ java/awt/Shape.java	15 Jun 2006 08:42:55 -0000	1.9
@@ -1,5 +1,5 @@
 /* Shape.java -- the classic Object-Oriented shape interface
-   Copyright (C) 1999, 2002, 2005  Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2005, 2006,  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -176,7 +176,8 @@
    * not required, that the Shape isolate iterations from future changes to
    * the boundary, and document this fact.
    *
-   * @param transform an optional transform to apply to the iterator
+   * @param transform an optional transform to apply to the 
+   *                  iterator (<code>null</code> permitted).
    * @return a new iterator over the boundary
    * @since 1.2
    */
@@ -185,7 +186,7 @@
   /**
    * Return an iterator along the flattened version of the shape boundary.
    * Only SEG_MOVETO, SEG_LINETO, and SEG_CLOSE points are returned in the
-   * iterator. The flatness paramter controls how far points are allowed to
+   * iterator. The flatness parameter controls how far points are allowed to
    * differ from the real curve; although a limit on accuracy may cause this
    * parameter to be enlarged if needed.
    *
@@ -194,10 +195,11 @@
    * use. It is recommended, but not required, that the Shape isolate
    * iterations from future changes to the boundary, and document this fact.
    *
-   * @param transform an optional transform to apply to the iterator
+   * @param transform an optional transform to apply to the 
+   *                  iterator (<code>null</code> permitted).
    * @param flatness the maximum distance for deviation from the real boundary
    * @return a new iterator over the boundary
    * @since 1.2
    */
   PathIterator getPathIterator(AffineTransform transform, double flatness);
-} // interface Shape
+} 



From MAILER-DAEMON Thu Jun 15 09:32:57 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fqrxx-0006eQ-0A
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 09:32:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fqrxu-0006ce-Dc
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 09:32:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fqrxs-0006ae-S5
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 09:32:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fqrxs-0006ab-NP
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 09:32:52 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fqs7H-0001x3-SN
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 09:42:35 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fqrxr-0002TE-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 09:32:51 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fqrxo-0002T5-Uu
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 13:32:50 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fqrxo-0002T5-Uu@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Thu, 15 Jun 2006 13:32:48 +0000
Subject: [commit-cp] classpath/javax/swing JComponent.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 13:32:54 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/15 13:32:48

Modified files:
	javax/swing    : JComponent.java 
	.              : ChangeLog 

Log message:
	2006-06-15  Roman Kennke  <kennke@aicas.com>
	
		PR 28027
		* javax/swing/JComponent.java
		(paintImmediately2): Only paint component without double buffering
		when all of it's parents have also double buffering disabled.
		(isPaintingDoubleBuffered): New helper method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.127&r2=1.128
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7821&r2=1.7822

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7821
retrieving revision 1.7822
diff -u -b -r1.7821 -r1.7822
--- ChangeLog	15 Jun 2006 08:42:52 -0000	1.7821
+++ ChangeLog	15 Jun 2006 13:32:46 -0000	1.7822
@@ -1,3 +1,11 @@
+2006-06-15  Roman Kennke  <kennke@aicas.com>
+
+	PR 28027
+	* javax/swing/JComponent.java
+	(paintImmediately2): Only paint component without double buffering
+	when all of it's parents have also double buffering disabled.
+	(isPaintingDoubleBuffered): New helper method.
+
 2006-06-15  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* gnu/java/awt/peer/gtk/CairoGraphics2D.java



From MAILER-DAEMON Thu Jun 15 09:42:40 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fqs7M-0002pF-KX
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 09:42:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fqs7K-0002nu-8D
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 09:42:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fqs7J-0002mu-BX
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 09:42:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fqs7J-0002mr-3a
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 09:42:37 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqsGi-0002jW-8t
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 09:52:20 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fqs7H-0003dG-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 09:42:35 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fqs7F-0003dC-HO
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 13:42:35 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fqs7F-0003dC-HO@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Thu, 15 Jun 2006 13:42:33 +0000
Subject: [commit-cp] classpath/javax/swing RepaintManager.java Chang...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 13:42:38 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/15 13:42:33

Modified files:
	javax/swing    : RepaintManager.java 
	.              : ChangeLog 

Log message:
	2006-06-15  Roman Kennke  <kennke@aicas.com>
	
		PR 28037
		* javax/swing/RepaintManager.java
		(blitBuffer): Substract coordinates the other way around.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/RepaintManager.java?cvsroot=classpath&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7822&r2=1.7823

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7822
retrieving revision 1.7823
diff -u -b -r1.7822 -r1.7823
--- ChangeLog	15 Jun 2006 13:32:46 -0000	1.7822
+++ ChangeLog	15 Jun 2006 13:42:32 -0000	1.7823
@@ -1,5 +1,11 @@
 2006-06-15  Roman Kennke  <kennke@aicas.com>
 
+	PR 28037
+	* javax/swing/RepaintManager.java
+	(blitBuffer): Substract coordinates the other way around.
+
+2006-06-15  Roman Kennke  <kennke@aicas.com>
+
 	PR 28027
 	* javax/swing/JComponent.java
 	(paintImmediately2): Only paint component without double buffering



From MAILER-DAEMON Thu Jun 15 10:15:53 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqsdV-0008Vp-58
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 10:15:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqsdU-0008VY-3N
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 10:15:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqsdT-0008V3-Ct
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 10:15:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqsdT-0008Uz-2u
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 10:15:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fqsms-0005je-N0
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 10:25:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqsdS-0004Ja-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 10:15:50 -0400
Received: from fkung by savannah.gnu.org with local (Exim 4.50)
	id 1FqsdQ-0004JX-AJ
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:15:50 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqsdQ-0004JX-AJ@savannah.gnu.org>
From: Francis Kung <fkung@redhat.com>
Date: Thu, 15 Jun 2006 14:15:48 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/basic BasicComboBoxU...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 14:15:52 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Francis Kung <fkung>	06/06/15 14:15:48

Modified files:
	javax/swing/plaf/basic: BasicComboBoxUI.java 
	                        BasicArrowButton.java 
	                        BasicLookAndFeel.java 
	.              : ChangeLog 

Log message:
	2006-06-15  Francis Kung  <fkung@redhat.com>
	
		* javax/swing/plaf/basic/BasicArrowButton.java:
		(BasicArrowButton): move client property for not triggering out 
		of consturctor
		* javax/swing/plaf/basic/BasicComboBoxUI.java:
		(configureArrowButton): set client property for not triggering
		(installUI): set client property for not triggering
		* javax/swing/plaf/basic/BasicLookAndFeel.java:
		(PopupHelper.mousePressed): check client property for triggering

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java?cvsroot=classpath&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicArrowButton.java?cvsroot=classpath&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java?cvsroot=classpath&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7823&r2=1.7824

Patches:



Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7823
retrieving revision 1.7824
diff -u -b -r1.7823 -r1.7824
--- ChangeLog	15 Jun 2006 13:42:32 -0000	1.7823
+++ ChangeLog	15 Jun 2006 14:15:45 -0000	1.7824
@@ -1,3 +1,14 @@
+2006-06-15  Francis Kung  <fkung@redhat.com>
+
+	* javax/swing/plaf/basic/BasicArrowButton.java:
+	(BasicArrowButton): move client property for not triggering out 
+	of consturctor
+	* javax/swing/plaf/basic/BasicComboBoxUI.java:
+	(configureArrowButton): set client property for not triggering
+	(installUI): set client property for not triggering
+	* javax/swing/plaf/basic/BasicLookAndFeel.java:
+	(PopupHelper.mousePressed): check client property for triggering
+
 2006-06-15  Roman Kennke  <kennke@aicas.com>
 
 	PR 28037



From MAILER-DAEMON Thu Jun 15 13:12:56 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqvOq-0003JM-B4
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 13:12:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqvOo-0003Gc-78
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 13:12:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqvOn-0003Fx-Oi
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 13:12:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqvOn-0003Fu-J7
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 13:12:53 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqvYE-0004jZ-Uu
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 13:22:39 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqvOn-0004Xa-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 13:12:53 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FqvOl-0004XQ-HY
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 17:12:52 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqvOl-0004XQ-HY@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Thu, 15 Jun 2006 17:12:51 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/management/Manage...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 17:12:54 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/15 17:12:51

Modified files:
	.              : ChangeLog 
	java/lang/management: ManagementFactory.java 
	                      ManagementPermission.java 

Log message:
	2006-06-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/management/ManagementFactory.java:
		Add private constructor to prevent instance creation.
		* java/lang/management/ManagementPermission.java:
		Make final.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7824&r2=1.7825
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ManagementFactory.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ManagementPermission.java?cvsroot=classpath&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7824
retrieving revision 1.7825
diff -u -b -r1.7824 -r1.7825
--- ChangeLog	15 Jun 2006 14:15:45 -0000	1.7824
+++ ChangeLog	15 Jun 2006 17:12:49 -0000	1.7825
@@ -1,3 +1,10 @@
+2006-06-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/lang/management/ManagementFactory.java:
+	Add private constructor to prevent instance creation.
+	* java/lang/management/ManagementPermission.java:
+	Make final.
+	
 2006-06-15  Francis Kung  <fkung@redhat.com>
 
 	* javax/swing/plaf/basic/BasicArrowButton.java:

Index: java/lang/management/ManagementFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/management/ManagementFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- java/lang/management/ManagementFactory.java	11 Jun 2006 21:57:15 -0000	1.2
+++ java/lang/management/ManagementFactory.java	15 Jun 2006 17:12:51 -0000	1.3
@@ -71,6 +71,11 @@
   private static RuntimeMXBean runtimeBean;
 
   /**
+   * Private constructor to prevent instance creation.
+   */
+  private ManagementFactory() {}
+
+  /**
    * Returns the operating system management bean for the
    * operating system on which the virtual machine is running.
    *

Index: java/lang/management/ManagementPermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/management/ManagementPermission.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- java/lang/management/ManagementPermission.java	14 Jun 2006 20:26:12 -0000	1.2
+++ java/lang/management/ManagementPermission.java	15 Jun 2006 17:12:51 -0000	1.3
@@ -75,7 +75,7 @@
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
  */
-public class ManagementPermission
+public final class ManagementPermission
   extends BasicPermission
 {
 



From MAILER-DAEMON Thu Jun 15 13:37:15 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqvmM-0008CM-TW
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 13:37:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqvmK-0008Ak-UN
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 13:37:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqvmJ-00088Q-Cn
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 13:37:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqvmJ-00088K-31
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 13:37:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fqvvk-0006Wt-0Y
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 13:46:56 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqvmF-0006U0-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 13:37:07 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1FqvmE-0006Tx-Fh
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 17:37:07 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqvmE-0006Tx-Fh@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Thu, 15 Jun 2006 17:37:06 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/AbstractButton....
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 17:37:13 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/15 17:37:05

Modified files:
	.              : ChangeLog 
	javax/swing    : AbstractButton.java 

Log message:
		2006-06-15  Tania Bento  <tbento@redhat.com>
	
	        * javax/swing/AbstractButton.java:
	        (AbstractButton): 'Focusable' should be set to true and not false.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7825&r2=1.7826
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/AbstractButton.java?cvsroot=classpath&r1=1.59&r2=1.60

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7825
retrieving revision 1.7826
diff -u -b -r1.7825 -r1.7826
--- ChangeLog	15 Jun 2006 17:12:49 -0000	1.7825
+++ ChangeLog	15 Jun 2006 17:37:04 -0000	1.7826
@@ -1,3 +1,8 @@
+2006-06-15  Tania Bento  <tbento@redhat.com>
+
+	* javax/swing/AbstractButton.java:
+	(AbstractButton): 'Focusable' should be set to true and not false.
+
 2006-06-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* java/lang/management/ManagementFactory.java:

Index: javax/swing/AbstractButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/AbstractButton.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- javax/swing/AbstractButton.java	14 Jun 2006 13:59:27 -0000	1.59
+++ javax/swing/AbstractButton.java	15 Jun 2006 17:37:05 -0000	1.60
@@ -866,7 +866,7 @@
     borderPainted = true;
     contentAreaFilled = true;
     focusPainted = true;
-    setFocusable(false);
+    setFocusable(true);
     setAlignmentX(CENTER_ALIGNMENT);
     setAlignmentY(CENTER_ALIGNMENT);
     setDisplayedMnemonicIndex(-1);



From MAILER-DAEMON Thu Jun 15 14:09:36 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqwHg-0007Hq-22
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 14:09:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqwHd-0007D2-MS
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:09:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqwHc-0007BC-BS
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:09:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqwHc-0007Ao-2F
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:09:32 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqwR3-0001KN-U9
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:19:18 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqwHa-0007Mk-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 14:09:30 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FqwHY-0007Mg-Re
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 18:09:29 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqwHY-0007Mg-Re@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Thu, 15 Jun 2006 18:09:28 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/BasicStroke.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 18:09:34 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/15 18:09:28

Modified files:
	.              : ChangeLog 
	java/awt       : BasicStroke.java 

Log message:
	       * java/awt/BasicStroke.java (createStrokedShape): Call getPathIterator
	       with null argument.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7827&r2=1.7828
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/BasicStroke.java?cvsroot=classpath&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7827
retrieving revision 1.7828
diff -u -b -r1.7827 -r1.7828
--- ChangeLog	15 Jun 2006 17:58:31 -0000	1.7827
+++ ChangeLog	15 Jun 2006 18:09:24 -0000	1.7828
@@ -1,3 +1,8 @@
+2006-06-15  Mark Wielaard  <mark@klomp.org>
+
+	* java/awt/BasicStroke.java (createStrokedShape): Call getPathIterator
+	with null argument.
+
 2006-06-15  Kyle Galloway <kgallowa@redhat.com>
 
     * gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java

Index: java/awt/BasicStroke.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/BasicStroke.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- java/awt/BasicStroke.java	10 May 2006 14:42:26 -0000	1.12
+++ java/awt/BasicStroke.java	15 Jun 2006 18:09:25 -0000	1.13
@@ -260,7 +260,7 @@
    */
   public Shape createStrokedShape(Shape s)
   {
-    PathIterator pi = s.getPathIterator( new AffineTransform() );
+    PathIterator pi = s.getPathIterator(null);
 
     if( dash == null )
       return solidStroke( pi );



From MAILER-DAEMON Thu Jun 15 14:15:15 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqwN9-00040I-BK
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 14:15:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqwN8-0003yd-9r
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:15:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqwN6-0003yR-VN
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:15:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqwN6-0003yO-QX
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:15:12 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqwWY-0001wT-P6
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:24:58 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqwN6-0007X6-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 14:15:12 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1FqwN4-0007Wz-Rj
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 18:15:12 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqwN4-0007Wz-Rj@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Thu, 15 Jun 2006 18:15:10 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JRadioButtonMen...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 18:15:14 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/15 18:15:10

Modified files:
	.              : ChangeLog 
	javax/swing    : JRadioButtonMenuItem.java 

Log message:
		2006-06-15  Tania Bento  <tbento@redhat.com>
	
	        * javax/swing/JRadioButtonMenuItem.java
	        (JRadioButtonMenuItem): Should set 'focusable' to false.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7828&r2=1.7829
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JRadioButtonMenuItem.java?cvsroot=classpath&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7828
retrieving revision 1.7829
diff -u -b -r1.7828 -r1.7829
--- ChangeLog	15 Jun 2006 18:09:24 -0000	1.7828
+++ ChangeLog	15 Jun 2006 18:15:10 -0000	1.7829
@@ -10,6 +10,16 @@
 
 2006-06-15  Tania Bento  <tbento@redhat.com>
 
+	* javax/swing/JRadioButtonMenuItem.java
+	(JRadioButtonMenuItem): Should set 'focusable' to false.
+
+2006-06-15  Tania Bento  <tbento@redhat.com>
+
+	* javax/swing/JCheckBoxMenuItem.java
+	(JCheckBoxMenuItem): Should set 'focusable' to false.
+
+2006-06-15  Tania Bento  <tbento@redhat.com>
+
 	* javax/swing/AbstractButton.java:
 	(AbstractButton): 'Focusable' should be set to true and not false.
 

Index: javax/swing/JRadioButtonMenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JRadioButtonMenuItem.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- javax/swing/JRadioButtonMenuItem.java	20 Apr 2006 12:47:40 -0000	1.12
+++ javax/swing/JRadioButtonMenuItem.java	15 Jun 2006 18:15:10 -0000	1.13
@@ -144,6 +144,7 @@
     super(text, icon);
     setModel(new JToggleButton.ToggleButtonModel());
     model.setSelected(selected);
+    setFocusable(false);
   }
 
   /**



From MAILER-DAEMON Thu Jun 15 14:18:58 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqwQj-0005AJ-Uj
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 14:18:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqwQi-00059s-Io
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:18:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqwQg-00059g-Cr
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:18:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqwQg-00059d-7Q
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:18:54 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fqwa8-0002Ix-3w
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:28:40 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqwQf-0007dV-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 14:18:53 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FqwQe-0007dQ-78
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 18:18:53 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqwQe-0007dQ-78@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Thu, 15 Jun 2006 18:18:52 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/geom/GeneralPath.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 18:18:56 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/15 18:18:51

Modified files:
	.              : ChangeLog 
	java/awt/geom  : GeneralPath.java 

Log message:
	       * java/awt/geom/GeneralPath.java (closePath): Return if path already
	       closed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7829&r2=1.7830
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/geom/GeneralPath.java?cvsroot=classpath&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7829
retrieving revision 1.7830
diff -u -b -r1.7829 -r1.7830
--- ChangeLog	15 Jun 2006 18:15:10 -0000	1.7829
+++ ChangeLog	15 Jun 2006 18:18:51 -0000	1.7830
@@ -1,5 +1,10 @@
 2006-06-15  Mark Wielaard  <mark@klomp.org>
 
+	* java/awt/geom/GeneralPath.java (closePath): Return if path already
+	closed.
+
+2006-06-15  Mark Wielaard  <mark@klomp.org>
+
 	* java/awt/BasicStroke.java (createStrokedShape): Call getPathIterator
 	with null argument.
 

Index: java/awt/geom/GeneralPath.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/geom/GeneralPath.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- java/awt/geom/GeneralPath.java	11 May 2006 08:27:27 -0000	1.15
+++ java/awt/geom/GeneralPath.java	15 Jun 2006 18:18:51 -0000	1.16
@@ -247,10 +247,12 @@
 
   /**
    * Closes the current subpath by drawing a line
-   * back to the point of the last moveTo.
+   * back to the point of the last moveTo, unless the path is already closed.
    */
   public void closePath()
   {
+    if (index >= 1 && types[index - 1] == PathIterator.SEG_CLOSE)
+      return;
     ensureSize(index + 1);
     types[index] = PathIterator.SEG_CLOSE;
     xpoints[index] = xpoints[subpath];



From MAILER-DAEMON Thu Jun 15 14:29:44 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqwbA-0007aA-1Q
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 14:29:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fqwb9-0007Zm-19
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:29:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fqwb8-0007ZS-Ij
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:29:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fqwb8-0007ZP-D1
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:29:42 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fqwka-0003GG-AP
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:39:28 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fqwb7-0007xi-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 14:29:41 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1Fqwb4-0007xO-EY
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 18:29:38 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fqwb4-0007xO-EY@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Thu, 15 Jun 2006 18:29:38 +0000
Subject: [commit-cp] classpath/gnu/java/awt/peer/gtk GtkComponentPee...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 18:29:43 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/15 18:29:37

Modified files:
	gnu/java/awt/peer/gtk: GtkComponentPeer.java 
	                       GtkVolatileImage.java 
	                       VolatileImageGraphics.java 
	.              : ChangeLog 

Log message:
	       * gnu/java/awt/peer/gtk/GtkComponentPeer.java
	       (getGraphicsConfiguration): Return default screen device.
	       * gnu/java/awt/peer/gtk/GtkVolatileImage.java (component):
	       New field.
	       (GtkVolatileImage): Record initiating component.
	       * gnu/java/awt/peer/gtk/VolatileImageGraphics.java
	       (getDeviceConfiguration): Return configuration of image component.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java?cvsroot=classpath&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7830&r2=1.7831

Patches:



Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7830
retrieving revision 1.7831
diff -u -b -r1.7830 -r1.7831
--- ChangeLog	15 Jun 2006 18:18:51 -0000	1.7830
+++ ChangeLog	15 Jun 2006 18:29:35 -0000	1.7831
@@ -1,5 +1,15 @@
 2006-06-15  Mark Wielaard  <mark@klomp.org>
 
+	* gnu/java/awt/peer/gtk/GtkComponentPeer.java
+	(getGraphicsConfiguration): Return default screen device.
+	* gnu/java/awt/peer/gtk/GtkVolatileImage.java (component):
+	New field.
+	(GtkVolatileImage): Record initiating component.
+	* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
+	(getDeviceConfiguration): Return configuration of image component.
+
+2006-06-15  Mark Wielaard  <mark@klomp.org>
+
 	* java/awt/geom/GeneralPath.java (closePath): Return if path already
 	closed.
 



From MAILER-DAEMON Thu Jun 15 14:33:38 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fqwew-0005Y7-GH
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 14:33:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fqweu-0005VQ-Sx
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:33:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fqweu-0005Uu-Dl
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:33:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fqweu-0005Un-BI
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:33:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqwoM-0003Zs-8A
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:43:22 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fqwet-0008JG-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 14:33:35 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1Fqweq-0008J6-DL
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 18:33:33 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fqweq-0008J6-DL@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Thu, 15 Jun 2006 18:33:32 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 18:33:37 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/15 18:33:31

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicArrowButton.java 

Log message:
		2006-06-15  Tania Bento  <tbento@redhat.com>
	
	        * javax/swing/plaf/basic/BasicArrowButton.java
	        (BasicArrowButton): Should set 'focusable' to false.
	        (BasicArrowButton): Should set 'focusable' to false. 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7831&r2=1.7832
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicArrowButton.java?cvsroot=classpath&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7831
retrieving revision 1.7832
diff -u -b -r1.7831 -r1.7832
--- ChangeLog	15 Jun 2006 18:29:35 -0000	1.7831
+++ ChangeLog	15 Jun 2006 18:33:30 -0000	1.7832
@@ -1,3 +1,9 @@
+2006-06-15  Tania Bento  <tbento@redhat.com>
+
+	* javax/swing/plaf/basic/BasicArrowButton.java
+	(BasicArrowButton): Should set 'focusable' to false.
+	(BasicArrowButton): Should set 'focusable' to false.
+
 2006-06-15  Mark Wielaard  <mark@klomp.org>
 
 	* gnu/java/awt/peer/gtk/GtkComponentPeer.java

Index: javax/swing/plaf/basic/BasicArrowButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicArrowButton.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- javax/swing/plaf/basic/BasicArrowButton.java	15 Jun 2006 14:15:45 -0000	1.19
+++ javax/swing/plaf/basic/BasicArrowButton.java	15 Jun 2006 18:33:31 -0000	1.20
@@ -95,6 +95,7 @@
   {
     super();
     setDirection(direction);
+    setFocusable(false);
   }
 
   /**
@@ -116,6 +117,7 @@
     this.shadow = shadow;
     this.darkShadow = darkShadow;
     this.highlight = highlight;
+    setFocusable(false);
   }
 
   /**



From MAILER-DAEMON Thu Jun 15 14:46:42 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fqwra-0001QX-GE
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 14:46:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqwrY-0001No-87
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:46:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqwrW-0001Mw-Fn
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:46:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqwrW-0001Mt-9k
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:46:38 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fqx0y-0004lN-D4
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:56:24 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqwrV-0001RI-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 14:46:37 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1FqwrV-0001R7-6M
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 18:46:37 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqwrV-0001R7-6M@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Thu, 15 Jun 2006 18:46:37 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/metal/Meta...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 18:46:40 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/15 18:46:36

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/metal: MetalScrollButton.java 

Log message:
		2006-06-15  Tania Bento  <tbento@redhta.com>
	
	        * javax/swing/plaf/metal/MetalScrollButton.java
	        (MetalScrollButton): Should set 'focusable' to false.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7832&r2=1.7833
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/metal/MetalScrollButton.java?cvsroot=classpath&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7832
retrieving revision 1.7833
diff -u -b -r1.7832 -r1.7833
--- ChangeLog	15 Jun 2006 18:33:30 -0000	1.7832
+++ ChangeLog	15 Jun 2006 18:46:36 -0000	1.7833
@@ -1,3 +1,8 @@
+2006-06-15  Tania Bento  <tbento@redhta.com>
+
+	* javax/swing/plaf/metal/MetalScrollButton.java
+	(MetalScrollButton): Should set 'focusable' to false.
+
 2006-06-15  Tania Bento  <tbento@redhat.com>
 
 	* javax/swing/plaf/basic/BasicArrowButton.java

Index: javax/swing/plaf/metal/MetalScrollButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalScrollButton.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/swing/plaf/metal/MetalScrollButton.java	24 Oct 2005 20:30:54 -0000	1.2
+++ javax/swing/plaf/metal/MetalScrollButton.java	15 Jun 2006 18:46:36 -0000	1.3
@@ -84,6 +84,7 @@
     super(direction);
     buttonWidth = width;
     this.freeStanding = freeStanding;
+    setFocusable(false);
   }
   
   /**



From MAILER-DAEMON Thu Jun 15 14:59:33 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fqx41-0001vP-7O
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 14:59:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fqx40-0001sl-1M
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:59:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fqx3z-0001s6-Im
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:59:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fqx3z-0001s1-Fo
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:59:31 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqxDR-0006As-Ji
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 15:09:17 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fqx3y-0001lb-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 14:59:30 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1Fqx3x-0001lV-5Q
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 18:59:30 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fqx3x-0001lV-5Q@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Thu, 15 Jun 2006 18:59:29 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/font/TextLayout.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 18:59:32 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/15 18:59:28

Modified files:
	.              : ChangeLog 
	java/awt/font  : TextLayout.java 

Log message:
	2006-06-15  Lillian Angel  <langel@redhat.com>
	
	        * java/awt/font/TextLayout.java:
	        DEFAULT_CARET_POLICY changed to be public static final.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7833&r2=1.7834
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/TextLayout.java?cvsroot=classpath&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7833
retrieving revision 1.7834
diff -u -b -r1.7833 -r1.7834
--- ChangeLog	15 Jun 2006 18:46:36 -0000	1.7833
+++ ChangeLog	15 Jun 2006 18:59:28 -0000	1.7834
@@ -1,4 +1,9 @@
-2006-06-15  Tania Bento  <tbento@redhta.com>
+2006-06-15  Lillian Angel  <langel@redhat.com>
+
+	* java/awt/font/TextLayout.java:
+	DEFAULT_CARET_POLICY changed to be public static final.
+
+2006-06-15  Tania Bento  <tbento@redhat.com>
 
 	* javax/swing/plaf/metal/MetalScrollButton.java
 	(MetalScrollButton): Should set 'focusable' to false.

Index: java/awt/font/TextLayout.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/font/TextLayout.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- java/awt/font/TextLayout.java	11 Jun 2006 03:09:03 -0000	1.10
+++ java/awt/font/TextLayout.java	15 Jun 2006 18:59:28 -0000	1.11
@@ -85,7 +85,7 @@
   /**
    * The default caret policy.
    */
-  static TextLayout.CaretPolicy DEFAULT_CARET_POLICY = new CaretPolicy();
+  public static final TextLayout.CaretPolicy DEFAULT_CARET_POLICY = new CaretPolicy();
 
   /**
    * Constructs a TextLayout.



From MAILER-DAEMON Thu Jun 15 15:37:53 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fqxf7-0001VJ-DY
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 15:37:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fqxf4-0001UL-Qb
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 15:37:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fqxf3-0001Tz-V9
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 15:37:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fqxf3-0001Tw-EE
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 15:37:49 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqxoV-0000R8-SU
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 15:47:36 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fqxf2-00044S-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 15:37:48 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fqxf1-00044L-9n
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 19:37:48 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fqxf1-00044L-9n@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Thu, 15 Jun 2006 19:37:47 +0000
Subject: [commit-cp] classpath ChangeLog javax/management/AttributeL...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 19:37:51 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/15 19:37:47

Modified files:
	.              : ChangeLog 
Added files:
	javax/management: AttributeList.java JMRuntimeException.java 
	                  RuntimeOperationsException.java 

Log message:
	2006-06-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* javax/management/AttributeList.java,
		* javax/management/JMRuntimeException.java,
		* javax/management/RuntimeOperationsException.java:
		New files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7834&r2=1.7835
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/AttributeList.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/JMRuntimeException.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/RuntimeOperationsException.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7834
retrieving revision 1.7835
diff -u -b -r1.7834 -r1.7835
--- ChangeLog	15 Jun 2006 18:59:28 -0000	1.7834
+++ ChangeLog	15 Jun 2006 19:37:46 -0000	1.7835
@@ -1,3 +1,10 @@
+2006-06-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* javax/management/AttributeList.java,
+	* javax/management/JMRuntimeException.java,
+	* javax/management/RuntimeOperationsException.java:
+	New files.
+	
 2006-06-15  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/font/TextLayout.java:

Index: javax/management/AttributeList.java
===================================================================
RCS file: javax/management/AttributeList.java
diff -N javax/management/AttributeList.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/management/AttributeList.java	15 Jun 2006 19:37:47 -0000	1.1
@@ -0,0 +1,215 @@
+/* AttributeList.java -- A list of MBean attributes.
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.management;
+
+import java.util.ArrayList;
+
+/**
+ * Represents a list of MBean {@link Attribute}s, with their
+ * names and values.  This is implemented as an
+ * {@link java.util.ArrayList} extension, with additional
+ * methods typed to only allow the addition of {@link Attribute}s.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class AttributeList
+  extends ArrayList
+{
+
+  /**
+   * Constructs an empty list with an initial capacity of ten.
+   *
+   * @see java.util.ArrayList#ArrayList()
+   */
+  public AttributeList()
+  {
+    super();
+  }
+
+  /**
+   * Constructs an {@link AttributeList} using the contents
+   * of an existing list.  The initial capacity is 110% of the
+   * size of the specified list.
+   *
+   * @param list the list to use to fill this list.
+   * @see java.util.ArrayList#ArrayList(java.util.Collection)
+   */
+  public AttributeList(AttributeList list)
+  {
+    super(list);
+  }
+
+  /**
+   * Constructs an empty list with the specified initial capacity.
+   *
+   * @param capacity the initial capacity of the list.
+   * @see java.util.ArrayList#ArrayList(int)
+   */
+  public AttributeList(int capacity)
+  {
+    super(capacity);
+  }
+
+  /**
+   * Adds the specified {@link Attribute} to the end of the list.
+   *
+   * @param attribute the attribute to add.
+   * @see java.util.Arraylist#add(Object)
+   */
+  public void add(Attribute attribute)
+  {
+    super.add(attribute);
+  }
+
+  /**
+   * <p>
+   * Adds the specified {@link Attribute} at the supplied index.
+   * Any attribute already at that index is moved up one place
+   * in the list to the position <code>(index + 1)</code>.
+   * Likewise, the attribute at <code>(index + 1)</code> is
+   * also moved up one place, continuing until the final
+   * attribute in the list moves to a new position, increasing
+   * the size of the list.
+   * </p>
+   * <p>
+   * If the index is invalid (i.e. it is smaller than zero, or
+   * greater than the current size of the list), a
+   * @link{RuntimeOperationsException} is thrown, which wraps
+   * the @link{IndexOutOfBoundsException} from the underlying
+   * array list.
+   * </p>
+   * 
+   * @param index the index at which to place the new attribute.
+   * @param attribute the new attribute to add.
+   * @throws RuntimeOperationsException if <code>index < 0</code>
+   *                                    or <code>index > size()</code>
+   * @see java.util.ArrayList#add(int, Object)
+   */
+  public void add(int index, Attribute attribute)
+  {
+    try
+      {
+	super.add(index, attribute);
+      }
+    catch (IndexOutOfBoundsException e)
+      {
+	throw new RuntimeOperationsException(e, "Invalid index.");
+      }
+  }
+
+  /**
+   * Adds all the {@link Attribute}s from the supplied list
+   * to the end of this list, in the order they are returned
+   * by the list's {@link java.util.Iterator}.
+   *
+   * @param list the list of attributes to add.
+   * @return true if the list changed.
+   * @see java.util.ArrayList#addAll(Collection)
+   */
+  public boolean addAll(AttributeList list)
+  {
+    return super.addAll(list);
+  }
+
+  /**
+   * <p>
+   * Adds all the {@link Attribute}s from the supplied list
+   * to this list, at the specified index.  The attributes
+   * are added in the order they are returned by the
+   * list's {@link java.util.Iterator}.  Any attribute already
+   * at that index is moved up one place in the list to the
+   * position <code>(index + list.size())</code>.
+   * Likewise, the attribute at <code>(index + list.size())</code>
+   * is also moved up one place, continuing until the final
+   * attribute in the original list.
+   * </p>
+   * <p>
+   * If the index is invalid (i.e. it is smaller than zero, or
+   * greater than the current size of the list), a
+   * @link{RuntimeOperationsException} is thrown, which wraps
+   * the @link{IndexOutOfBoundsException} from the underlying
+   * array list.
+   * </p>
+   * 
+   * @param index the index at which to place the new attribute.
+   * @param list the list of attributes to add.
+   * @return true if the list changed.
+   * @throws RuntimeOperationsException if <code>index < 0</code>
+   *                                    or <code>index > size()</code>
+   * @see java.util.ArrayList#addAll(int, Collection)
+   */
+  public boolean addAll(int index, AttributeList list)
+  {
+    try
+      {
+	return super.addAll(index, list);
+      }
+    catch (IndexOutOfBoundsException e)
+      {
+	throw new RuntimeOperationsException(e, "Invalid index.");
+      }
+  }
+
+  /**
+   * Replaces the attribute at the specified index with the one
+   * supplied. If the index is invalid (i.e. it is smaller than
+   * zero, or greater than the current size of the list), a
+   * @link{RuntimeOperationsException} is thrown, which wraps
+   * the @link{IndexOutOfBoundsException} from the underlying
+   * array list.
+   *
+   * @param index the index at which to place the new attribute.
+   * @param attribute the new attribute to add.
+   * @throws RuntimeOperationsException if <code>index < 0</code>
+   *                                    or <code>index > size()</code>
+   * @see java.util.ArrayList#set(int, Object)
+   */
+  public void set(int index, Attribute attribute)
+  {
+    try
+      {
+	super.set(index, attribute);
+      }
+    catch (IndexOutOfBoundsException e)
+      {
+	throw new RuntimeOperationsException(e, "Invalid index.");
+      }
+  }
+    
+}

Index: javax/management/JMRuntimeException.java
===================================================================
RCS file: javax/management/JMRuntimeException.java
diff -N javax/management/JMRuntimeException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/management/JMRuntimeException.java	15 Jun 2006 19:37:47 -0000	1.1
@@ -0,0 +1,71 @@
+/* JMRuntimeException.java -- Thrown by the management classes.
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.management;
+
+/**
+ * A general superclass for all runtime management
+ * exceptions.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class JMRuntimeException
+  extends RuntimeException
+{
+
+  /**
+   * Constructs a new <code>JMRuntimeException</code>.
+   */
+  public JMRuntimeException()
+  {
+    super();
+  }
+
+  /**
+   * Constructs a new <code>JMRuntimeException</code>
+   * with the specified message.
+   *
+   * @param message the error message to give to the user.
+   */
+  public JMRuntimeException(String message)
+  {
+    super(message);
+  }
+
+}
+

Index: javax/management/RuntimeOperationsException.java
===================================================================
RCS file: javax/management/RuntimeOperationsException.java
diff -N javax/management/RuntimeOperationsException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/management/RuntimeOperationsException.java	15 Jun 2006 19:37:47 -0000	1.1
@@ -0,0 +1,116 @@
+/* RuntimeOperationsException.java -- A wrapped run-time exception.
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.management;
+
+/**
+ * Represents a runtime exception thrown by a management
+ * bean operation.  When a management bean executes code
+ * that causes a runtime exception to be thrown, the
+ * resulting exception is wrapped inside an
+ * {@link RuntimeOperationsException}. Calling
+ * {@link getTargetException()} will return the wrapped
+ * exception.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class RuntimeOperationsException
+  extends JMRuntimeException
+{
+
+  /* Sun re-implemented causality -- don't know why, but
+     serialization demands we do too... */
+
+  /**
+   * The target exception.
+   *
+   * @serial the target exception.
+   */
+  private RuntimeException exception;
+
+  /**
+   * Constructs a new <code>RuntimeOperationsException</code>
+   * wrapping the specified exception.
+   *
+   * @param e the exception to be wrapped.
+   */
+  public RuntimeOperationsException(RuntimeException e)
+  {
+    super();
+    exception = e;
+  }
+
+  /**
+   * Constructs a new <code>RuntimeOperationsException</code>
+   *  wrapping the specified exception and using the supplied
+   * message.
+   *
+   * @param e the exception to be wrapped.
+   * @param message the error message to give to the user.
+   */
+  public RuntimeOperationsException(RuntimeException e,
+				    String message)
+  {
+    super(message);
+    exception = e;
+  }
+
+  /**
+   * Returns the true cause of this exception, the wrapped
+   * exception.
+   *
+   * @return the wrapped exception.
+   */
+  public Throwable getCause()
+  {
+    return exception;
+  }
+
+  /**
+   * Returns the true cause of this exception, the wrapped
+   * exception.
+   *
+   * @return the wrapped exception.
+   */
+  public RuntimeException getTargetException()
+  {
+    return exception;
+  }
+
+}
+



From MAILER-DAEMON Thu Jun 15 15:46:49 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fqxnk-0007bp-TH
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 15:46:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fqxnj-0007aS-ON
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 15:46:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fqxni-0007a5-7t
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 15:46:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fqxni-0007Zz-5S
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 15:46:46 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqxxA-0000vd-TL
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 15:56:32 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fqxnh-0004KI-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 15:46:45 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1Fqxnh-0004KF-AW
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 19:46:45 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fqxnh-0004KF-AW@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Thu, 15 Jun 2006 19:46:45 +0000
Subject: [commit-cp] classpath/javax/swing JCheckBoxMenuItem.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 19:46:48 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/15 19:46:45

Modified files:
	javax/swing    : JCheckBoxMenuItem.java 

Log message:
		2006-06-15  Tania Bento  <tbento@redhat.com>
	
	        * javax/swing/JCheckBoxMenuItem.java
	        (JCheckBoxMenuItem): Should set 'focusable' to false.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JCheckBoxMenuItem.java?cvsroot=classpath&r1=1.18&r2=1.19

Patches:
Index: JCheckBoxMenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JCheckBoxMenuItem.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- JCheckBoxMenuItem.java	14 Jun 2006 14:12:50 -0000	1.18
+++ JCheckBoxMenuItem.java	15 Jun 2006 19:46:45 -0000	1.19
@@ -149,6 +149,7 @@
     this.state = state;
     if (state == true)
       this.setSelected(true);
+    setFocusable(false);
   }
 
   /**



From MAILER-DAEMON Thu Jun 15 17:18:59 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FqzEx-0001BW-LC
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 17:18:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FqzEw-0001BR-FQ
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 17:18:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FqzEv-0001B6-JG
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 17:18:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FqzEv-0001B3-Ea
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 17:18:57 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqzOO-00078i-Tk
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 17:28:45 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FqzEu-0008L5-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 17:18:56 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FqzEs-0008Kt-Uh
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:18:56 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FqzEs-0008Kt-Uh@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Thu, 15 Jun 2006 21:18:54 +0000
Subject: [commit-cp] classpath ChangeLog javax/management/AttributeL...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 21:18:58 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/15 21:18:54

Modified files:
	.              : ChangeLog 
	javax/management: AttributeList.java 
	                  RuntimeOperationsException.java 
Added files:
	javax/management: DynamicMBean.java MBeanInfo.java 

Log message:
	2006-06-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* javax/management/AttributeList.java:
		Add serialization UID.
		* javax/management/DynamicMBean.java:
		New file.
		* javax/management/JMRuntimeException.java:
		Add serialization UID and correct name
		of serialized field.
		* javax/management/MBeanInfo.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7835&r2=1.7836
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/AttributeList.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/RuntimeOperationsException.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/DynamicMBean.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/MBeanInfo.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7835
retrieving revision 1.7836
diff -u -b -r1.7835 -r1.7836
--- ChangeLog	15 Jun 2006 19:37:46 -0000	1.7835
+++ ChangeLog	15 Jun 2006 21:18:53 -0000	1.7836
@@ -1,5 +1,16 @@
 2006-06-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
+	* javax/management/AttributeList.java:
+	Add serialization UID.
+	* javax/management/DynamicMBean.java:
+	New file.
+	* javax/management/JMRuntimeException.java:
+	Add serialization UID and correct name
+	of serialized field.
+	* javax/management/MBeanInfo.java: New file.
+	
+2006-06-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
 	* javax/management/AttributeList.java,
 	* javax/management/JMRuntimeException.java,
 	* javax/management/RuntimeOperationsException.java:

Index: javax/management/AttributeList.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/management/AttributeList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- javax/management/AttributeList.java	15 Jun 2006 19:37:47 -0000	1.1
+++ javax/management/AttributeList.java	15 Jun 2006 21:18:54 -0000	1.2
@@ -53,6 +53,11 @@
 {
 
   /**
+   * Compatible with JDK 1.5
+   */
+  private static final long serialVersionUID = -4077085769279709076L;
+
+  /**
    * Constructs an empty list with an initial capacity of ten.
    *
    * @see java.util.ArrayList#ArrayList()

Index: javax/management/RuntimeOperationsException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/management/RuntimeOperationsException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- javax/management/RuntimeOperationsException.java	15 Jun 2006 19:37:47 -0000	1.1
+++ javax/management/RuntimeOperationsException.java	15 Jun 2006 21:18:54 -0000	1.2
@@ -53,6 +53,11 @@
   extends JMRuntimeException
 {
 
+  /**
+   * Compatible with JDK 1.5
+   */
+  private static final long serialVersionUID = -8408923047489133588L;
+  
   /* Sun re-implemented causality -- don't know why, but
      serialization demands we do too... */
 
@@ -61,7 +66,7 @@
    *
    * @serial the target exception.
    */
-  private RuntimeException exception;
+  private RuntimeException runtimeException;
 
   /**
    * Constructs a new <code>RuntimeOperationsException</code>
@@ -72,7 +77,7 @@
   public RuntimeOperationsException(RuntimeException e)
   {
     super();
-    exception = e;
+    runtimeException = e;
   }
 
   /**
@@ -87,7 +92,7 @@
 				    String message)
   {
     super(message);
-    exception = e;
+    runtimeException = e;
   }
 
   /**
@@ -98,7 +103,7 @@
    */
   public Throwable getCause()
   {
-    return exception;
+    return runtimeException;
   }
 
   /**
@@ -109,7 +114,7 @@
    */
   public RuntimeException getTargetException()
   {
-    return exception;
+    return runtimeException;
   }
 
 }

Index: javax/management/DynamicMBean.java
===================================================================
RCS file: javax/management/DynamicMBean.java
diff -N javax/management/DynamicMBean.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/management/DynamicMBean.java	15 Jun 2006 21:18:54 -0000	1.1
@@ -0,0 +1,162 @@
+/* DynamicMBean.java -- A management bean with a dynamic interface.
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.management;
+
+/**
+ * Represents a management bean that provides a
+ * dynamic interface.  Users of a {@link DynamicMBean}
+ * may retrieve information about its attributes at
+ * runtime and use this information to dynamically
+ * obtain the corresponding values of these attributes.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public interface DynamicMBean
+{
+  
+  /**
+   * Obtains the value of the specified attribute of the
+   * management bean.  The management bean should perform
+   * a lookup for the named attribute, and return its value
+   * by calling the appropriate getter method, if possible.
+   *
+   * @param name the name of the attribute to retrieve.
+   * @return the value of the specified attribute.
+   * @throws AttributeNotFoundException if the name does not
+   *                                    correspond to an attribute
+   *                                    of the bean.
+   * @throws MBeanException if retrieving the attribute causes
+   *                        the bean to throw an exception (which
+   *                        becomes the cause of this exception).
+   * @throws ReflectionException if an exception occurred in trying
+   *                             to use the reflection interface
+   *                             to lookup the attribute.  The
+   *                             thrown exception is the cause of
+   *                             this exception.
+   * @see #setAttribute(String)
+   */
+  Object getAttribute(String name)
+    throws AttributeNotFoundException, MBeanException,
+	   ReflectionException;
+
+  /**
+   * Obtains the values of each of the specified attributes
+   * of the management bean.  The returned list includes
+   * those attributes that were retrieved and their
+   * corresponding values.
+   *
+   * @param names the names of the attributes to retrieve.
+   * @return a list of the retrieved attributes.
+   * @see #setAttributes(AttributeList)
+   */
+  AttributeList getAttributes(String[] names);
+
+  /**
+   * Returns an information object which lists the attributes
+   * and actions associated with the management bean.
+   *
+   * @return a description of the management bean, including
+   *         all exposed attributes and actions.
+   */
+  MBeanInfo getMBeanInfo();
+
+  /**
+   * Invokes the specified action on the management bean using
+   * the supplied parameters.  The signature of the action is
+   * specified by a {@link String} array, which lists the classes
+   * corresponding to each parameter.  The class loader used to
+   * load these classes is the same as that used for loading the
+   * management bean itself.
+   * 
+   * @param name the name of the action to invoke.
+   * @param params the parameters used to call the action.
+   * @param signature the signature of the action.
+   * @return the return value of the action.
+   * @throws MBeanException if the action throws an exception.  The
+   *                        thrown exception is the cause of this
+   *                        exception.
+   * @throws ReflectionException if an exception occurred in trying
+   *                             to use the reflection interface
+   *                             to invoke the action.  The
+   *                             thrown exception is the cause of
+   *                             this exception.
+   */
+  Object invoke(String name, Object[] params, String[] signature)
+    throws MBeanException, ReflectionException;
+
+  /**
+   * Sets the value of the specified attribute of the
+   * management bean.  The management bean should perform
+   * a lookup for the named attribute, and sets its value
+   * using the associated setter method, if possible.
+   *
+   * @param attribute the attribute to set.
+   * @throws AttributeNotFoundException if the attribute does not
+   *                                    correspond to an attribute
+   *                                    of the bean.
+   * @throws InvalidAttributeValueException if the value is invalid
+   *                                        for this particular
+   *                                        attribute of the bean.
+   * @throws MBeanException if setting the attribute causes
+   *                        the bean to throw an exception (which
+   *                        becomes the cause of this exception).
+   * @throws ReflectionException if an exception occurred in trying
+   *                             to use the reflection interface
+   *                             to lookup the attribute.  The
+   *                             thrown exception is the cause of
+   *                             this exception.
+   * @see #getAttribute(String)
+   */
+  Object setAttribute(Attribute attribute)
+    throws AttributeNotFoundException, InvalidAttributeValueException,
+	   MBeanException, ReflectionException;
+
+  /**
+   * Sets the value of each of the specified attributes
+   * to that supplied by the {@link Attribute} object.
+   * The returned list contains the attributes that were
+   * set and their new values.
+   *
+   * @param attributes the attributes to set.
+   * @return a list of the changed attributes.
+   * @see #getAttributes(AttributeList)
+   */
+  AttributeList setAttributes(AttributeList attributes);
+
+}

Index: javax/management/MBeanInfo.java
===================================================================
RCS file: javax/management/MBeanInfo.java
diff -N javax/management/MBeanInfo.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/management/MBeanInfo.java	15 Jun 2006 21:18:54 -0000	1.1
@@ -0,0 +1,152 @@
+/* MBeanInfo.java -- Information about a management bean.
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.management;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * Describes the interface of a management bean.  This allows
+ * the user to access the bean dynamically, without knowing
+ * the details of any of its attributes, operations,
+ * constructors or notifications beforehand.  The information
+ * is immutable as standard.  Of course, subclasses may change
+ * this, but this behaviour is not recommended.
+ * </p>
+ * <p>
+ * The contents of this class, for standard management beans,
+ * are dynamically compiled using reflection.
+ * {@link #getClassName()} and {@link #getConstructors()}
+ * return the name of the class and its constructors, respectively.
+ * This is much the same as could be obtained by reflection on the
+ * bean.  {@link #getAttributes()} and {@link #getOperations()},
+ * however, do something more in splitting the methods of the
+ * class into two sets.  Those of the form, <code>getXXX</code>,
+ * <code>setXXX</code> and <code>isXXX</code> are taken to be
+ * the accessors and mutators of a series of attributes, with
+ * <code>XXX</code> being the attribute name.  These are returned
+ * by {@link getAttributes()} and the {@link Attribute} class can
+ * be used to manipulate them.  The remaining methods are classified
+ * as operations and returned by {@link getOperations()}.
+ * </p>
+ * <p>
+ * Beans can also broadcast notifications.  If the bean provides this
+ * facility, by implementing the {@link NotificationBroadcaster}
+ * interface, then an array of {@link MBeanNotificationInfo} objects
+ * may be obtained from {@link #getNotifications()}, which describe
+ * the notifications emitted.
+ * </p>
+ * <p>
+ * Model management beans and open management beans also supply an
+ * instance of this class, as part of implementing the
+ * {@link DynamicMBean#getMBeanInfo()} method of {@link DynamicMBean}.
+ * </p>
+ * 
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class MBeanInfo
+  implements Cloneable, Serializable
+{
+
+  /**
+   * Compatible with JDK 1.5
+   */
+  private static final long serialVersionUID = -6451021435135161911L;
+
+  /**
+   * A description of the bean.
+   * 
+   * @serial The bean's description.
+   */
+  private String description;
+
+  /**
+   * The class name of the management bean.
+   *
+   * @serial The bean's class name.
+   */
+  private String className;
+
+  /**
+   * Returns a shallow clone of the information.  This is
+   * simply a new copy of each string and a clone
+   * of each array, which still references the same objects,
+   * as obtained by the {@link Object} implementation of
+   * {@link Object#clone()}.  As the fields can not be
+   * changed, this method is only really of interest to
+   * subclasses which may add new mutable fields or make
+   * the existing ones mutable.
+   *
+   * @return a shallow clone of this {@link MBeanInfo}.
+   */
+  public Object clone()
+  {
+    MBeanInfo clone = null;
+    try
+      {
+	clone = (MBeanInfo) super.clone();
+      }
+    catch (CloneNotSupportedException e)
+      {
+	/* This won't happen as we implement Cloneable */
+      }
+    return clone;
+  }
+
+  /**
+   * Returns the class name of the management bean.
+   *
+   * @return the bean's class name.
+   */
+  public String getClassName()
+  {
+    return className;
+  }
+
+  /**
+   * Returns a description of the management bean.
+   *
+   * @return the bean's description.
+   */
+  public String getDescription()
+  {
+    return description;
+  }
+
+}



From MAILER-DAEMON Thu Jun 15 18:38:09 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fr0TZ-00028H-Dk
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 18:38:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fqw7A-00017H-08
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 13:58:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fqw78-00015Z-V9
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 13:58:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fqw78-00015K-Ll
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 13:58:42 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqwGa-0008T4-8E
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 14:08:28 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fqw76-00074n-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 13:58:40 -0400
Received: from kgallowa by savannah.gnu.org with local (Exim 4.50)
	id 1Fqw75-00074k-Lu
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 17:58:39 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fqw75-00074k-Lu@savannah.gnu.org>
From: Kyle Galloway <kgallowa@redhat.com>
Date: Thu, 15 Jun 2006 17:58:39 +0000
X-Mailman-Approved-At: Thu, 15 Jun 2006 18:38:08 -0400
Subject: [commit-cp] classpath/gnu/classpath/jdwp/event/filters Exce...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 17:58:44 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Kyle Galloway <kgallowa>	06/06/15 17:58:38

Modified files:
	gnu/classpath/jdwp/event/filters: ExceptionOnlyFilter.java 
	.              : ChangeLog 

Log message:
	2006-06-15  Kyle Galloway <kgallowa@redhat.com>
	
	    * gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
	    (matches): Added explicit brackets to return statement.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7826&r2=1.7827

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7826
retrieving revision 1.7827
diff -u -b -r1.7826 -r1.7827
--- ChangeLog	15 Jun 2006 17:37:04 -0000	1.7826
+++ ChangeLog	15 Jun 2006 17:58:31 -0000	1.7827
@@ -1,3 +1,8 @@
+2006-06-15  Kyle Galloway <kgallowa@redhat.com>
+
+    * gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
+    (matches): Added explicit brackets to return statement.
+
 2006-06-15  Tania Bento  <tbento@redhat.com>
 
 	* javax/swing/AbstractButton.java:
@@ -63,6 +68,7 @@
 	Added serialization UID and changed to extend
 	javax.management.JMException.
 	
+>>>>>>> 1.7826
 2006-06-14  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/Component.java



From MAILER-DAEMON Thu Jun 15 19:09:00 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fr0xQ-0003AJ-86
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 19:09:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fr0xO-00038C-MY
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 19:08:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fr0xN-00036d-MQ
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 19:08:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fr0xM-00036W-PT
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 19:08:56 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fr16r-0007EG-9K
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 19:18:45 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fr0xG-0005iH-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 19:08:50 -0400
Received: from fitzsim by savannah.gnu.org with local (Exim 4.50)
	id 1Fr0xF-0005iB-CB
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 23:08:50 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fr0xF-0005iB-CB@savannah.gnu.org>
From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Thu, 15 Jun 2006 23:08:49 +0000
Subject: [commit-cp] classpath ChangeLog configure.ac doc/tools.texi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jun 2006 23:08:59 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Thomas Fitzsimmons <fitzsim>	06/06/15 23:08:49

Modified files:
	.              : ChangeLog configure.ac 
	doc            : tools.texinfo 
	tools          : Makefile.am toolwrapper.c 
Added files:
	tools          : gappletviewer.in gjarsigner.in gkeytool.in 
Removed files:
	tools          : appletviewer.in jarsigner.in keytool.in 

Log message:
	2006-06-15  Thomas Fitzsimmons  <fitzsim@redhat.com>
	
		* configure.ac: Rename appletviewer to gappletviewer, jarsigner to
		gjarsigner and keytool to gkeytool.
		* doc/tools.texinfo: Add note about tool exectable names.
		* tools/Makefile.am: Rename appletviewer to gappletviewer,
		jarsigner to gjarsigner and keytool to gkeytool.
		* tools/appletviewer.in: Rename ...
		* tools/gappletviewer.in: New file.
		* tools/jarsigner.in: Rename ...
		* tools/gjarsigner.in: New file.
		* tools/keytool.in: Rename ...
		* tools/gkeytool.in: New file.
		* tools/toolwrapper.c: Simplify TOOLS_ZIP macro.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7836&r2=1.7837
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&r1=1.161&r2=1.162
http://cvs.savannah.gnu.org/viewcvs/classpath/doc/tools.texinfo?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/Makefile.am?cvsroot=classpath&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/toolwrapper.c?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gappletviewer.in?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gjarsigner.in?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gkeytool.in?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/appletviewer.in?cvsroot=classpath&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/jarsigner.in?cvsroot=classpath&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/keytool.in?cvsroot=classpath&r1=1.2&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7836
retrieving revision 1.7837
diff -u -b -r1.7836 -r1.7837
--- ChangeLog	15 Jun 2006 21:18:53 -0000	1.7836
+++ ChangeLog	15 Jun 2006 23:08:48 -0000	1.7837
@@ -1,3 +1,18 @@
+2006-06-15  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* configure.ac: Rename appletviewer to gappletviewer, jarsigner to
+	gjarsigner and keytool to gkeytool.
+	* doc/tools.texinfo: Add note about tool exectable names.
+	* tools/Makefile.am: Rename appletviewer to gappletviewer,
+	jarsigner to gjarsigner and keytool to gkeytool.
+	* tools/appletviewer.in: Rename ...
+	* tools/gappletviewer.in: New file.
+	* tools/jarsigner.in: Rename ...
+	* tools/gjarsigner.in: New file.
+	* tools/keytool.in: Rename ...
+	* tools/gkeytool.in: New file.
+	* tools/toolwrapper.c: Simplify TOOLS_ZIP macro.
+
 2006-06-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* javax/management/AttributeList.java:

Index: configure.ac
===================================================================
RCS file: /sources/classpath/classpath/configure.ac,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- configure.ac	14 Jun 2006 12:35:17 -0000	1.161
+++ configure.ac	15 Jun 2006 23:08:48 -0000	1.162
@@ -739,12 +739,12 @@
 
 if test "x${COMPILE_WRAPPERS}" = xno
 then
-AC_CONFIG_FILES([tools/appletviewer
-tools/jarsigner
-tools/keytool])
-AC_CONFIG_COMMANDS([appletviewer],[chmod 755 tools/appletviewer])
-AC_CONFIG_COMMANDS([jarsigner],[chmod 755 tools/jarsigner])
-AC_CONFIG_COMMANDS([keytool],[chmod 755 tools/keytool])
+AC_CONFIG_FILES([tools/gappletviewer
+tools/gjarsigner
+tools/gkeytool])
+AC_CONFIG_COMMANDS([gappletviewer],[chmod 755 tools/gappletviewer])
+AC_CONFIG_COMMANDS([gjarsigner],[chmod 755 tools/gjarsigner])
+AC_CONFIG_COMMANDS([gkeytool],[chmod 755 tools/gkeytool])
 fi
 
 AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh])

Index: doc/tools.texinfo
===================================================================
RCS file: /sources/classpath/classpath/doc/tools.texinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- doc/tools.texinfo	12 Jun 2006 04:04:40 -0000	1.5
+++ doc/tools.texinfo	15 Jun 2006 23:08:48 -0000	1.6
@@ -128,6 +128,9 @@
 Two Applet Tools are available with GNU Classpath: @b{appletviewer}
 and @b{gcjwebplugin}.
 
+To avoid conflicts with other implementations, the appletviewer
+executable is called ``gappletviewer''.
+
 @menu
 * appletviewer Tool::          Load applets
 * gcjwebplugin::               Load applets in a web browser
@@ -270,6 +273,10 @@
 
 Two Security Tools are available with GNU Classpath: @b{jarsigner} and @b{keytool}.
 
+To avoid conflicts with other implementations, the jarsigner
+executable is called ``gjarsigner'' and the keytool executable is
+called ``gkeytool''.
+
 @menu
 * jarsigner Tool::             Sign and verify .JAR files
 * keytool Tool::               Manage private keys and public certificates

Index: tools/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- tools/Makefile.am	29 May 2006 19:49:25 -0000	1.18
+++ tools/Makefile.am	15 Jun 2006 23:08:48 -0000	1.19
@@ -23,7 +23,7 @@
 
 if CREATE_WRAPPERS
 bin_SCRIPTS =
-bin_PROGRAMS = appletviewer jarsigner keytool
+bin_PROGRAMS = gappletviewer gjarsigner gkeytool
 
 if FOUND_GCJ
 LIBJVM = -lgcj
@@ -35,37 +35,37 @@
 endif
 endif
 
-appletviewer_SOURCES = toolwrapper.c
-appletviewer_CFLAGS = -Wall \
-	-DDATA_DIR="\"$(datadir)\"" \
-	-DPACKAGE="\"$(PACKAGE)\"" \
-	-DTOOLNAME="\"appletviewer\""
-appletviewer_LDFLAGS = -L$(libdir) $(LIBJVM)
-
-jarsigner_SOURCES = toolwrapper.c
-jarsigner_CFLAGS = -Wall \
-	-DDATA_DIR="\"$(datadir)\"" \
-	-DPACKAGE="\"$(PACKAGE)\"" \
-	-DTOOLNAME="\"jarsigner\""
-jarsigner_LDFLAGS = -L$(libdir) $(LIBJVM)
-
-keytool_SOURCES = toolwrapper.c
-keytool_CFLAGS = -Wall \
-	-DDATA_DIR="\"$(datadir)\"" \
-	-DPACKAGE="\"$(PACKAGE)\"" \
-	-DTOOLNAME="\"keytool\""
-keytool_LDFLAGS = -L$(libdir) $(LIBJVM)
+AM_CPPFLAGS = -Wall \
+	-I$(top_srcdir)/include \
+	-DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\""
+
+gappletviewer_SOURCES = toolwrapper.c
+gappletviewer_CFLAGS = \
+	-DTOOLPACKAGE="\"appletviewer\"" \
+	-DTOOLNAME="\"gappletviewer\""
+gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM)
+
+gjarsigner_SOURCES = toolwrapper.c
+gjarsigner_CFLAGS = \
+	-DTOOLPACKAGE="\"jarsigner\"" \
+	-DTOOLNAME="\"gjarsigner\""
+gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM)
+
+gkeytool_SOURCES = toolwrapper.c
+gkeytool_CFLAGS = \
+	-DTOOLPACKAGE="\"keytool\"" \
+	-DTOOLNAME="\"gkeytool\""
+gkeytool_LDFLAGS = -L$(libdir) $(LIBJVM)
 
 else
-bin_SCRIPTS = appletviewer jarsigner keytool
+bin_SCRIPTS = gappletviewer gjarsigner gkeytool
 bin_PROGRAMS =
 endif
-EXTRA_DIST = toolwrapper.c appletviewer.in jarsigner.in keytool.in
+EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in
 
 # All our example java source files
 TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*.java $(srcdir)/gnu/classpath/tools/*/*.java $(srcdir)/gnu/classpath/tools/*/*/*.java
 
-
 # The zip files with classes we want to produce.
 TOOLS_ZIP = tools.zip
 

Index: tools/toolwrapper.c
===================================================================
RCS file: /sources/classpath/classpath/tools/toolwrapper.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tools/toolwrapper.c	27 May 2006 21:10:46 -0000	1.1
+++ tools/toolwrapper.c	15 Jun 2006 23:08:49 -0000	1.2
@@ -128,7 +128,7 @@
 	  goto destroy;
 	}
 
-      vm_args.options[vm_args.nOptions++].optionString = "-Djava.class.path=" DATA_DIR "/" PACKAGE "/tools.zip";
+      vm_args.options[vm_args.nOptions++].optionString = "-Djava.class.path=" TOOLS_ZIP;
     }
 
   /* Terminate vm_args.options with a NULL element. */
@@ -188,7 +188,7 @@
       (*env)->SetObjectArrayElement (env, args_array, i, str);
     }
 
-  class_id = (*env)->FindClass (env, "gnu/classpath/tools/" TOOLNAME "/Main");
+  class_id = (*env)->FindClass (env, "gnu/classpath/tools/" TOOLPACKAGE "/Main");
   if (class_id == NULL)
     {
       fprintf (stderr, TOOLNAME ": FindClass failed.\n");

Index: tools/gappletviewer.in
===================================================================
RCS file: tools/gappletviewer.in
diff -N tools/gappletviewer.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tools/gappletviewer.in	15 Jun 2006 23:08:49 -0000	1.1
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+## Copyright (C) 2006 Free Software Foundation, Inc.
+##
+## This file is a 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 of the License, 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; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+## 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.
+##
+## A simple shell script to launch the GNU Classpath appletviewer tool.
+##
+
+prefix=@prefix@
+tools_dir=@datadir@/@PACKAGE@
+tools_cp=${tools_dir}/tools.zip
+
+exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.appletviewer.Main $@

Index: tools/gjarsigner.in
===================================================================
RCS file: tools/gjarsigner.in
diff -N tools/gjarsigner.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tools/gjarsigner.in	15 Jun 2006 23:08:49 -0000	1.1
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+## Copyright (C) 2006 Free Software Foundation, Inc.
+##
+## This file is a 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 of the License, 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; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+## 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.
+##
+##
+## A simple shell script to launch the GNU Classpath jarsigner tool.
+##
+
+prefix=@prefix@
+tools_dir=@datadir@/@PACKAGE@
+tools_cp=${tools_dir}/tools.zip
+
+exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.jarsigner.Main $@

Index: tools/gkeytool.in
===================================================================
RCS file: tools/gkeytool.in
diff -N tools/gkeytool.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tools/gkeytool.in	15 Jun 2006 23:08:49 -0000	1.1
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+## Copyright (C) 2006 Free Software Foundation, Inc.
+##
+## This file is a 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 of the License, 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; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+## 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.
+##
+##
+## A simple shell script to launch the GNU Classpath keytool tool.
+##
+
+prefix=@prefix@
+tools_dir=@datadir@/@PACKAGE@
+tools_cp=${tools_dir}/tools.zip
+
+exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.keytool.Main $@

Index: tools/appletviewer.in
===================================================================
RCS file: tools/appletviewer.in
diff -N tools/appletviewer.in
--- tools/appletviewer.in	9 May 2006 18:11:13 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-## Copyright (C) 2006 Free Software Foundation, Inc.
-##
-## This file is a 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 of the License, 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; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
-## 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.
-##
-## A simple shell script to launch the GNU Classpath appletviewer tool.
-##
-
-prefix=@prefix@
-tools_dir=@datadir@/@PACKAGE@
-tools_cp=${tools_dir}/tools.zip
-
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.appletviewer.Main $@

Index: tools/jarsigner.in
===================================================================
RCS file: tools/jarsigner.in
diff -N tools/jarsigner.in
--- tools/jarsigner.in	1 Jun 2006 19:20:35 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-## Copyright (C) 2006 Free Software Foundation, Inc.
-##
-## This file is a 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 of the License, 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; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
-## 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.
-##
-##
-## A simple shell script to launch the GNU Classpath jarsigner tool.
-##
-
-prefix=@prefix@
-tools_dir=@datadir@/@PACKAGE@
-tools_cp=${tools_dir}/tools.zip
-
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.jarsigner.Main $@

Index: tools/keytool.in
===================================================================
RCS file: tools/keytool.in
diff -N tools/keytool.in
--- tools/keytool.in	1 Jun 2006 19:20:35 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-## Copyright (C) 2006 Free Software Foundation, Inc.
-##
-## This file is a 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 of the License, 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; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
-## 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.
-##
-##
-## A simple shell script to launch the GNU Classpath keytool tool.
-##
-
-prefix=@prefix@
-tools_dir=@datadir@/@PACKAGE@
-tools_cp=${tools_dir}/tools.zip
-
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.keytool.Main $@



From MAILER-DAEMON Thu Jun 15 21:43:58 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fr3NO-00006T-83
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fr3NM-0008Vd-CT
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fr3NL-0008UQ-JW
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fr3NL-0008U5-EH
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fr3Wr-0001Ca-K9
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:53:45 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fr3NK-0000Sd-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 21:43:54 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fr3NK-0000SY-PK
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 01:43:54 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fr3NK-0000SY-PK@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 01:43:54 +0000
Subject: [commit-cp] classpath/vm/reference/sun
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 01:43:56 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/16 01:43:54

New directory:
	vm/reference/sun

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/sun/?cvsroot=classpath



From MAILER-DAEMON Thu Jun 15 21:43:59 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fr3NP-00007s-HP
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fr3NM-0008Vk-Hl
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fr3NL-0008UZ-Og
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fr3NL-0008UW-LY
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fr3Wr-0001Cd-QV
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:53:45 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fr3NL-0000Sj-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 21:43:55 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fr3NK-0000Sf-Vg
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 01:43:55 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fr3NK-0000Sf-Vg@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 01:43:54 +0000
Subject: [commit-cp] classpath/vm/reference/sun/misc
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 01:43:57 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/16 01:43:54

New directory:
	vm/reference/sun/misc

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/sun/misc/?cvsroot=classpath



From MAILER-DAEMON Thu Jun 15 21:44:00 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fr3NP-000087-TX
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fr3NN-00005k-L0
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fr3NL-0008Tv-EL
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fr3NL-0008Tq-7Z
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fr3Wr-0001CY-E3
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:53:45 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fr3NK-0000SW-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 21:43:54 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fr3NK-0000ST-DJ
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 01:43:54 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fr3NK-0000ST-DJ@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 01:43:54 +0000
Subject: [commit-cp] classpath/external/jsr166
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 01:43:57 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/16 01:43:54

New directory:
	external/jsr166

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/external/jsr166/?cvsroot=classpath



From MAILER-DAEMON Thu Jun 15 21:44:00 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fr3NQ-00008S-EB
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 21:44:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fr3NN-00005t-O1
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fr3NM-0008V4-3b
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fr3NL-0008Uo-Us
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:43:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fr3Ws-0001Ch-4S
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:53:46 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fr3NL-0000Sq-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 21:43:55 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fr3NL-0000Sl-7A
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 01:43:55 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fr3NL-0000Sl-7A@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 01:43:55 +0000
Subject: [commit-cp] classpath/vm/reference/sun/reflect
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 01:43:58 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/16 01:43:55

New directory:
	vm/reference/sun/reflect

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/sun/reflect/?cvsroot=classpath



From MAILER-DAEMON Thu Jun 15 21:44:23 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fr3Nn-0000JT-Kx
	for mharc-commit-classpath@gnu.org; Thu, 15 Jun 2006 21:44:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fr3Nm-0000JG-8N
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:44:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fr3Nk-0000Ip-R4
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:44:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fr3Nk-0000Im-LD
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:44:20 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fr3XG-0001H7-9G
	for commit-classpath@gnu.org; Thu, 15 Jun 2006 21:54:10 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fr3Nj-0000Ug-00
	for <commit-classpath@gnu.org>; Thu, 15 Jun 2006 21:44:19 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fr3Nj-0000Ud-5J
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 01:44:19 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fr3Nj-0000Ud-5J@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 01:44:19 +0000
Subject: [commit-cp] classpath ChangeLog external/jsr166/IMPORTING v...
	[generics-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 01:44:22 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics-branch
Changes by:	Tom Tromey <tromey>	06/06/16 01:44:17

Modified files:
	.              : ChangeLog 
Added files:
	external/jsr166: IMPORTING 
	vm/reference/sun/reflect: Reflection.java 
	vm/reference/sun/misc: Unsafe.java 
	scripts        : sanitize-jsr166 
Removed files:
	vm/reference/gnu/classpath: Unsafe.java 

Log message:
		* scripts/sanitize-jsr166: New file.
		* external/jsr166/IMPORTING: New file.
		* vm/reference/sun/reflect/Reflection.java: New file.
		* vm/reference/gnu/classpath/Unsafe.java: Moved...
		* vm/reference/sun/misc/Unsafe.java: ...here.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/external/jsr166/IMPORTING?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/sun/reflect/Reflection.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.268&r2=1.2386.2.269
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/sun/misc/Unsafe.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/gnu/classpath/Unsafe.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/scripts/sanitize-jsr166?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.268
retrieving revision 1.2386.2.269
diff -u -b -r1.2386.2.268 -r1.2386.2.269
--- ChangeLog	14 Jun 2006 20:29:25 -0000	1.2386.2.268
+++ ChangeLog	16 Jun 2006 01:44:14 -0000	1.2386.2.269
@@ -1,3 +1,11 @@
+2006-06-15  Tom Tromey  <tromey@redhat.com>
+
+	* scripts/sanitize-jsr166: New file.
+	* external/jsr166/IMPORTING: New file.
+	* vm/reference/sun/reflect/Reflection.java: New file.
+	* vm/reference/gnu/classpath/Unsafe.java: Moved...
+	* vm/reference/sun/misc/Unsafe.java: ...here.
+
 2006-06-14  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* javax/naming/InitialContext.java:

Index: external/jsr166/IMPORTING
===================================================================
RCS file: external/jsr166/IMPORTING
diff -N external/jsr166/IMPORTING
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ external/jsr166/IMPORTING	16 Jun 2006 01:44:14 -0000	1.1.2.1
@@ -0,0 +1,31 @@
+The code in this directory comes from the JSR 166
+reference implementation.  The RI consists of a public
+domain part and a part that is copyright Sun.  We remove
+the copyrighted code prior to import so as not to taint
+our source repository.
+
+To do a new import:
+
+* Download the RI from the source repository.
+  http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/src/main/java
+  I clicked on the "download tarball" link.
+
+* Unpack the tarball in a fresh directory.
+  mkdir tmp; cd tmp; tar zxvvf .../java.tar.gz
+
+* Clean up the results.
+  .../classpath/scripts/sanitize-jsr166
+
+* Import these using 'cvs import' into the appropriate subdirectory.
+  The vendor branch name is 'JSR166'.
+
+* Merge the vendor branch onto the branch you're using (currently
+  the generics branch, but eventually it will be the trunk).
+
+* Build the result.
+
+* When it works, check it in.
+
+In general we try to avoid divergence from upstream as much
+as possible.  You may need to write new classes or methods in
+order for the build to succeed.

Index: vm/reference/sun/reflect/Reflection.java
===================================================================
RCS file: vm/reference/sun/reflect/Reflection.java
diff -N vm/reference/sun/reflect/Reflection.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ vm/reference/sun/reflect/Reflection.java	16 Jun 2006 01:44:14 -0000	1.1.2.1
@@ -0,0 +1,98 @@
+/* Reflection.java - JSR 166 reflection hooks
+   Copyright (C) 2006 Free Software Foundation
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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 sun.reflect;
+
+import gnu.classpath.VMStackWalker;
+
+import java.lang.reflect.Modifier;
+
+public class Reflection
+{
+  /**
+   * A stack-walking wrapper method used by the JSR 166 RI. 
+   */
+  public Class getCallerClass(int depth)
+  {
+    return VMStackWalker.getClassContext()[depth];
+  }
+  
+  // We use this inaccessible inner class as an argument type
+  // in verifyMemberAccess.  All current users of this method
+  // in the JSR 166 RI pass 'null' for this argument, and
+  // consequently we don't know what it means.  Using a funny
+  // type like this for the argument means that if the RI changes,
+  // we will see a compilation error.
+  private static class MustBeNull
+  {
+  }
+
+  /**
+   * Perform access checks on a member of a class.  This API is
+   * derived from the public domain code in the JSR 166 reference
+   * implementation.
+   * @param caller the class requesting access to the member
+   * @param declarer the declaring class of the member
+   * @param ignored unknown parameter; always null
+   * @param modifiers the modifiers on the member
+   * @return true if access is granted, false otherwise
+   */
+  public static boolean verifyMemberAccess(Class caller,
+                                           Class declarer,
+                                           MustBeNull ignored,
+                                           int modifiers)
+  {
+    // Same class, always ok.
+    if (caller == declarer)
+      return true;
+    // Public access is ok.
+    if ((modifiers & Modifier.PUBLIC) != 0)
+      return true;
+    // Protected access and request comes from
+    // a subclass of the declarer -- ok.
+    if ((modifiers & Modifier.PROTECTED) != 0
+        && declarer.isAssignableFrom(caller))
+      return true;
+    // Package-private access, or protected access,
+    // and the packages are the same --ok.
+    if ((modifiers & Modifier.PRIVATE) == 0
+        && caller.getPackage() == declarer.getPackage())
+      return true;
+    // Otherwise, no.
+    return false;
+  }
+}

Index: vm/reference/sun/misc/Unsafe.java
===================================================================
RCS file: vm/reference/sun/misc/Unsafe.java
diff -N vm/reference/sun/misc/Unsafe.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ vm/reference/sun/misc/Unsafe.java	16 Jun 2006 01:44:16 -0000	1.1.2.1
@@ -0,0 +1,328 @@
+/* Unsafe.java - Unsafe operations needed for concurrency
+   Copyright (C) 2006 Free Software Foundation
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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 sun.misc;
+
+import java.lang.reflect.Field;
+
+/**
+ * This class should provide access to low-level operations and its
+ * use should be limited to trusted code.  Fields can be accessed using
+ * memory addresses, with undefined behaviour occurring if invalid memory
+ * addresses are given.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ */
+public class Unsafe
+{
+  // Singleton class.
+  private static Unsafe unsafe = new Unsafe();
+
+  /**
+   * Private default constructor to prevent creation of an arbitrary
+   * number of instances.
+   */
+  private Unsafe()
+  {
+  }
+
+  /**
+   * Retrieve the singleton instance of <code>Unsafe</code>.  The calling
+   * method should guard this instance from untrusted code, as it provides
+   * access to low-level operations such as direct memory access.
+   *
+   * @throws SecurityException if a security manager exists and prevents
+   *                           access to the system properties.
+   */
+  public static Unsafe getUnsafe()
+  {
+    SecurityManager sm = System.getSecurityManager();
+    if (sm != null)
+      sm.checkPropertiesAccess();
+    return unsafe;
+  }
+  
+  /**
+   * Returns the memory address offset of the given static field.
+   * The offset is merely used as a means to access a particular field
+   * in the other methods of this class.  The value is unique to the given
+   * field and the same value should be returned on each subsequent call.
+   *
+   * @param field the field whose offset should be returned.
+   * @return the offset of the given field.
+   */
+  public native long objectFieldOffset(Field field);
+
+  /**
+   * Compares the value of the integer field at the specified offset
+   * in the supplied object with the given expected value, and updates
+   * it if they match.  The operation of this method should be atomic,
+   * thus providing an uninterruptible way of updating an integer field.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the integer field within <code>obj</code>.
+   * @param expect the expected value of the field.
+   * @param update the new value of the field if it equals <code>expect</code>.
+   * @return true if the field was changed.
+   */
+  public native boolean compareAndSwapInt(Object obj, long offset,
+                                          int expect, int update);
+
+  /**
+   * Compares the value of the long field at the specified offset
+   * in the supplied object with the given expected value, and updates
+   * it if they match.  The operation of this method should be atomic,
+   * thus providing an uninterruptible way of updating a long field.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the long field within <code>obj</code>.
+   * @param expect the expected value of the field.
+   * @param update the new value of the field if it equals <code>expect</code>.
+   * @return true if the field was changed.
+   */
+  public native boolean compareAndSwapLong(Object obj, long offset,
+                                           long expect, long update);
+
+  /**
+   * Compares the value of the object field at the specified offset
+   * in the supplied object with the given expected value, and updates
+   * it if they match.  The operation of this method should be atomic,
+   * thus providing an uninterruptible way of updating an object field.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the object field within <code>obj</code>.
+   * @param expect the expected value of the field.
+   * @param update the new value of the field if it equals <code>expect</code>.
+   * @return true if the field was changed.
+   */
+  public native boolean compareAndSwapObject(Object obj, long offset,
+                                             Object expect, Object update);
+
+  /**
+   * Sets the value of the integer field at the specified offset in the
+   * supplied object to the given value.  This is an ordered or lazy
+   * version of <code>putIntVolatile(Object,long,int)</code>, which
+   * doesn't guarantee the immediate visibility of the change to other
+   * threads.  It is only really useful where the integer field is
+   * <code>volatile</code>, and is thus expected to change unexpectedly.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the integer field within <code>obj</code>.
+   * @param value the new value of the field.
+   * @see #putIntVolatile(Object,long,int)
+   */
+  public native void putOrderedInt(Object obj, long offset, int value);
+
+  /**
+   * Sets the value of the long field at the specified offset in the
+   * supplied object to the given value.  This is an ordered or lazy
+   * version of <code>putLongVolatile(Object,long,long)</code>, which
+   * doesn't guarantee the immediate visibility of the change to other
+   * threads.  It is only really useful where the long field is
+   * <code>volatile</code>, and is thus expected to change unexpectedly.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the long field within <code>obj</code>.
+   * @param value the new value of the field.
+   * @see #putLongVolatile(Object,long,long)
+   */
+  public native void putOrderedLong(Object obj, long offset, long value);
+
+  /**
+   * Sets the value of the object field at the specified offset in the
+   * supplied object to the given value.  This is an ordered or lazy
+   * version of <code>putObjectVolatile(Object,long,Object)</code>, which
+   * doesn't guarantee the immediate visibility of the change to other
+   * threads.  It is only really useful where the object field is
+   * <code>volatile</code>, and is thus expected to change unexpectedly.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the object field within <code>obj</code>.
+   * @param value the new value of the field.
+   */
+  public native void putOrderedObject(Object obj, long offset, Object value);
+
+  /**
+   * Sets the value of the integer field at the specified offset in the
+   * supplied object to the given value, with volatile store semantics.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the integer field within <code>obj</code>.
+   * @param value the new value of the field.
+   */
+  public native void putIntVolatile(Object obj, long offset, int value);
+
+  /**
+   * Retrieves the value of the integer field at the specified offset in the
+   * supplied object with volatile load semantics.
+   *
+   * @param obj the object containing the field to read.
+   * @param offset the offset of the integer field within <code>obj</code>.
+   */
+  public native int getIntVolatile(Object obj, long offset);
+
+  /**
+   * Sets the value of the long field at the specified offset in the
+   * supplied object to the given value, with volatile store semantics.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the long field within <code>obj</code>.
+   * @param value the new value of the field.
+   * @see #putLong(Object,long,long)
+   */
+  public native void putLongVolatile(Object obj, long offset, long value);
+
+  /**
+   * Sets the value of the long field at the specified offset in the
+   * supplied object to the given value.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the long field within <code>obj</code>.
+   * @param value the new value of the field.
+   * @see #putLongVolatile(Object,long,long)
+   */
+  public native void putLong(Object obj, long offset, long value);
+
+  /**
+   * Retrieves the value of the long field at the specified offset in the
+   * supplied object with volatile load semantics.
+   *
+   * @param obj the object containing the field to read.
+   * @param offset the offset of the long field within <code>obj</code>.
+   * @see #getLong(Object,long)
+   */
+  public native long getLongVolatile(Object obj, long offset);
+
+  /**
+   * Retrieves the value of the long field at the specified offset in the
+   * supplied object.
+   *
+   * @param obj the object containing the field to read.
+   * @param offset the offset of the long field within <code>obj</code>.
+   * @see #getLongVolatile(Object,long)
+   */
+  public native long getLong(Object obj, long offset);
+
+  /**
+   * Sets the value of the object field at the specified offset in the
+   * supplied object to the given value, with volatile store semantics.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the object field within <code>obj</code>.
+   * @param value the new value of the field.
+   * @see #putObject(Object,long,Object)
+   */
+  public native void putObjectVolatile(Object obj, long offset, Object value);
+
+  /**
+   * Sets the value of the object field at the specified offset in the
+   * supplied object to the given value.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the object field within <code>obj</code>.
+   * @param value the new value of the field.
+   * @see #putObjectVolatile(Object,long,Object)
+   */
+  public native void putObject(Object obj, long offset, Object value);
+
+  /**
+   * Retrieves the value of the object field at the specified offset in the
+   * supplied object with volatile load semantics.
+   *
+   * @param obj the object containing the field to read.
+   * @param offset the offset of the object field within <code>obj</code>.
+   */
+  public native Object getObjectVolatile(Object obj, long offset);
+
+  /**
+   * Returns the offset of the first element for a given array class.
+   * To access elements of the array class, this value may be used along
+   * with that returned by 
+   * <a href="#arrayIndexScale"><code>arrayIndexScale</code></a>,
+   * if non-zero.
+   *
+   * @param arrayClass the class for which the first element's address should
+   *                   be obtained.
+   * @return the offset of the first element of the array class.
+   * @see arrayIndexScale(Class)
+   */
+  public native int arrayBaseOffset(Class arrayClass);
+
+  /**
+   * Returns the scale factor used for addressing elements of the supplied
+   * array class.  Where a suitable scale factor can not be returned (e.g.
+   * for primitive types), zero should be returned.  The returned value
+   * can be used with 
+   * <a href="#arrayBaseOffset"><code>arrayBaseOffset</code></a>
+   * to access elements of the class.
+   *
+   * @param arrayClass the class whose scale factor should be returned.
+   * @return the scale factor, or zero if not supported for this array class.
+   */
+  public native int arrayIndexScale(Class arrayClass);
+  
+  /**
+   * Releases the block on a thread created by 
+   * <a href="#park"><code>park</code></a>.  This method can also be used
+   * to terminate a blockage caused by a prior call to <code>park</code>.
+   * This operation is unsafe, as the thread must be guaranteed to be
+   * live.  This is true of Java, but not native code.
+   *
+   * @param thread the thread to unblock.
+   */
+  public native void unpark(Thread thread);
+
+  /**
+   * Blocks the thread until a matching 
+   * <a href="#unpark"><code>unpark</code></a> occurs, the thread is
+   * interrupted or the optional timeout expires.  If an <code>unpark</code>
+   * call has already occurred, this also counts.  A timeout value of zero
+   * is defined as no timeout.  When <code>isAbsolute</code> is
+   * <code>true</code>, the timeout is in milliseconds relative to the
+   * epoch.  Otherwise, the value is the number of nanoseconds which must
+   * occur before timeout.  This call may also return spuriously (i.e.
+   * for no apparent reason).
+   *
+   * @param isAbsolute true if the timeout is specified in milliseconds from
+   *                   the epoch.
+   * @param time either the number of nanoseconds to wait, or a time in
+   *             milliseconds from the epoch to wait for.
+   */
+  public native void park(boolean isAbsolute, long time);
+
+}

Index: scripts/sanitize-jsr166
===================================================================
RCS file: scripts/sanitize-jsr166
diff -N scripts/sanitize-jsr166
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ scripts/sanitize-jsr166	16 Jun 2006 01:44:17 -0000	1.1.2.1
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+# Sanitize a jsr166 download.
+
+# Remove code copyright Sun.
+find . -name '*.java' -print | xargs grep -l 'Copyright.*Sun' | xargs rm

Index: vm/reference/gnu/classpath/Unsafe.java
===================================================================
RCS file: vm/reference/gnu/classpath/Unsafe.java
diff -N vm/reference/gnu/classpath/Unsafe.java
--- vm/reference/gnu/classpath/Unsafe.java	20 Mar 2006 00:32:56 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,328 +0,0 @@
-/* Unsafe.java - Unsafe operations needed for concurrency
-   Copyright (C) 2006 Free Software Foundation
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.classpath;
-
-import java.lang.reflect.Field;
-
-/**
- * This class should provide access to low-level operations and its
- * use should be limited to trusted code.  Fields can be accessed using
- * memory addresses, with undefined behaviour occurring if invalid memory
- * addresses are given.
- *
- * @author Tom Tromey (tromey@redhat.com)
- * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- */
-public class Unsafe
-{
-  // Singleton class.
-  private static Unsafe unsafe = new Unsafe();
-
-  /**
-   * Private default constructor to prevent creation of an arbitrary
-   * number of instances.
-   */
-  private Unsafe()
-  {
-  }
-
-  /**
-   * Retrieve the singleton instance of <code>Unsafe</code>.  The calling
-   * method should guard this instance from untrusted code, as it provides
-   * access to low-level operations such as direct memory access.
-   *
-   * @throws SecurityException if a security manager exists and prevents
-   *                           access to the system properties.
-   */
-  public static Unsafe getUnsafe()
-  {
-    SecurityManager sm = System.getSecurityManager();
-    if (sm != null)
-      sm.checkPropertiesAccess();
-    return unsafe;
-  }
-  
-  /**
-   * Returns the memory address offset of the given static field.
-   * The offset is merely used as a means to access a particular field
-   * in the other methods of this class.  The value is unique to the given
-   * field and the same value should be returned on each subsequent call.
-   *
-   * @param field the field whose offset should be returned.
-   * @return the offset of the given field.
-   */
-  public native long objectFieldOffset(Field field);
-
-  /**
-   * Compares the value of the integer field at the specified offset
-   * in the supplied object with the given expected value, and updates
-   * it if they match.  The operation of this method should be atomic,
-   * thus providing an uninterruptible way of updating an integer field.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the integer field within <code>obj</code>.
-   * @param expect the expected value of the field.
-   * @param update the new value of the field if it equals <code>expect</code>.
-   * @return true if the field was changed.
-   */
-  public native boolean compareAndSwapInt(Object obj, long offset,
-                                          int expect, int update);
-
-  /**
-   * Compares the value of the long field at the specified offset
-   * in the supplied object with the given expected value, and updates
-   * it if they match.  The operation of this method should be atomic,
-   * thus providing an uninterruptible way of updating a long field.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the long field within <code>obj</code>.
-   * @param expect the expected value of the field.
-   * @param update the new value of the field if it equals <code>expect</code>.
-   * @return true if the field was changed.
-   */
-  public native boolean compareAndSwapLong(Object obj, long offset,
-                                           long expect, long update);
-
-  /**
-   * Compares the value of the object field at the specified offset
-   * in the supplied object with the given expected value, and updates
-   * it if they match.  The operation of this method should be atomic,
-   * thus providing an uninterruptible way of updating an object field.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the object field within <code>obj</code>.
-   * @param expect the expected value of the field.
-   * @param update the new value of the field if it equals <code>expect</code>.
-   * @return true if the field was changed.
-   */
-  public native boolean compareAndSwapObject(Object obj, long offset,
-                                             Object expect, Object update);
-
-  /**
-   * Sets the value of the integer field at the specified offset in the
-   * supplied object to the given value.  This is an ordered or lazy
-   * version of <code>putIntVolatile(Object,long,int)</code>, which
-   * doesn't guarantee the immediate visibility of the change to other
-   * threads.  It is only really useful where the integer field is
-   * <code>volatile</code>, and is thus expected to change unexpectedly.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the integer field within <code>obj</code>.
-   * @param value the new value of the field.
-   * @see #putIntVolatile(Object,long,int)
-   */
-  public native void putOrderedInt(Object obj, long offset, int value);
-
-  /**
-   * Sets the value of the long field at the specified offset in the
-   * supplied object to the given value.  This is an ordered or lazy
-   * version of <code>putLongVolatile(Object,long,long)</code>, which
-   * doesn't guarantee the immediate visibility of the change to other
-   * threads.  It is only really useful where the long field is
-   * <code>volatile</code>, and is thus expected to change unexpectedly.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the long field within <code>obj</code>.
-   * @param value the new value of the field.
-   * @see #putLongVolatile(Object,long,long)
-   */
-  public native void putOrderedLong(Object obj, long offset, long value);
-
-  /**
-   * Sets the value of the object field at the specified offset in the
-   * supplied object to the given value.  This is an ordered or lazy
-   * version of <code>putObjectVolatile(Object,long,Object)</code>, which
-   * doesn't guarantee the immediate visibility of the change to other
-   * threads.  It is only really useful where the object field is
-   * <code>volatile</code>, and is thus expected to change unexpectedly.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the object field within <code>obj</code>.
-   * @param value the new value of the field.
-   */
-  public native void putOrderedObject(Object obj, long offset, Object value);
-
-  /**
-   * Sets the value of the integer field at the specified offset in the
-   * supplied object to the given value, with volatile store semantics.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the integer field within <code>obj</code>.
-   * @param value the new value of the field.
-   */
-  public native void putIntVolatile(Object obj, long offset, int value);
-
-  /**
-   * Retrieves the value of the integer field at the specified offset in the
-   * supplied object with volatile load semantics.
-   *
-   * @param obj the object containing the field to read.
-   * @param offset the offset of the integer field within <code>obj</code>.
-   */
-  public native int getIntVolatile(Object obj, long offset);
-
-  /**
-   * Sets the value of the long field at the specified offset in the
-   * supplied object to the given value, with volatile store semantics.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the long field within <code>obj</code>.
-   * @param value the new value of the field.
-   * @see #putLong(Object,long,long)
-   */
-  public native void putLongVolatile(Object obj, long offset, long value);
-
-  /**
-   * Sets the value of the long field at the specified offset in the
-   * supplied object to the given value.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the long field within <code>obj</code>.
-   * @param value the new value of the field.
-   * @see #putLongVolatile(Object,long,long)
-   */
-  public native void putLong(Object obj, long offset, long value);
-
-  /**
-   * Retrieves the value of the long field at the specified offset in the
-   * supplied object with volatile load semantics.
-   *
-   * @param obj the object containing the field to read.
-   * @param offset the offset of the long field within <code>obj</code>.
-   * @see #getLong(Object,long)
-   */
-  public native long getLongVolatile(Object obj, long offset);
-
-  /**
-   * Retrieves the value of the long field at the specified offset in the
-   * supplied object.
-   *
-   * @param obj the object containing the field to read.
-   * @param offset the offset of the long field within <code>obj</code>.
-   * @see #getLongVolatile(Object,long)
-   */
-  public native long getLong(Object obj, long offset);
-
-  /**
-   * Sets the value of the object field at the specified offset in the
-   * supplied object to the given value, with volatile store semantics.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the object field within <code>obj</code>.
-   * @param value the new value of the field.
-   * @see #putObject(Object,long,Object)
-   */
-  public native void putObjectVolatile(Object obj, long offset, Object value);
-
-  /**
-   * Sets the value of the object field at the specified offset in the
-   * supplied object to the given value.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the object field within <code>obj</code>.
-   * @param value the new value of the field.
-   * @see #putObjectVolatile(Object,long,Object)
-   */
-  public native void putObject(Object obj, long offset, Object value);
-
-  /**
-   * Retrieves the value of the object field at the specified offset in the
-   * supplied object with volatile load semantics.
-   *
-   * @param obj the object containing the field to read.
-   * @param offset the offset of the object field within <code>obj</code>.
-   */
-  public native Object getObjectVolatile(Object obj, long offset);
-
-  /**
-   * Returns the offset of the first element for a given array class.
-   * To access elements of the array class, this value may be used along
-   * with that returned by 
-   * <a href="#arrayIndexScale"><code>arrayIndexScale</code></a>,
-   * if non-zero.
-   *
-   * @param arrayClass the class for which the first element's address should
-   *                   be obtained.
-   * @return the offset of the first element of the array class.
-   * @see arrayIndexScale(Class)
-   */
-  public native int arrayBaseOffset(Class arrayClass);
-
-  /**
-   * Returns the scale factor used for addressing elements of the supplied
-   * array class.  Where a suitable scale factor can not be returned (e.g.
-   * for primitive types), zero should be returned.  The returned value
-   * can be used with 
-   * <a href="#arrayBaseOffset"><code>arrayBaseOffset</code></a>
-   * to access elements of the class.
-   *
-   * @param arrayClass the class whose scale factor should be returned.
-   * @return the scale factor, or zero if not supported for this array class.
-   */
-  public native int arrayIndexScale(Class arrayClass);
-  
-  /**
-   * Releases the block on a thread created by 
-   * <a href="#park"><code>park</code></a>.  This method can also be used
-   * to terminate a blockage caused by a prior call to <code>park</code>.
-   * This operation is unsafe, as the thread must be guaranteed to be
-   * live.  This is true of Java, but not native code.
-   *
-   * @param thread the thread to unblock.
-   */
-  public native void unpark(Thread thread);
-
-  /**
-   * Blocks the thread until a matching 
-   * <a href="#unpark"><code>unpark</code></a> occurs, the thread is
-   * interrupted or the optional timeout expires.  If an <code>unpark</code>
-   * call has already occurred, this also counts.  A timeout value of zero
-   * is defined as no timeout.  When <code>isAbsolute</code> is
-   * <code>true</code>, the timeout is in milliseconds relative to the
-   * epoch.  Otherwise, the value is the number of nanoseconds which must
-   * occur before timeout.  This call may also return spuriously (i.e.
-   * for no apparent reason).
-   *
-   * @param isAbsolute true if the timeout is specified in milliseconds from
-   *                   the epoch.
-   * @param time either the number of nanoseconds to wait, or a time in
-   *             milliseconds from the epoch to wait for.
-   */
-  public native void park(boolean isAbsolute, long time);
-
-}



From MAILER-DAEMON Fri Jun 16 06:27:36 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrBY8-0004ZJ-FK
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 06:27:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrBY7-0004Yv-Ci
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 06:27:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrBY5-0004YF-SV
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 06:27:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrBY5-0004YA-Ms
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 06:27:33 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrBhh-00085w-2U
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 06:37:29 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrBY5-0001Cv-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 06:27:33 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FrBY3-0001Cn-DQ
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 10:27:33 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrBY3-0001Cn-DQ@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Fri, 16 Jun 2006 10:27:31 +0000
Subject: [commit-cp] classpath/gnu/java/awt/peer/gtk CairoGraphics2D...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 10:27:35 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/16 10:27:31

Modified files:
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 
	.              : ChangeLog 

Log message:
	2006-06-16  Roman Kennke  <kennke@aicas.com>
	
		PR 28027
		* gnu/java/awt/peer/gtk/CairoGraphics2D.java
		(drawImage): Don't use setClip() but instead clipRect() to
		intersect the current clip with a new one.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7837&r2=1.7838

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7837
retrieving revision 1.7838
diff -u -b -r1.7837 -r1.7838
--- ChangeLog	15 Jun 2006 23:08:48 -0000	1.7837
+++ ChangeLog	16 Jun 2006 10:27:30 -0000	1.7838
@@ -1,3 +1,10 @@
+2006-06-16  Roman Kennke  <kennke@aicas.com>
+
+	PR 28027
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
+	(drawImage): Don't use setClip() but instead clipRect() to
+	intersect the current clip with a new one.
+
 2006-06-15  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* configure.ac: Rename appletviewer to gappletviewer, jarsigner to



From MAILER-DAEMON Fri Jun 16 08:36:30 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrDYs-00025j-Cg
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 08:36:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrDYq-00023w-I4
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 08:36:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrDYn-00021e-N2
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 08:36:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrDYn-00021Q-9J
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 08:36:25 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrDiP-0002We-Nn
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 08:46:21 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrDYl-00039n-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 08:36:23 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1FrDYk-00039c-AY
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:36:23 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrDYk-00039c-AY@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Fri, 16 Jun 2006 12:36:22 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 12:36:28 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/16 12:36:22

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicRadioButtonUI.java 

Log message:
	2006-06-16  Robert Schuster  <robertschuster@fsfe.org>
	
	        * javax/swing/plaf/basic/BasicRadioButtonUI.java:
	        (installDefaults): Removed unneccessary code.
	        (paint): Removed complex if-cascade, revert to default icon if
	        icon property is not set.
	        (getPreferredSize): New method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7838&r2=1.7839
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java?cvsroot=classpath&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7838
retrieving revision 1.7839
diff -u -b -r1.7838 -r1.7839
--- ChangeLog	16 Jun 2006 10:27:30 -0000	1.7838
+++ ChangeLog	16 Jun 2006 12:36:19 -0000	1.7839
@@ -1,3 +1,11 @@
+2006-06-16  Robert Schuster  <robertschuster@fsfe.org>
+
+	* javax/swing/plaf/basic/BasicRadioButtonUI.java:
+	(installDefaults): Removed unneccessary code.
+	(paint): Removed complex if-cascade, revert to default icon if
+	icon property is not set.
+	(getPreferredSize): New method.
+
 2006-06-16  Roman Kennke  <kennke@aicas.com>
 
 	PR 28027
@@ -333,6 +341,7 @@
 	compatibility with filters.
 	(getParameter): Modified to allow access to above. 
 
+>>>>>>> 1.7824
 2006-06-13  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/peer/gtk/CairoSurface.java
@@ -354,6 +363,7 @@
 	or not the labels are visible,
 	(paintTrack): Shift track down one pixel.
 
+>>>>>>> 1.7799
 2006-06-13  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/image/PixelGrabber.java
@@ -1124,6 +1134,7 @@
 	(TreeIncrementAction.actionPerformed): Use action name as command.
 	(TreeIncrementAction.isEnabled): Implemented.
 
+>>>>>>> 1.7796
 2006-06-08  Mark Wielaard  <mark@klomp.org>
 
 	PR 27917

Index: javax/swing/plaf/basic/BasicRadioButtonUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- javax/swing/plaf/basic/BasicRadioButtonUI.java	13 Jun 2006 09:28:57 -0000	1.18
+++ javax/swing/plaf/basic/BasicRadioButtonUI.java	16 Jun 2006 12:36:21 -0000	1.19
@@ -42,6 +42,7 @@
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics;
+import java.awt.Insets;
 import java.awt.Rectangle;
 
 import javax.swing.AbstractButton;
@@ -92,14 +93,6 @@
   protected void installDefaults(AbstractButton b)
   {
     super.installDefaults(b);
-    if (b.getIcon() == null)
-      b.setIcon(icon);
-    if (b.getSelectedIcon() == null)
-      b.setSelectedIcon(icon);
-    if (b.getDisabledIcon() == null)
-      b.setDisabledIcon(icon);
-    if (b.getDisabledSelectedIcon() == null)
-      b.setDisabledSelectedIcon(icon);
   }
 
   /**
@@ -145,15 +138,16 @@
     g.setFont(f);
 
     ButtonModel m = b.getModel();
-    Icon currentIcon = null;
-    if (m.isSelected() && m.isEnabled())
-      currentIcon = b.getSelectedIcon();
-    else if (! m.isSelected() && m.isEnabled())
-      currentIcon = b.getIcon();
-    else if (m.isSelected() && ! m.isEnabled())
-      currentIcon = b.getDisabledSelectedIcon();
-    else // (!m.isSelected() && ! m.isEnabled())
-      currentIcon = b.getDisabledIcon();
+    // FIXME: Do a filtering on any customized icon if the following property
+    // is set.
+    boolean enabled = b.isEnabled();
+    
+    Icon currentIcon = b.getIcon();
+
+    if (currentIcon == null)
+      {
+        currentIcon = getDefaultIcon();
+      }
 
     SwingUtilities.calculateInnerArea(b, vr);
     String text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f), 
@@ -162,16 +156,58 @@
        b.getVerticalTextPosition(), b.getHorizontalTextPosition(),
        vr, ir, tr, b.getIconTextGap() + defaultTextShiftOffset);
     
-    if (currentIcon != null)
-      {
         currentIcon.paintIcon(c, g, ir.x, ir.y);
-      }
+    
     if (text != null)
       paintText(g, b, tr, text);
     if (b.hasFocus() && b.isFocusPainted() && m.isEnabled())
       paintFocus(g, tr, c.getSize());
   }
 
+  public Dimension getPreferredSize(JComponent c)
+  {
+    // This is basically the same code as in
+    // BasicGraphicsUtils.getPreferredButtonSize() but takes the default icon
+    // property into account. JRadioButton and subclasses always have an icon:
+    // the check box. If the user explicitly changes it with setIcon() that
+    // one will be used for layout calculations and painting instead.
+    // The other icon properties are ignored.
+    AbstractButton b = (AbstractButton) c;
+    
+    Rectangle contentRect;
+    Rectangle viewRect;
+    Rectangle iconRect = new Rectangle();
+    Rectangle textRect = new Rectangle();
+    Insets insets = b.getInsets();
+    
+    Icon i = b.getIcon();
+    if (i == null)
+      i = getDefaultIcon(); 
+    
+    viewRect = new Rectangle();
+
+    SwingUtilities.layoutCompoundLabel(
+      b, // for the component orientation
+      b.getFontMetrics(b.getFont()),
+      b.getText(),
+      i,
+      b.getVerticalAlignment(), 
+      b.getHorizontalAlignment(),
+      b.getVerticalTextPosition(),
+      b.getHorizontalTextPosition(),
+      viewRect, iconRect, textRect,
+      defaultTextIconGap + defaultTextShiftOffset);
+
+    contentRect = textRect.union(iconRect);
+    
+    return new Dimension(insets.left
+                         + contentRect.width 
+                         + insets.right + b.getHorizontalAlignment(),
+                         insets.top
+                         + contentRect.height 
+                         + insets.bottom);
+  }
+
   /**
    * Paints the focus indicator for JRadioButtons.
    *



From MAILER-DAEMON Fri Jun 16 08:37:09 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrDZV-0002SG-SL
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 08:37:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrDZU-0002Qn-W5
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 08:37:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrDZU-0002Q6-Fh
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 08:37:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrDZU-0002Pq-Bk
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 08:37:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrDj6-0002bP-Ry
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 08:47:04 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrDZT-0003JS-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 08:37:07 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1FrDZR-0003JA-I1
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:37:07 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrDZR-0003JA-I1@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Fri, 16 Jun 2006 12:37:05 +0000
Subject: [commit-cp] classpath ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 12:37:09 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/16 12:37:05

Modified files:
	.              : ChangeLog 

Log message:
	Removed CVS' conflict indicators.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7839&r2=1.7840

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7839
retrieving revision 1.7840
diff -u -b -r1.7839 -r1.7840
--- ChangeLog	16 Jun 2006 12:36:19 -0000	1.7839
+++ ChangeLog	16 Jun 2006 12:37:04 -0000	1.7840
@@ -162,7 +162,6 @@
 	Added serialization UID and changed to extend
 	javax.management.JMException.
 	
->>>>>>> 1.7826
 2006-06-14  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/Component.java
@@ -341,7 +340,6 @@
 	compatibility with filters.
 	(getParameter): Modified to allow access to above. 
 
->>>>>>> 1.7824
 2006-06-13  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/peer/gtk/CairoSurface.java
@@ -363,7 +361,6 @@
 	or not the labels are visible,
 	(paintTrack): Shift track down one pixel.
 
->>>>>>> 1.7799
 2006-06-13  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/image/PixelGrabber.java
@@ -1134,7 +1131,6 @@
 	(TreeIncrementAction.actionPerformed): Use action name as command.
 	(TreeIncrementAction.isEnabled): Implemented.
 
->>>>>>> 1.7796
 2006-06-08  Mark Wielaard  <mark@klomp.org>
 
 	PR 27917



From MAILER-DAEMON Fri Jun 16 08:54:54 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrDqf-0002Vs-Us
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 08:54:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrDqe-0002Vm-MJ
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 08:54:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrDqd-0002Va-C0
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 08:54:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrDqd-0002VX-7A
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 08:54:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrE0F-0004DL-RS
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 09:04:47 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrDqc-000590-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 08:54:50 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1FrDqb-00058t-2p
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:54:49 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrDqb-00058t-2p@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Fri, 16 Jun 2006 12:54:49 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/metal MetalMenuBarUI...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 12:54:52 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/16 12:54:48

Modified files:
	javax/swing/plaf/metal: MetalMenuBarUI.java 
	.              : ChangeLog 

Log message:
	2006-06-16  Robert Schuster  <robertschuster@fsfe.org>
	
	        * javax/swing/plaf/metal/MetalMenuBarUI.java:
	        (update): Added subexpression to if-statement.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/metal/MetalMenuBarUI.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7840&r2=1.7841

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7840
retrieving revision 1.7841
diff -u -b -r1.7840 -r1.7841
--- ChangeLog	16 Jun 2006 12:37:04 -0000	1.7840
+++ ChangeLog	16 Jun 2006 12:54:47 -0000	1.7841
@@ -1,5 +1,10 @@
 2006-06-16  Robert Schuster  <robertschuster@fsfe.org>
 
+	* javax/swing/plaf/metal/MetalMenuBarUI.java:
+	(update): Added subexpression to if-statement.
+
+2006-06-16  Robert Schuster  <robertschuster@fsfe.org>
+
 	* javax/swing/plaf/basic/BasicRadioButtonUI.java:
 	(installDefaults): Removed unneccessary code.
 	(paint): Removed complex if-cascade, revert to default icon if
@@ -162,6 +167,7 @@
 	Added serialization UID and changed to extend
 	javax.management.JMException.
 	
+>>>>>>> 1.7826
 2006-06-14  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/Component.java
@@ -340,6 +346,7 @@
 	compatibility with filters.
 	(getParameter): Modified to allow access to above. 
 
+>>>>>>> 1.7824
 2006-06-13  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/peer/gtk/CairoSurface.java
@@ -361,6 +368,7 @@
 	or not the labels are visible,
 	(paintTrack): Shift track down one pixel.
 
+>>>>>>> 1.7799
 2006-06-13  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/image/PixelGrabber.java
@@ -1131,6 +1139,7 @@
 	(TreeIncrementAction.actionPerformed): Use action name as command.
 	(TreeIncrementAction.isEnabled): Implemented.
 
+>>>>>>> 1.7796
 2006-06-08  Mark Wielaard  <mark@klomp.org>
 
 	PR 27917



From MAILER-DAEMON Fri Jun 16 09:15:26 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrEAY-0003hh-HD
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 09:15:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrEAW-0003hb-Vr
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 09:15:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrEAV-0003hP-J2
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 09:15:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrEAV-0003hM-EC
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 09:15:23 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrEK8-0006HT-Ea
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 09:25:20 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrEAU-0006XC-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 09:15:22 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FrEAS-0006X1-7M
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 13:15:21 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrEAS-0006X1-7M@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Fri, 16 Jun 2006 13:15:20 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/event/ListDataE...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 13:15:25 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/16 13:15:19

Modified files:
	.              : ChangeLog 
	javax/swing/event: ListDataEvent.java 

Log message:
	2006-06-16  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/event/ListDataEvent.java: updated API docs, plus
		(ListDataEvent): Handle case where index0 > index1,
		(toString): Implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7841&r2=1.7842
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/event/ListDataEvent.java?cvsroot=classpath&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7841
retrieving revision 1.7842
diff -u -b -r1.7841 -r1.7842
--- ChangeLog	16 Jun 2006 12:54:47 -0000	1.7841
+++ ChangeLog	16 Jun 2006 13:15:14 -0000	1.7842
@@ -1,3 +1,9 @@
+2006-06-16  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/event/ListDataEvent.java: updated API docs, plus
+	(ListDataEvent): Handle case where index0 > index1,
+	(toString): Implemented.
+
 2006-06-16  Robert Schuster  <robertschuster@fsfe.org>
 
 	* javax/swing/plaf/metal/MetalMenuBarUI.java:

Index: javax/swing/event/ListDataEvent.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/event/ListDataEvent.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- javax/swing/event/ListDataEvent.java	2 Jul 2005 20:32:50 -0000	1.8
+++ javax/swing/event/ListDataEvent.java	16 Jun 2006 13:15:19 -0000	1.9
@@ -1,5 +1,5 @@
 /* ListDataEvent.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,9 @@
 import java.util.EventObject;
 
 /**
+ * An event that contains information about a modification to the content of
+ * a list.
+ * 
  * @author Andrew Selkirk
  * @author Ronald Veldema
  */
@@ -48,32 +51,46 @@
 {
   private static final long serialVersionUID = 2510353260071004774L;
   
+  /** An event type indicating that the list content has been modified. */
   public static final int CONTENTS_CHANGED = 0;
+  
+  /** An event type indicating that an interval has been added to the list. */
   public static final int INTERVAL_ADDED = 1;
+  
+  /** 
+   * An event type indicating that an interval has been removed from the 
+   * list. 
+   */
   public static final int INTERVAL_REMOVED = 2;
 
-  private int type = 0;
-  private int index0 = 0;
-  private int index1 = 0;
+  private int type;
+  private int index0;
+  private int index1;
 	
   /**
    * Creates a <code>ListDataEvent</code> object.
    * 
-   * @param source The source of the event.
-   * @param type The type of the event
-   * @param index0 Bottom of range
-   * @param index1 Top of range
+   * @param source  the source of the event (<code>null</code> not permitted).
+   * @param type  the type of the event (should be one of 
+   *     {@link #CONTENTS_CHANGED}, {@link #INTERVAL_ADDED} or 
+   *     {@link #INTERVAL_REMOVED}, although this is not enforced).
+   * @param index0  the index for one end of the modified range of list 
+   *     elements.
+   * @param index1  the index for the other end of the modified range of list 
+   *     elements.
    */
   public ListDataEvent(Object source, int type, int index0, int index1)
   {
     super(source);
     this.type = type;
-    this.index0 = index0;
-    this.index1 = index1;
+    this.index0 = Math.min(index0, index1);
+    this.index1 = Math.max(index0, index1);
   }
 	
   /**
-   * Returns the bottom index.
+   * Returns the index of the first item in the range of modified list items.
+   * 
+   * @return The index of the first item in the range of modified list items.
    */
   public int getIndex0()
   {
@@ -81,7 +98,9 @@
   }
 
   /**
-   * Returns the top index.
+   * Returns the index of the last item in the range of modified list items.
+   * 
+   * @return The index of the last item in the range of modified list items.
    */
   public int getIndex1()
   {
@@ -89,10 +108,25 @@
   }
 
   /**
-   * Returns the type of this event.
+   * Returns a code representing the type of this event, which is usually one
+   * of {@link #CONTENTS_CHANGED}, {@link #INTERVAL_ADDED} or 
+   * {@link #INTERVAL_REMOVED}.
+   * 
+   * @return The event type.
    */
   public int getType()
   {
     return type;
   }
+  
+  /**
+   * Returns a string representing the state of this event.
+   * 
+   * @return A string.
+   */
+  public String toString()
+  {
+    return getClass().getName() + "[type=" + type + ",index0=" + index0 
+        + ",index1=" + index1 + "]";
+  }
 }



From MAILER-DAEMON Fri Jun 16 09:45:15 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrEdP-000123-B3
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 09:45:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrEdN-00011p-55
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 09:45:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrEdL-00011V-L1
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 09:45:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrEdL-00011S-Ev
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 09:45:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrEmy-0000Ky-Hz
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 09:55:08 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrEdH-0000YR-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 09:45:07 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FrEdF-0000YA-VN
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 13:45:06 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrEdF-0000YA-VN@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Fri, 16 Jun 2006 13:45:05 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/DefaultButtonMo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 13:45:13 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/16 13:45:01

Modified files:
	.              : ChangeLog 
	javax/swing    : DefaultButtonModel.java 

Log message:
	2006-06-16  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/DefaultButtonModel.java
		(setSelected): Use 'this', not null, for the item in the ItemEvent.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7842&r2=1.7843
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/DefaultButtonModel.java?cvsroot=classpath&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7842
retrieving revision 1.7843
diff -u -b -r1.7842 -r1.7843
--- ChangeLog	16 Jun 2006 13:15:14 -0000	1.7842
+++ ChangeLog	16 Jun 2006 13:44:51 -0000	1.7843
@@ -1,5 +1,10 @@
 2006-06-16  David Gilbert  <david.gilbert@object-refinery.com>
 
+	* javax/swing/DefaultButtonModel.java
+	(setSelected): Use 'this', not null, for the item in the ItemEvent.
+
+2006-06-16  David Gilbert  <david.gilbert@object-refinery.com>
+
 	* javax/swing/event/ListDataEvent.java: updated API docs, plus
 	(ListDataEvent): Handle case where index0 > index1,
 	(toString): Implemented.

Index: javax/swing/DefaultButtonModel.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/DefaultButtonModel.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- javax/swing/DefaultButtonModel.java	16 May 2006 19:48:39 -0000	1.28
+++ javax/swing/DefaultButtonModel.java	16 Jun 2006 13:44:59 -0000	1.29
@@ -466,14 +466,14 @@
     if (s)
       {
         fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED,
-                                           null, ItemEvent.SELECTED));
+                                           this, ItemEvent.SELECTED));
         if (group != null)
           group.setSelected(this, true);
       }
     else
       {
         fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED,
-                                           null, ItemEvent.DESELECTED));
+                                           this, ItemEvent.DESELECTED));
         if (group != null)
           group.setSelected(this, false);
       }



From MAILER-DAEMON Fri Jun 16 10:15:50 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrF70-00048T-Kj
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 10:15:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrF6y-00048O-S5
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 10:15:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrF6x-00047t-1A
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 10:15:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrF6w-00047k-LG
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 10:15:46 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrFGa-0002bt-6K
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 10:25:44 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrF6v-0005TD-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 10:15:45 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FrF6s-0005Sh-7R
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:15:44 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrF6s-0005Sh-7R@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Fri, 16 Jun 2006 14:15:42 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/DefaultComboBox...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 14:15:49 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/16 14:15:41

Modified files:
	.              : ChangeLog 
	javax/swing    : DefaultComboBoxModel.java 

Log message:
	2006-06-16  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/DefaultComboBoxModel.java
		(removeElementAt): Set new selected item by calling setSelectedItem().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7843&r2=1.7844
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/DefaultComboBoxModel.java?cvsroot=classpath&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7843
retrieving revision 1.7844
diff -u -b -r1.7843 -r1.7844
--- ChangeLog	16 Jun 2006 13:44:51 -0000	1.7843
+++ ChangeLog	16 Jun 2006 14:15:38 -0000	1.7844
@@ -1,5 +1,10 @@
 2006-06-16  David Gilbert  <david.gilbert@object-refinery.com>
 
+	* javax/swing/DefaultComboBoxModel.java
+	(removeElementAt): Set new selected item by calling setSelectedItem().
+
+2006-06-16  David Gilbert  <david.gilbert@object-refinery.com>
+
 	* javax/swing/DefaultButtonModel.java
 	(setSelected): Use 'this', not null, for the item in the ItemEvent.
 

Index: javax/swing/DefaultComboBoxModel.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/DefaultComboBoxModel.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- javax/swing/DefaultComboBoxModel.java	31 Mar 2006 09:45:48 -0000	1.15
+++ javax/swing/DefaultComboBoxModel.java	16 Jun 2006 14:15:41 -0000	1.16
@@ -146,9 +146,9 @@
     if (selected == index) // choose a new selected item
       {
         if (selected > 0)
-          selectedItem = getElementAt(selected - 1);
+          setSelectedItem(getElementAt(selected - 1));
         else 
-          selectedItem = getElementAt(selected + 1);
+          setSelectedItem(getElementAt(selected + 1));
       }
     list.removeElementAt(index);
     fireIntervalRemoved(this, index, index);



From MAILER-DAEMON Fri Jun 16 11:06:37 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrFu9-0004K1-5y
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 11:06:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrFu7-0004JI-By
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 11:06:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrFu6-0004Ij-Lv
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 11:06:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrFu6-0004Id-Fw
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 11:06:34 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrG3k-00012k-EG
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 11:16:32 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrFu5-0004rq-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 11:06:33 -0400
Received: from kgallowa by savannah.gnu.org with local (Exim 4.50)
	id 1FrFu4-0004rd-RT
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 15:06:33 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrFu4-0004rd-RT@savannah.gnu.org>
From: Kyle Galloway <kgallowa@redhat.com>
Date: Fri, 16 Jun 2006 15:06:32 +0000
Subject: [commit-cp] classpath/gnu/classpath/jdwp/event/filters Thre...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 15:06:35 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Kyle Galloway <kgallowa>	06/06/16 15:06:31

Modified files:
	gnu/classpath/jdwp/event/filters: ThreadOnlyFilter.java 
	.              : ChangeLog 

Log message:
	2006-06-16  Kyle Galloway  <kgallowa@redhat.com>
	
		* gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java:
		Added check for null ThreadId to avoid null pointer
		exception. 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7844&r2=1.7845

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7844
retrieving revision 1.7845
diff -u -b -r1.7844 -r1.7845
--- ChangeLog	16 Jun 2006 14:15:38 -0000	1.7844
+++ ChangeLog	16 Jun 2006 15:06:30 -0000	1.7845
@@ -1,3 +1,9 @@
+2006-06-16  Kyle Galloway  <kgallowa@redhat.com>
+
+	* gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java:
+	Added check for null ThreadId to avoid null pointer
+	exception.
+
 2006-06-16  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/DefaultComboBoxModel.java



From MAILER-DAEMON Fri Jun 16 11:15:08 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrG2O-0001gW-8z
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 11:15:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrG2M-0001gJ-T9
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 11:15:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrG2L-0001g7-FM
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 11:15:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrG2L-0001g4-6Y
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 11:15:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrGBy-0002EB-Uu
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 11:25:03 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrG2E-00060J-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 11:14:58 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FrG2D-000608-8e
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 15:14:58 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrG2D-000608-8e@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Fri, 16 Jun 2006 15:14:57 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/font/TextLayout.ja...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 15:15:07 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/16 15:14:56

Modified files:
	.              : ChangeLog 
	java/awt/font  : TextLayout.java 
	javax/swing/plaf/basic: BasicScrollBarUI.java BasicSliderUI.java 
	                        BasicTabbedPaneUI.java 

Log message:
	2006-06-16  Lillian Angel  <langel@redhat.com>
	
	        * java/awt/font/TextLayout.java:
	        Removed unneeded imports.
	        * javax/swing/plaf/basic/BasicScrollBarUI.java:
	        Added new thumbRollover field.
	        (mouseMoved): Added code to set thumbRollover field.
	        (isThumbRollover): New function.
	        (setThumbRollover): New function.
	        (getSupportsAbsolutePositioning): Implemented. This
	        needs to be changed once the feature has been
	        implemented.
	        * javax/swing/plaf/basic/BasicSliderUI.java:
	        Added new dragging field.
	        (mouseDragged): Initialized dragging field.
	        (isDragging): New function.
	        * javax/swing/plaf/basic/BasicTabbedPaneUI.java
	        (focusGained): Marked as not implemented.
	        (focusLost): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7845&r2=1.7846
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/TextLayout.java?cvsroot=classpath&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java?cvsroot=classpath&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicSliderUI.java?cvsroot=classpath&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java?cvsroot=classpath&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7845
retrieving revision 1.7846
diff -u -b -r1.7845 -r1.7846
--- ChangeLog	16 Jun 2006 15:06:30 -0000	1.7845
+++ ChangeLog	16 Jun 2006 15:14:54 -0000	1.7846
@@ -1,3 +1,23 @@
+2006-06-16  Lillian Angel  <langel@redhat.com>
+
+	* java/awt/font/TextLayout.java:
+	Removed unneeded imports.
+	* javax/swing/plaf/basic/BasicScrollBarUI.java:
+	Added new thumbRollover field.
+	(mouseMoved): Added code to set thumbRollover field.
+	(isThumbRollover): New function.
+	(setThumbRollover): New function.
+	(getSupportsAbsolutePositioning): Implemented. This
+	needs to be changed once the feature has been 
+	implemented.
+	* javax/swing/plaf/basic/BasicSliderUI.java:
+	Added new dragging field.
+	(mouseDragged): Initialized dragging field.
+	(isDragging): New function.
+	* javax/swing/plaf/basic/BasicTabbedPaneUI.java
+	(focusGained): Marked as not implemented.
+	(focusLost): Likewise.
+
 2006-06-16  Kyle Galloway  <kgallowa@redhat.com>
 
 	* gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java:

Index: java/awt/font/TextLayout.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/font/TextLayout.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- java/awt/font/TextLayout.java	15 Jun 2006 18:59:28 -0000	1.11
+++ java/awt/font/TextLayout.java	16 Jun 2006 15:14:56 -0000	1.12
@@ -43,13 +43,11 @@
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.Shape;
-import java.awt.Toolkit;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Point2D;
 import java.text.AttributedCharacterIterator;
-import java.text.AttributedString;
 import java.text.Bidi;
 import java.util.Map;
 

Index: javax/swing/plaf/basic/BasicScrollBarUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- javax/swing/plaf/basic/BasicScrollBarUI.java	13 Jun 2006 09:28:57 -0000	1.35
+++ javax/swing/plaf/basic/BasicScrollBarUI.java	16 Jun 2006 15:14:56 -0000	1.36
@@ -302,8 +302,10 @@
      */
     public void mouseMoved(MouseEvent e)
     {
-      // Not interested in where the mouse
-      // is unless it is being dragged.
+      if (thumbRect.contains(e.getPoint()))
+        thumbRollover = true;
+      else
+        thumbRollover = false;
     }
 
     /**
@@ -487,6 +489,9 @@
   /** The scrollbar this UI is acting for. */
   protected JScrollBar scrollbar;
 
+  /** True if the mouse is over the thumb. */
+  boolean thumbRollover;
+
   /**
    * This method adds a component to the layout.
    *
@@ -1401,4 +1406,39 @@
       value = min;
     return value;
   }
+  
+  /**
+   * Returns true if the mouse is over the thumb.
+   * 
+   * @return true if the mouse is over the thumb.
+   */
+  public boolean isThumbRollover()
+  {
+   return thumbRollover; 
+  }
+  
+  /**
+   * Set thumbRollover to active. This indicates
+   * whether or not the mouse is over the thumb.
+   * 
+   * @param active - true if the mouse is over the thumb.
+   */
+  protected void setThumbRollover(boolean active)
+  {
+    thumbRollover = active;
+  }
+  
+  /**
+   * Indicates whether the user can position the thumb with 
+   * a mouse click (i.e. middle button).
+   * 
+   * @return true if the user can position the thumb with a mouse
+   * click.
+   */
+  public boolean getSupportsAbsolutePositioning()
+  {
+    // The positioning feature has not been implemented.
+    // So, false is always returned.
+    return false;
+  }
 }

Index: javax/swing/plaf/basic/BasicSliderUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicSliderUI.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- javax/swing/plaf/basic/BasicSliderUI.java	13 Jun 2006 15:10:38 -0000	1.32
+++ javax/swing/plaf/basic/BasicSliderUI.java	16 Jun 2006 15:14:56 -0000	1.33
@@ -371,6 +371,7 @@
      */
     public void mouseDragged(MouseEvent e)
     {
+      dragging = true;
       if (slider.isEnabled())
         {
           currentMouseX = e.getX();
@@ -450,6 +451,7 @@
      */
     public void mouseReleased(MouseEvent e)
     {
+      dragging = false;
       if (slider.isEnabled())
         {
           currentMouseX = e.getX();
@@ -594,6 +596,9 @@
   /** True if the slider has focus. */
   private transient boolean hasFocus;
 
+  /** True if the user is dragging the slider. */
+  boolean dragging;
+
   /**
    * Creates a new Basic look and feel Slider UI.
    *
@@ -605,6 +610,16 @@
   }
 
   /**
+   * Returns true if the user is dragging the slider.
+   * 
+   * @return true if the slider is being dragged.
+   */
+  protected boolean isDragging()
+  {
+    return dragging;
+  }
+  
+  /**
    * Gets the shadow color to be used for this slider. The shadow color is the
    * color used for drawing the top and left edges of the track.
    *

Index: javax/swing/plaf/basic/BasicTabbedPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- javax/swing/plaf/basic/BasicTabbedPaneUI.java	12 Jun 2006 16:55:56 -0000	1.48
+++ javax/swing/plaf/basic/BasicTabbedPaneUI.java	16 Jun 2006 15:14:56 -0000	1.49
@@ -98,6 +98,7 @@
      * @param e The FocusEvent.
      */
     public void focusGained(FocusEvent e)
+      throws NotImplementedException
     {
       // FIXME: Implement.
     }
@@ -108,6 +109,7 @@
      * @param e The FocusEvent.
      */
     public void focusLost(FocusEvent e)
+      throws NotImplementedException
     {
       // FIXME: Implement.
     }



From MAILER-DAEMON Fri Jun 16 11:41:46 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrGSA-0006wN-4F
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 11:41:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrGS8-0006uh-4l
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 11:41:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrGS7-0006tB-8z
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 11:41:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrGS6-0006sj-Vs
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 11:41:43 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrGbl-00051J-8i
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 11:51:41 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrGS5-00018u-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 11:41:41 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FrGS4-00018j-U3
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 15:41:41 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrGS4-00018j-U3@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Fri, 16 Jun 2006 15:41:40 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/FileDialog.java ja...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 15:41:44 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/16 15:41:40

Modified files:
	.              : ChangeLog 
	java/awt       : FileDialog.java Font.java 

Log message:
	2006-06-16  Lillian Angel  <langel@redhat.com>
	
	        * java/awt/FileDialog.java
	        (FileDialog): Implemented.
	        (FileDialog): Implemented.
	        (FileDialog): Implemented.
	        * java/awt/Font.java:
	        Added TYPE1_FONT constant field.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7846&r2=1.7847
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/FileDialog.java?cvsroot=classpath&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Font.java?cvsroot=classpath&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7846
retrieving revision 1.7847
diff -u -b -r1.7846 -r1.7847
--- ChangeLog	16 Jun 2006 15:14:54 -0000	1.7846
+++ ChangeLog	16 Jun 2006 15:41:36 -0000	1.7847
@@ -1,5 +1,14 @@
 2006-06-16  Lillian Angel  <langel@redhat.com>
 
+	* java/awt/FileDialog.java
+	(FileDialog): Implemented.
+	(FileDialog): Implemented.
+	(FileDialog): Implemented.
+	* java/awt/Font.java:
+	Added TYPE1_FONT constant field.
+
+2006-06-16  Lillian Angel  <langel@redhat.com>
+
 	* java/awt/font/TextLayout.java:
 	Removed unneeded imports.
 	* javax/swing/plaf/basic/BasicScrollBarUI.java:

Index: java/awt/FileDialog.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/FileDialog.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- java/awt/FileDialog.java	2 Jul 2005 20:32:24 -0000	1.14
+++ java/awt/FileDialog.java	16 Jun 2006 15:41:39 -0000	1.15
@@ -101,6 +101,52 @@
  * Constructors
  */
 
+  /**
+   * Initializes a new instance of <code>FileDialog</code> with the specified
+   * parent. This dialog will have no title and will be for loading a file.
+   * 
+   * @param parent The parent dialog for this.
+   */
+  public FileDialog(Dialog parent)
+  {
+    this(parent, "", LOAD);
+  }
+  
+  /**
+   * Initialized a new instance of <code>FileDialog</code> with the
+   * specified parent and title.  This dialog will be for opening a file.
+   *
+   * @param parent The parent dialog for this.
+   * @param title The title for this dialog.
+   */
+  public FileDialog(Dialog parent, String title)
+  {
+    this(parent, title, LOAD);
+  }
+  
+  /**
+   * Initialized a new instance of <code>FileDialog</code> with the specified
+   * parent, title, and mode.
+   * 
+   * @param parent The parent dialog for this.
+   * @param title The title for this dialog.
+   * @param mode The mode of the dialog, either <code>LOAD</code> or
+   *          <code>SAVE</code>.
+   * @throws IllegalArgumentException - if illegal mode, if
+   *           GraphicsEnvironment.isHeadless or if parent is null.
+   */
+  public FileDialog(Dialog parent, String title, int mode)
+  {
+    super(parent, title, true);
+
+    // Other IllegalArgumentException cases are taken care of in Window.java
+    if (mode != LOAD && mode != SAVE)
+      throw new IllegalArgumentException (
+        "Mode argument must be either LOAD or SAVE");
+    
+    setMode(mode);
+  }
+
 /**
   * Initializes a new instance of <code>FileDialog</code> with the 
   * specified parent.  This dialog will have no title and will be for

Index: java/awt/Font.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Font.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- java/awt/Font.java	20 May 2006 12:52:52 -0000	1.34
+++ java/awt/Font.java	16 Jun 2006 15:41:40 -0000	1.35
@@ -115,6 +115,11 @@
    */
   public static final int TRUETYPE_FONT = 0;
 
+  /**
+   * Indicates to <code>createFont</code> that the supplied font data
+   * is in Type1 format.
+   */
+  public static final int TYPE1_FONT = 1;
 
   /**
    * A flag for <code>layoutGlyphVector</code>, indicating that the



From MAILER-DAEMON Fri Jun 16 12:10:28 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrGtw-0003Ts-8X
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 12:10:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrGtv-0003TF-3V
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:10:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrGtu-0003St-Hg
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:10:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrGtu-0003Sg-21
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:10:26 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrH3Y-0007jb-Iw
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:20:24 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrGtt-0003LA-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 12:10:25 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FrGtr-0003L5-AW
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:10:24 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrGtr-0003L5-AW@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Fri, 16 Jun 2006 16:10:23 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/FileDialog.java ja...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 16:10:27 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/16 16:10:23

Modified files:
	.              : ChangeLog 
	java/awt       : FileDialog.java Font.java 
	javax/swing/plaf/basic: BasicScrollBarUI.java BasicSliderUI.java 

Log message:
	2006-06-16  Lillian Angel  <langel@redhat.com>
	
	        * java/awt/FileDialog.java
	        (FileDialog): Added @since tag to API docs.
	        (FileDialog): Likewise.
	        (FileDialog): Likewise.
	        * java/awt/Font.java:
	        Added @since tag to TYPE1_FONT field docs.
	        * javax/swing/plaf/basic/BasicScrollBarUI.java:
	        (isThumbRollover): Likewise.
	        (setThumbRollover): Likewise.
	        (getSupportsAbsolutePositioning): Likewise.
	        * javax/swing/plaf/basic/BasicSliderUI.java:
	        (isDragging): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7847&r2=1.7848
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/FileDialog.java?cvsroot=classpath&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Font.java?cvsroot=classpath&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java?cvsroot=classpath&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicSliderUI.java?cvsroot=classpath&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7847
retrieving revision 1.7848
diff -u -b -r1.7847 -r1.7848
--- ChangeLog	16 Jun 2006 15:41:36 -0000	1.7847
+++ ChangeLog	16 Jun 2006 16:10:22 -0000	1.7848
@@ -1,6 +1,21 @@
 2006-06-16  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/FileDialog.java
+	(FileDialog): Added @since tag to API docs.
+	(FileDialog): Likewise.
+	(FileDialog): Likewise.
+	* java/awt/Font.java:
+	Added @since tag to TYPE1_FONT field docs.
+	* javax/swing/plaf/basic/BasicScrollBarUI.java:
+	(isThumbRollover): Likewise.
+	(setThumbRollover): Likewise.
+	(getSupportsAbsolutePositioning): Likewise.
+	* javax/swing/plaf/basic/BasicSliderUI.java:
+	(isDragging): Likewise.
+
+2006-06-16  Lillian Angel  <langel@redhat.com>
+
+	* java/awt/FileDialog.java
 	(FileDialog): Implemented.
 	(FileDialog): Implemented.
 	(FileDialog): Implemented.

Index: java/awt/FileDialog.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/FileDialog.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- java/awt/FileDialog.java	16 Jun 2006 15:41:39 -0000	1.15
+++ java/awt/FileDialog.java	16 Jun 2006 16:10:22 -0000	1.16
@@ -106,6 +106,8 @@
    * parent. This dialog will have no title and will be for loading a file.
    * 
    * @param parent The parent dialog for this.
+   * 
+   * @since 1.5
    */
   public FileDialog(Dialog parent)
   {
@@ -118,6 +120,8 @@
    *
    * @param parent The parent dialog for this.
    * @param title The title for this dialog.
+   * 
+   * @since 1.5
    */
   public FileDialog(Dialog parent, String title)
   {
@@ -134,6 +138,8 @@
    *          <code>SAVE</code>.
    * @throws IllegalArgumentException - if illegal mode, if
    *           GraphicsEnvironment.isHeadless or if parent is null.
+   *           
+   * @since 1.5
    */
   public FileDialog(Dialog parent, String title, int mode)
   {

Index: java/awt/Font.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Font.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- java/awt/Font.java	16 Jun 2006 15:41:40 -0000	1.35
+++ java/awt/Font.java	16 Jun 2006 16:10:22 -0000	1.36
@@ -118,6 +118,8 @@
   /**
    * Indicates to <code>createFont</code> that the supplied font data
    * is in Type1 format.
+   * 
+   * @since 1.5
    */
   public static final int TYPE1_FONT = 1;
 

Index: javax/swing/plaf/basic/BasicScrollBarUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- javax/swing/plaf/basic/BasicScrollBarUI.java	16 Jun 2006 15:14:56 -0000	1.36
+++ javax/swing/plaf/basic/BasicScrollBarUI.java	16 Jun 2006 16:10:22 -0000	1.37
@@ -1411,6 +1411,8 @@
    * Returns true if the mouse is over the thumb.
    * 
    * @return true if the mouse is over the thumb.
+   * 
+   * @since 1.5
    */
   public boolean isThumbRollover()
   {
@@ -1422,6 +1424,8 @@
    * whether or not the mouse is over the thumb.
    * 
    * @param active - true if the mouse is over the thumb.
+   * 
+   * @since 1.5
    */
   protected void setThumbRollover(boolean active)
   {
@@ -1434,6 +1438,8 @@
    * 
    * @return true if the user can position the thumb with a mouse
    * click.
+   * 
+   * @since 1.5
    */
   public boolean getSupportsAbsolutePositioning()
   {

Index: javax/swing/plaf/basic/BasicSliderUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicSliderUI.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- javax/swing/plaf/basic/BasicSliderUI.java	16 Jun 2006 15:14:56 -0000	1.33
+++ javax/swing/plaf/basic/BasicSliderUI.java	16 Jun 2006 16:10:22 -0000	1.34
@@ -613,6 +613,8 @@
    * Returns true if the user is dragging the slider.
    * 
    * @return true if the slider is being dragged.
+   * 
+   * @since 1.5
    */
   protected boolean isDragging()
   {



From MAILER-DAEMON Fri Jun 16 12:16:02 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrGzK-0006T4-Lu
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 12:16:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrGzI-0006Ol-Hp
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:16:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrGzI-0006OB-0n
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:16:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrGzH-0006O2-UA
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:15:59 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrH8w-0008FL-Mu
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:25:58 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrGzH-0003ka-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 12:15:59 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FrGzH-0003kV-En
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:15:59 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrGzH-0003kV-En@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 16:15:59 +0000
Subject: [commit-cp] classpath/vm/reference/sun/reflect/misc
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 16:16:00 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/16 16:15:59

New directory:
	vm/reference/sun/reflect/misc

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/sun/reflect/misc/?cvsroot=classpath



From MAILER-DAEMON Fri Jun 16 12:16:19 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrGzb-0006jr-R5
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 12:16:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrGza-0006ic-2d
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:16:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrGzZ-0006hi-D7
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:16:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrGzZ-0006hI-68
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:16:17 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrH9D-0008Hp-TB
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 12:26:16 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrGzY-0003mX-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 12:16:16 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FrGzY-0003mS-8i
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:16:16 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrGzY-0003mS-8i@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 16:16:16 +0000
Subject: [commit-cp] classpath/vm/reference/sun/reflect Reflection.j...
	[generics-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 16:16:18 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics-branch
Changes by:	Tom Tromey <tromey>	06/06/16 16:16:16

Modified files:
	vm/reference/sun/reflect: Reflection.java 
	.              : ChangeLog 
Added files:
	vm/reference/sun/reflect/misc: ReflectUtil.java 

Log message:
		* vm/reference/sun/reflect/Reflection.java (verifyMemberAccess):
		Removed.
		(getCallerClass): Now static.
		* vm/reference/sun/reflect/misc/ReflectUtil.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/sun/reflect/Reflection.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.269&r2=1.2386.2.270
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/sun/reflect/misc/ReflectUtil.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1

Patches:
Index: Reflection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/vm/reference/sun/reflect/Attic/Reflection.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- Reflection.java	16 Jun 2006 01:44:14 -0000	1.1.2.1
+++ Reflection.java	16 Jun 2006 16:16:13 -0000	1.1.2.2
@@ -39,60 +39,13 @@
 
 import gnu.classpath.VMStackWalker;
 
-import java.lang.reflect.Modifier;
-
 public class Reflection
 {
   /**
    * A stack-walking wrapper method used by the JSR 166 RI. 
    */
-  public Class getCallerClass(int depth)
+  public static Class getCallerClass(int depth)
   {
     return VMStackWalker.getClassContext()[depth];
   }
-  
-  // We use this inaccessible inner class as an argument type
-  // in verifyMemberAccess.  All current users of this method
-  // in the JSR 166 RI pass 'null' for this argument, and
-  // consequently we don't know what it means.  Using a funny
-  // type like this for the argument means that if the RI changes,
-  // we will see a compilation error.
-  private static class MustBeNull
-  {
-  }
-
-  /**
-   * Perform access checks on a member of a class.  This API is
-   * derived from the public domain code in the JSR 166 reference
-   * implementation.
-   * @param caller the class requesting access to the member
-   * @param declarer the declaring class of the member
-   * @param ignored unknown parameter; always null
-   * @param modifiers the modifiers on the member
-   * @return true if access is granted, false otherwise
-   */
-  public static boolean verifyMemberAccess(Class caller,
-                                           Class declarer,
-                                           MustBeNull ignored,
-                                           int modifiers)
-  {
-    // Same class, always ok.
-    if (caller == declarer)
-      return true;
-    // Public access is ok.
-    if ((modifiers & Modifier.PUBLIC) != 0)
-      return true;
-    // Protected access and request comes from
-    // a subclass of the declarer -- ok.
-    if ((modifiers & Modifier.PROTECTED) != 0
-        && declarer.isAssignableFrom(caller))
-      return true;
-    // Package-private access, or protected access,
-    // and the packages are the same --ok.
-    if ((modifiers & Modifier.PRIVATE) == 0
-        && caller.getPackage() == declarer.getPackage())
-      return true;
-    // Otherwise, no.
-    return false;
-  }
 }


Index: misc/ReflectUtil.java
===================================================================
RCS file: misc/ReflectUtil.java
diff -N misc/ReflectUtil.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ misc/ReflectUtil.java	16 Jun 2006 16:16:16 -0000	1.1.2.1
@@ -0,0 +1,93 @@
+/* ReflectUtil.java - JSR 166 reflection hooks
+   Copyright (C) 2006 Free Software Foundation
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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 sun.reflect.misc;
+
+import java.lang.reflect.Modifier;
+
+public class ReflectUtil
+{
+  // We use this inaccessible inner class as an argument type
+  // in verifyMemberAccess.  All current users of this method
+  // in the JSR 166 RI pass 'null' for this argument, and
+  // consequently we don't know what it means.  Using a funny
+  // type like this for the argument means that if the RI changes,
+  // we will see a compilation error.
+  private static class MustBeNull
+  {
+  }
+
+  public static void checkPackageAccess(Class declaringClass)
+  {
+    // FIXME: not sure what to check here.
+  }
+
+  /**
+   * Perform access checks on a member of a class.  This API is
+   * derived from the public domain code in the JSR 166 reference
+   * implementation.
+   * @param caller the class requesting access to the member
+   * @param declarer the declaring class of the member
+   * @param ignored unknown parameter; always null
+   * @param modifiers the modifiers on the member
+   * @return true if access is granted, false otherwise
+   */
+  public static void ensureMemberAccess(Class caller,
+                                        Class declarer,
+                                        MustBeNull ignored,
+                                        int modifiers)
+  {
+    // Same class, always ok.
+    if (caller == declarer)
+      return;
+    // Public access is ok.
+    if ((modifiers & Modifier.PUBLIC) != 0)
+      return;
+    // Protected access and request comes from
+    // a subclass of the declarer -- ok.
+    if ((modifiers & Modifier.PROTECTED) != 0
+        && declarer.isAssignableFrom(caller))
+      return;
+    // Package-private access, or protected access,
+    // and the packages are the same --ok.
+    if ((modifiers & Modifier.PRIVATE) == 0
+        && caller.getPackage() == declarer.getPackage())
+      return;
+    // Otherwise, no.
+    throw new IllegalAccessError();
+  }
+}



From MAILER-DAEMON Fri Jun 16 13:38:58 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrIHa-000304-QV
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 13:38:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrIHZ-0002zn-MC
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 13:38:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrIHX-0002zF-BJ
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 13:38:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrIHX-0002zC-5U
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 13:38:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrIRC-0006fK-Lg
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 13:48:54 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrIHW-0003cl-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 13:38:54 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FrIHW-0003ch-Cd
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 17:38:54 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrIHW-0003ch-Cd@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 17:38:54 +0000
Subject: [commit-cp] classpath/java/util/concurrent
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 17:38:57 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/16 17:38:54

New directory:
	java/util/concurrent

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/concurrent/?cvsroot=classpath



From MAILER-DAEMON Fri Jun 16 13:39:23 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrIHz-00032W-DT
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 13:39:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrIHy-00032Q-AD
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 13:39:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrIHu-00032D-5A
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 13:39:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrIHt-00032A-VL
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 13:39:18 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrIRZ-0006i5-4w
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 13:49:17 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrIHt-0003fM-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 13:39:17 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FrIHr-0003fC-U0
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 17:39:17 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrIHr-0003fC-U0@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 17:39:15 +0000
Subject: [commit-cp] classpath external/jsr166/java/util/concurrentS...
	[generics-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 17:39:22 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics-branch
Changes by:	Tom Tromey <tromey>	06/06/16 17:39:14

Modified files:
	external/jsr166/java/util/concurrent: 
	                                      ScheduledThreadPoolExecutor.java 
	external/jsr166/java/util: ArrayDeque.java 
	.              : .classpath ChangeLog 
Added files:
	java/util/concurrent: CopyOnWriteArrayList.java 
Removed files:
	java/util      : Queue.java AbstractQueue.java 

Log message:
		Imported JSR 166 reference implementation:
		* .classpath: Added external/jsr166.
		* java/util/concurrent/CopyOnWriteArrayList.java: New file.
		* java/util/AbstractQueue.java: Removed.
		* java/util/Queue.java: Removed.
		* external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java
		(runPeriodic): Added explicit cast.
		* external/jsr166/java/util/ArrayDeque.java (clone): Use
		elements.clone.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.1.1&r2=1.1.1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/Queue.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/AbstractQueue.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.4&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/external/jsr166/java/util/ArrayDeque.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.1.1&r2=1.1.1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/.classpath?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.270&r2=1.2386.2.271
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/concurrent/CopyOnWriteArrayList.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1

Patches:
Index: external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -b -r1.1.1.1 -r1.1.1.1.2.1
--- external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java	16 Jun 2006 16:38:17 -0000	1.1.1.1
+++ external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java	16 Jun 2006 17:39:11 -0000	1.1.1.1.2.1
@@ -188,7 +188,10 @@
                     time += p;
                 else
                     time = now() - p;
-                ScheduledThreadPoolExecutor.super.getQueue().add(this);
+                // Classpath local: ecj from eclipse 3.1 does not
+                // compile this.
+                // ScheduledThreadPoolExecutor.super.getQueue().add(this);
+                ScheduledThreadPoolExecutor.super.getQueue().add((Runnable) this);
             }
             // This might have been the final executed delayed
             // task.  Wake up threads to check.

Index: external/jsr166/java/util/ArrayDeque.java
===================================================================
RCS file: /cvsroot/classpath/classpath/external/jsr166/java/util/ArrayDeque.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -b -r1.1.1.1 -r1.1.1.1.2.1
--- external/jsr166/java/util/ArrayDeque.java	16 Jun 2006 16:38:17 -0000	1.1.1.1
+++ external/jsr166/java/util/ArrayDeque.java	16 Jun 2006 17:39:11 -0000	1.1.1.1.2.1
@@ -785,7 +785,9 @@
     public ArrayDeque<E> clone() {
         try {
             ArrayDeque<E> result = (ArrayDeque<E>) super.clone();
-            result.elements = Arrays.copyOf(elements, elements.length);
+            // Classpath local: we don't have Arrays.copyOf yet.
+            // result.elements = Arrays.copyOf(elements, elements.length);
+            result.elements = elements.clone();
             return result;
 
         } catch (CloneNotSupportedException e) {

Index: .classpath
===================================================================
RCS file: /cvsroot/classpath/classpath/.classpath,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- .classpath	26 Mar 2006 20:08:09 -0000	1.1.2.6
+++ .classpath	16 Jun 2006 17:39:11 -0000	1.1.2.7
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding=".externalToolBuilders/|.settings/|ChangeLog*|Makefile*|autom4te.cache/|compat/|config*|doc/|examples/|external/|external/relaxngDatatype/|include/|install/|lib/|m4/|native/|resource/|scripts/|test/|testsuite/|tools/|vm/reference/" kind="src" path=""/>
+	<classpathentry excluding=".externalToolBuilders/|.settings/|ChangeLog*|Makefile*|autom4te.cache/|compat/|config*|doc/|examples/|external/|external/relaxngDatatype/|include/|install/|jessie-tests/|lib/|m4/|native/|resource/|scripts/|test/|testsuite/|tools/|vm/reference/" kind="src" path=""/>
 	<classpathentry excluding=".cvsignore|Makefile|Makefile.am|Makefile.in|README.txt" kind="src" path="external/relaxngDatatype"/>
+	<classpathentry kind="src" path="external/jsr166"/>
 	<classpathentry excluding=".cvsignore|Makefile|Makefile.am|Makefile.in|README" kind="src" path="tools"/>
 	<classpathentry excluding=".cvsignore|Makefile|Makefile.am|Makefile.in" kind="src" path="resource"/>
 	<classpathentry excluding=".cvsignore|Makefile.am" kind="src" path="vm/reference"/>

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.270
retrieving revision 1.2386.2.271
diff -u -b -r1.2386.2.270 -r1.2386.2.271
--- ChangeLog	16 Jun 2006 16:16:13 -0000	1.2386.2.270
+++ ChangeLog	16 Jun 2006 17:39:11 -0000	1.2386.2.271
@@ -1,5 +1,17 @@
 2006-06-16  Tom Tromey  <tromey@redhat.com>
 
+	Imported JSR 166 reference implementation:
+	* .classpath: Added external/jsr166.
+	* java/util/concurrent/CopyOnWriteArrayList.java: New file.
+	* java/util/AbstractQueue.java: Removed.
+	* java/util/Queue.java: Removed.
+	* external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java
+	(runPeriodic): Added explicit cast.
+	* external/jsr166/java/util/ArrayDeque.java (clone): Use
+	elements.clone.
+
+2006-06-16  Tom Tromey  <tromey@redhat.com>
+
 	* vm/reference/sun/reflect/Reflection.java (verifyMemberAccess):
 	Removed.
 	(getCallerClass): Now static.

Index: java/util/concurrent/CopyOnWriteArrayList.java
===================================================================
RCS file: java/util/concurrent/CopyOnWriteArrayList.java
diff -N java/util/concurrent/CopyOnWriteArrayList.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/concurrent/CopyOnWriteArrayList.java	16 Jun 2006 17:39:13 -0000	1.1.2.1
@@ -0,0 +1,438 @@
+/* CopyOnWriteArrayList.java
+   Copyright (C) 2006 Free Software Foundation
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.util.concurrent;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Array;
+import java.util.AbstractList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.RandomAccess;
+
+/** @since 1.5 */
+public class CopyOnWriteArrayList<E> extends AbstractList<E> implements
+    List<E>, RandomAccess, Cloneable, Serializable
+{
+  /**
+   * Where the data is stored.
+   */
+  private transient E[] data;
+
+  /**
+   * Construct a new ArrayList with the default capacity (16).
+   */
+  public CopyOnWriteArrayList()
+  {
+    data = (E[]) new Object[0];
+  }
+
+  /**
+   * Construct a new ArrayList, and initialize it with the elements in the
+   * supplied Collection. The initial capacity is 110% of the Collection's size.
+   * 
+   * @param c
+   *          the collection whose elements will initialize this list
+   * @throws NullPointerException
+   *           if c is null
+   */
+  public CopyOnWriteArrayList(Collection< ? extends E> c)
+  {
+    // FIXME ... correct?  use c.toArray()
+    data = (E[]) new Object[c.size()];
+    int index = 0;
+    for (E value : c)
+      data[index++] = value;
+  }
+
+  /**
+   * Returns the number of elements in this list.
+   * 
+   * @return the list size
+   */
+  public int size()
+  {
+    return data.length;
+  }
+
+  /**
+   * Checks if the list is empty.
+   * 
+   * @return true if there are no elements
+   */
+  public boolean isEmpty()
+  {
+    return data.length == 0;
+  }
+
+  /**
+   * Returns true iff element is in this ArrayList.
+   * 
+   * @param e
+   *          the element whose inclusion in the List is being tested
+   * @return true if the list contains e
+   */
+  public boolean contains(Object e)
+  {
+    return indexOf(e) != -1;
+  }
+
+  /**
+   * Returns the lowest index at which element appears in this List, or -1 if it
+   * does not appear.
+   * 
+   * @param e
+   *          the element whose inclusion in the List is being tested
+   * @return the index where e was found
+   */
+  public int indexOf(Object e)
+  {
+    E[] data = this.data;
+    for (int i = 0; i < data.length; i++)
+      if (equals(e, data[i]))
+        return i;
+    return -1;
+  }
+
+  /**
+   * Returns the highest index at which element appears in this List, or -1 if
+   * it does not appear.
+   * 
+   * @param e
+   *          the element whose inclusion in the List is being tested
+   * @return the index where e was found
+   */
+  public int lastIndexOf(Object e)
+  {
+    E[] data = this.data;
+    for (int i = data.length - 1; i >= 0; i--)
+      if (equals(e, data[i]))
+        return i;
+    return -1;
+  }
+
+  /**
+   * Creates a shallow copy of this ArrayList (elements are not cloned).
+   * 
+   * @return the cloned object
+   */
+  public Object clone()
+  {
+    CopyOnWriteArrayList<E> clone = null;
+    try
+      {
+        clone = (CopyOnWriteArrayList<E>) super.clone();
+        clone.data = (E[]) data.clone();
+      }
+    catch (CloneNotSupportedException e)
+      {
+        // Impossible to get here.
+      }
+    return clone;
+  }
+
+  /**
+   * Returns an Object array containing all of the elements in this ArrayList.
+   * The array is independent of this list.
+   * 
+   * @return an array representation of this list
+   */
+  public Object[] toArray()
+  {
+    E[] data = this.data;
+    E[] array = (E[]) new Object[data.length];
+    System.arraycopy(data, 0, array, 0, data.length);
+    return array;
+  }
+
+  /**
+   * Returns an Array whose component type is the runtime component type of the
+   * passed-in Array. The returned Array is populated with all of the elements
+   * in this ArrayList. If the passed-in Array is not large enough to store all
+   * of the elements in this List, a new Array will be created and returned; if
+   * the passed-in Array is <i>larger</i> than the size of this List, then
+   * size() index will be set to null.
+   * 
+   * @param a
+   *          the passed-in Array
+   * @return an array representation of this list
+   * @throws ArrayStoreException
+   *           if the runtime type of a does not allow an element in this list
+   * @throws NullPointerException
+   *           if a is null
+   */
+  public <T> T[] toArray(T[] a)
+  {
+    E[] data = this.data;
+    if (a.length < data.length)
+      a = (T[]) Array.newInstance(a.getClass().getComponentType(), data.length);
+    else if (a.length > data.length)
+      a[data.length] = null;
+    System.arraycopy(data, 0, a, 0, data.length);
+    return a;
+  }
+
+  /**
+   * Retrieves the element at the user-supplied index.
+   * 
+   * @param index
+   *          the index of the element we are fetching
+   * @throws IndexOutOfBoundsException
+   *           if index &lt; 0 || index &gt;= size()
+   */
+  public E get(int index)
+  {
+    return data[index];
+  }
+
+  /**
+   * Sets the element at the specified index. The new element, e, can be an
+   * object of any type or null.
+   * 
+   * @param index
+   *          the index at which the element is being set
+   * @param e
+   *          the element to be set
+   * @return the element previously at the specified index
+   * @throws IndexOutOfBoundsException
+   *           if index &lt; 0 || index &gt;= 0
+   */
+  public synchronized E set(int index, E e)
+  {
+    E result = data[index];
+    E[] newData = data.clone();
+    newData[index] = e;
+    data = newData;
+    return result;
+  }
+
+  /**
+   * Appends the supplied element to the end of this list. The element, e, can
+   * be an object of any type or null.
+   * 
+   * @param e
+   *          the element to be appended to this list
+   * @return true, the add will always succeed
+   */
+  public synchronized boolean add(E e)
+  {
+    E[] data = this.data;
+    E[] newData = (E[]) new Object[data.length];
+    System.arraycopy(data, 0, newData, 0, data.length);
+    newData[data.length] = e;
+    this.data = newData;
+    return true;
+  }
+
+  /**
+   * Adds the supplied element at the specified index, shifting all elements
+   * currently at that index or higher one to the right. The element, e, can be
+   * an object of any type or null.
+   * 
+   * @param index
+   *          the index at which the element is being added
+   * @param e
+   *          the item being added
+   * @throws IndexOutOfBoundsException
+   *           if index &lt; 0 || index &gt; size()
+   */
+  public synchronized void add(int index, E e)
+  {
+    E[] data = this.data;
+    E[] newData = (E[]) new Object[data.length];
+    System.arraycopy(data, 0, newData, 0, index);
+    newData[index] = e;
+    System.arraycopy(data, index, newData, index + 1, data.length - index);
+    this.data = newData;
+  }
+
+  /**
+   * Removes the element at the user-supplied index.
+   * 
+   * @param index
+   *          the index of the element to be removed
+   * @return the removed Object
+   * @throws IndexOutOfBoundsException
+   *           if index &lt; 0 || index &gt;= size()
+   */
+  public synchronized E remove(int index)
+  {
+    E[] data = this.data;
+    E[] newData = (E[]) new Object[data.length - 1];
+    System.arraycopy(data, 0, newData, 0, index - 1);
+    System.arraycopy(data, index + 1, newData, index,
+                     data.length - index - 1);
+    E r = data[index];
+    this.data = newData;
+    return r;
+  }
+
+  /**
+   * Removes all elements from this List
+   */
+  public synchronized void clear()
+  {
+    data = (E[]) new Object[0];
+  }
+
+  /**
+   * Add each element in the supplied Collection to this List. It is undefined
+   * what happens if you modify the list while this is taking place; for
+   * example, if the collection contains this list. c can contain objects of any
+   * type, as well as null values.
+   * 
+   * @param c
+   *          a Collection containing elements to be added to this List
+   * @return true if the list was modified, in other words c is not empty
+   * @throws NullPointerException
+   *           if c is null
+   */
+  public synchronized boolean addAll(Collection< ? extends E> c)
+  {
+    return addAll(data.length, c);
+  }
+
+  /**
+   * Add all elements in the supplied collection, inserting them beginning at
+   * the specified index. c can contain objects of any type, as well as null
+   * values.
+   * 
+   * @param index
+   *          the index at which the elements will be inserted
+   * @param c
+   *          the Collection containing the elements to be inserted
+   * @throws IndexOutOfBoundsException
+   *           if index &lt; 0 || index &gt; 0
+   * @throws NullPointerException
+   *           if c is null
+   */
+  public synchronized boolean addAll(int index, Collection< ? extends E> c)
+  {
+    E[] data = this.data;
+    Iterator<? extends E> itr = c.iterator();
+    int csize = c.size();
+    if (csize == 0)
+      return false;
+
+    E[] newData = (E[]) new Object[data.length + csize];
+    System.arraycopy(data, 0, newData, 0, data.length);
+    int end = data.length;
+    for (E value : c)
+      newData[end++] = value;
+    this.data = newData;
+    return true;
+  }
+  
+  public synchronized boolean addIfAbsent(E val)
+  {
+    if (contains(val))
+      return false;
+    add(val);
+    return true;
+  }
+
+  public synchronized int addAllAbsent(Collection<? extends E> c)
+  {
+    int result = 0;
+    for (E val : c)
+      {
+        if (addIfAbsent(val))
+          ++result;
+      }
+    return result;
+  }
+
+  /**
+   * Serializes this object to the given stream.
+   * 
+   * @param s
+   *          the stream to write to
+   * @throws IOException
+   *           if the underlying stream fails
+   * @serialData the size field (int), the length of the backing array (int),
+   *             followed by its elements (Objects) in proper order.
+   */
+  private void writeObject(ObjectOutputStream s) throws IOException
+  {
+    // The 'size' field.
+    s.defaultWriteObject();
+    // We serialize unused list entries to preserve capacity.
+    int len = data.length;
+    s.writeInt(len);
+    // it would be more efficient to just write "size" items,
+    // this need readObject read "size" items too.
+    for (int i = 0; i < data.length; i++)
+      s.writeObject(data[i]);
+  }
+
+  /**
+   * Deserializes this object from the given stream.
+   * 
+   * @param s
+   *          the stream to read from
+   * @throws ClassNotFoundException
+   *           if the underlying stream fails
+   * @throws IOException
+   *           if the underlying stream fails
+   * @serialData the size field (int), the length of the backing array (int),
+   *             followed by its elements (Objects) in proper order.
+   */
+  private void readObject(ObjectInputStream s) throws IOException,
+      ClassNotFoundException
+  {
+    // the `size' field.
+    s.defaultReadObject();
+    int capacity = s.readInt();
+    data = (E[]) new Object[capacity];
+    for (int i = 0; i < capacity; i++)
+      data[i] = (E) s.readObject();
+  }
+
+  static final boolean equals(Object o1, Object o2)
+  {
+    return o1 == null ? o2 == null : o1.equals(o2);
+  }
+  
+  Object[] getArray()
+  {
+    return data;
+  }
+}

Index: java/util/Queue.java
===================================================================
RCS file: java/util/Queue.java
diff -N java/util/Queue.java
--- java/util/Queue.java	21 Sep 2005 21:32:40 -0000	1.1.2.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@
-/* Queue.java -- Interface that represents a queue
-   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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.util;
-
-/**
- * @since 1.5
- */
-public interface Queue<T> extends Collection<T>
-{
-  T element();
-  boolean offer(T value);
-  T peek();
-  T poll();
-  T remove();
-}

Index: java/util/AbstractQueue.java
===================================================================
RCS file: java/util/AbstractQueue.java
diff -N java/util/AbstractQueue.java
--- java/util/AbstractQueue.java	21 Sep 2005 21:32:39 -0000	1.1.2.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,94 +0,0 @@
-/* AbstractQueue.java -- Implementation of some Queue methods
-   Copyright (C) 2004, 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.util;
-
-/**
- * @author Tom Tromey (tromey@redhat.com)
- * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5
- */
-public abstract class AbstractQueue<E> extends AbstractCollection<E> 
-  implements Queue<E>
-{
-  protected AbstractQueue()
-  {
-  }
-
-  public boolean add(E value)
-  {
-    if (offer(value))
-      return true;
-    throw new IllegalStateException();
-  }
-
-  public boolean addAll(Collection<? extends E> c)
-  {
-    if (c == this)
-      throw new IllegalArgumentException();
-    boolean result = false;
-    for (E val : c)
-      {
-	if (add(val))
-	  result = true;
-      }
-    return result;
-  }
-
-  public void clear()
-  {
-    while (poll() != null)
-      ;
-  }
-
-  public E element()
-  {
-    E result = peek();
-    if (result == null)
-      throw new NoSuchElementException();
-    return result;
-  }
-
-  public E remove()
-  {
-    E result = poll();
-    if (result == null)
-      throw new NoSuchElementException();
-    return result;
-  }
-}



From MAILER-DAEMON Fri Jun 16 14:04:17 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrIg5-00070k-8b
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 14:04:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrIg2-00070S-Ru
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:04:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrIg1-00070G-1c
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:04:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrIg0-00070D-Sb
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:04:12 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrIpg-0000HF-EQ
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:14:12 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrIg0-0005NA-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 14:04:12 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FrIfz-0005N1-Jw
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 18:04:12 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrIfz-0005N1-Jw@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 18:04:11 +0000
Subject: [commit-cp] classpath ChangeLog configure.ac external/Makef...
	[generics-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 18:04:15 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics-branch
Changes by:	Tom Tromey <tromey>	06/06/16 18:04:09

Modified files:
	.              : ChangeLog configure.ac 
	external       : Makefile.am 
	lib            : Makefile.am gen-classlist.sh.in 
Added files:
	external/jsr166: Makefile.am 

Log message:
		* lib/Makefile.am (compile_classpath): Added jsr166.
		* configure.ac: Added external/jsr166/Makefile.
		* external/Makefile.am (SUBDIRS): Added jsr166.
		* external/jsr166/Makefile.am: New file.
		* lib/gen-classlist.sh.in: Look in external/jsr166.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.271&r2=1.2386.2.272
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&only_with_tag=generics-branch&r1=1.43.2.36&r2=1.43.2.37
http://cvs.savannah.gnu.org/viewcvs/classpath/external/Makefile.am?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/external/jsr166/Makefile.am?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/Makefile.am?cvsroot=classpath&only_with_tag=generics-branch&r1=1.63.2.25&r2=1.63.2.26
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/gen-classlist.sh.in?cvsroot=classpath&only_with_tag=generics-branch&r1=1.12.2.14&r2=1.12.2.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.271
retrieving revision 1.2386.2.272
diff -u -b -r1.2386.2.271 -r1.2386.2.272
--- ChangeLog	16 Jun 2006 17:39:11 -0000	1.2386.2.271
+++ ChangeLog	16 Jun 2006 18:04:06 -0000	1.2386.2.272
@@ -1,5 +1,13 @@
 2006-06-16  Tom Tromey  <tromey@redhat.com>
 
+	* lib/Makefile.am (compile_classpath): Added jsr166.
+	* configure.ac: Added external/jsr166/Makefile.
+	* external/Makefile.am (SUBDIRS): Added jsr166.
+	* external/jsr166/Makefile.am: New file.
+	* lib/gen-classlist.sh.in: Look in external/jsr166.
+
+2006-06-16  Tom Tromey  <tromey@redhat.com>
+
 	Imported JSR 166 reference implementation:
 	* .classpath: Added external/jsr166.
 	* java/util/concurrent/CopyOnWriteArrayList.java: New file.

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.43.2.36
retrieving revision 1.43.2.37
diff -u -b -r1.43.2.36 -r1.43.2.37
--- configure.ac	11 Jun 2006 18:23:17 -0000	1.43.2.36
+++ configure.ac	16 Jun 2006 18:04:09 -0000	1.43.2.37
@@ -706,6 +706,7 @@
 external/sax/Makefile
 external/w3c_dom/Makefile
 external/relaxngDatatype/Makefile
+external/jsr166/Makefile
 gnu/classpath/Configuration.java
 include/Makefile
 native/Makefile

Index: external/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/external/Makefile.am,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- external/Makefile.am	2 Mar 2006 09:33:44 -0000	1.2.2.3
+++ external/Makefile.am	16 Jun 2006 18:04:09 -0000	1.2.2.4
@@ -1,5 +1,5 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-SUBDIRS = sax w3c_dom relaxngDatatype
+SUBDIRS = sax w3c_dom relaxngDatatype jsr166
 
 EXTRA_DIST = README

Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.63.2.25
retrieving revision 1.63.2.26
diff -u -b -r1.63.2.25 -r1.63.2.26
--- lib/Makefile.am	11 Jun 2006 18:23:28 -0000	1.63.2.25
+++ lib/Makefile.am	16 Jun 2006 18:04:09 -0000	1.63.2.26
@@ -10,7 +10,7 @@
 metafiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -type f -print)
 iconfiles :=  $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print)
 
-compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:.:$(USER_CLASSLIB)
+compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(USER_CLASSLIB)
 
 # handling source to bytecode compiler programs like gcj, jikes  and kjc
 if FOUND_ECJ

Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.12.2.14
retrieving revision 1.12.2.15
diff -u -b -r1.12.2.14 -r1.12.2.15
--- lib/gen-classlist.sh.in	11 Jun 2006 18:23:28 -0000	1.12.2.14
+++ lib/gen-classlist.sh.in	16 Jun 2006 18:04:09 -0000	1.12.2.15
@@ -26,8 +26,12 @@
 
 # The same, but for the external code.
 # Right now all external code is in org/.
-for dir in @top_srcdir@/external/w3c_dom \
-   @top_srcdir@/external/sax @top_srcdir@/external/relaxngDatatype; do
+for dir in \
+   @top_srcdir@/external/w3c_dom \
+   @top_srcdir@/external/sax \
+   @top_srcdir@/external/relaxngDatatype \
+   @top_srcdir@/external/jsr166 \
+   ; do
   (cd $dir
   @FIND@ org -follow -name '*.java' -print |
   sort -r | sed -e 's,/\([^/]*\)$, \1,' |

Index: external/jsr166/Makefile.am
===================================================================
RCS file: external/jsr166/Makefile.am
diff -N external/jsr166/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ external/jsr166/Makefile.am	16 Jun 2006 18:04:09 -0000	1.1.2.1
@@ -0,0 +1,74 @@
+## Input file for automake to generate the Makefile.in used by configure
+
+EXTRA_DIST = IMPORTING \
+readme \
+java/util/AbstractQueue.java \
+java/util/concurrent/ScheduledThreadPoolExecutor.java \
+java/util/concurrent/ExecutorCompletionService.java \
+java/util/concurrent/LinkedBlockingQueue.java \
+java/util/concurrent/BlockingDeque.java	\
+java/util/concurrent/Delayed.java \
+java/util/concurrent/ThreadFactory.java	\
+java/util/concurrent/ArrayBlockingQueue.java \
+java/util/concurrent/RunnableFuture.java \
+java/util/concurrent/LinkedBlockingDeque.java \
+java/util/concurrent/CopyOnWriteArraySet.java \
+java/util/concurrent/DelayQueue.java \
+java/util/concurrent/SynchronousQueue.java \
+java/util/concurrent/Executor.java \
+java/util/concurrent/ExecutionException.java \
+java/util/concurrent/Semaphore.java \
+java/util/concurrent/BrokenBarrierException.java \
+java/util/concurrent/CompletionService.java \
+java/util/concurrent/CyclicBarrier.java	\
+java/util/concurrent/AbstractExecutorService.java \
+java/util/concurrent/TimeoutException.java \
+java/util/concurrent/ConcurrentMap.java	\
+java/util/concurrent/PriorityBlockingQueue.java	\
+java/util/concurrent/CancellationException.java	\
+java/util/concurrent/ConcurrentSkipListSet.java	\
+java/util/concurrent/ConcurrentLinkedQueue.java	\
+java/util/concurrent/RejectedExecutionHandler.java \
+java/util/concurrent/TimeUnit.java \
+java/util/concurrent/RejectedExecutionException.java \
+java/util/concurrent/ExecutorService.java \
+java/util/concurrent/ConcurrentHashMap.java \
+java/util/concurrent/ScheduledExecutorService.java \
+java/util/concurrent/ThreadPoolExecutor.java \
+java/util/concurrent/BlockingQueue.java	\
+java/util/concurrent/ConcurrentSkipListMap.java	\
+java/util/concurrent/ConcurrentNavigableMap.java \
+java/util/concurrent/Future.java \
+java/util/concurrent/FutureTask.java \
+java/util/concurrent/CountDownLatch.java \
+java/util/concurrent/RunnableScheduledFuture.java \
+java/util/concurrent/Callable.java \
+java/util/concurrent/locks/ReentrantLock.java \
+java/util/concurrent/locks/Lock.java \
+java/util/concurrent/locks/Condition.java \
+java/util/concurrent/locks/AbstractQueuedSynchronizer.java \
+java/util/concurrent/locks/AbstractOwnableSynchronizer.java \
+java/util/concurrent/locks/LockSupport.java \
+java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java \
+java/util/concurrent/locks/ReadWriteLock.java \
+java/util/concurrent/locks/ReentrantReadWriteLock.java \
+java/util/concurrent/Executors.java \
+java/util/concurrent/atomic/AtomicLongFieldUpdater.java	\
+java/util/concurrent/atomic/AtomicLongArray.java \
+java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java \
+java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java \
+java/util/concurrent/atomic/AtomicBoolean.java \
+java/util/concurrent/atomic/AtomicReferenceArray.java \
+java/util/concurrent/atomic/AtomicStampedReference.java	\
+java/util/concurrent/atomic/AtomicIntegerArray.java \
+java/util/concurrent/atomic/AtomicMarkableReference.java \
+java/util/concurrent/atomic/AtomicReference.java \
+java/util/concurrent/atomic/AtomicInteger.java \
+java/util/concurrent/atomic/AtomicLong.java \
+java/util/concurrent/ScheduledFuture.java \
+java/util/concurrent/Exchanger.java \
+java/util/Deque.java \
+java/util/NavigableMap.java \
+java/util/Queue.java \
+java/util/NavigableSet.java \
+java/util/ArrayDeque.java



From MAILER-DAEMON Fri Jun 16 14:07:53 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrIjY-0007Pt-Ew
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 14:07:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrIjV-0007Oh-JF
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:07:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrIjV-0007OH-1G
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:07:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrIjU-0007OB-QK
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:07:48 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrItA-0000UQ-HZ
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:17:48 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrIjU-0005bM-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 14:07:48 -0400
Received: from glavaux by savannah.gnu.org with local (Exim 4.50)
	id 1FrIjU-0005bG-3r
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 18:07:48 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrIjU-0005bG-3r@savannah.gnu.org>
From: Guilhem Lavaux <guilhem@kaffe.org>
Date: Fri, 16 Jun 2006 18:07:48 +0000
Subject: [commit-cp] classpath ChangeLog.native native/jni/java-net/...
	[NATIVE-LAYER]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 18:07:50 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		NATIVE-LAYER
Changes by:	Guilhem Lavaux <glavaux>	06/06/16 18:07:47

Modified files:
	.              : ChangeLog.native 
	native/jni/java-net: java_net_VMInetAddress.c javanet.c 
	native/jni/native-lib: cpio.c cpnet.c cpnet.h 

Log message:
	2006-06-16  Guilhem Lavaux  <guilhem@kaffe.org>
	
	        * native/jni/java-net/java_net_VMInetAddress.c
	        (Java_java_net_VMInetAddress_getHostByName): Fix detection of
	        error.
	
	        * native/jni/java-net/javanet.c
	        (_javanet_accept): Fixed bogus call to TARGET.
	        (_javanet_create_inetaddress): Fixed address generation. Fixed
	        bogus memory free.
	        (_javanet_bind): set "Reuse address" flag.
	
	        * native/jni/native-lib/cpio.c
	        (cpio_getModificationTime): Fixed type.
	        (cpio_removeFile): Use rmdir too.
	
	        * native/jni/native-lib/cpnet.c
	        (cpnet_getHostByName): Fixed error detection.
	
	        * native/jni/native-lib/cpnet.h
	        (cpnet_newIPV4address, cpnet_newIPV6address): Put zero in the
	        memory.
	        (cpnet_IPV4AddressToBytes): Fixed types.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog.native?cvsroot=classpath&only_with_tag=NATIVE-LAYER&r1=1.1.2.12&r2=1.1.2.13
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/java-net/java_net_VMInetAddress.c?cvsroot=classpath&only_with_tag=NATIVE-LAYER&r1=1.7.2.2&r2=1.7.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/java-net/javanet.c?cvsroot=classpath&only_with_tag=NATIVE-LAYER&r1=1.32.2.9&r2=1.32.2.10
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/native-lib/cpio.c?cvsroot=classpath&only_with_tag=NATIVE-LAYER&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/native-lib/cpnet.c?cvsroot=classpath&only_with_tag=NATIVE-LAYER&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/native-lib/cpnet.h?cvsroot=classpath&only_with_tag=NATIVE-LAYER&r1=1.1.2.6&r2=1.1.2.7

Patches:








From MAILER-DAEMON Fri Jun 16 14:07:54 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrIja-0007R0-2P
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 14:07:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrIjW-0007PA-RP
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:07:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrIjU-0007O5-Ng
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:07:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrIjU-0007O0-Kh
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:07:48 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrItA-0000UP-DM
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:17:48 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrIjU-0005bB-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 14:07:48 -0400
Received: from glavaux by savannah.gnu.org with local (Exim 4.50)
	id 1FrIjT-0005b6-Q0
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 18:07:48 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrIjT-0005b6-Q0@savannah.gnu.org>
From: Guilhem Lavaux <guilhem@kaffe.org>
Date: Fri, 16 Jun 2006 18:07:47 +0000
Subject: [commit-cp] classpath ChangeLog [NATIVE-LAYER]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 18:07:51 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		NATIVE-LAYER
Changes by:	Guilhem Lavaux <glavaux>	06/06/16 18:07:47

Modified files:
	.              : ChangeLog 

Log message:
	2006-06-09  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/javax/crypto/pad/BasePad.java (selfTest): Re-factored to allow more
		flexible self-test by sub-classes.
		(test1BlockSize): New method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7731&r2=1.7732

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7731
retrieving revision 1.7732
diff -u -b -r1.7731 -r1.7732
--- ChangeLog	9 Jun 2006 11:28:47 -0000	1.7731
+++ ChangeLog	9 Jun 2006 11:30:41 -0000	1.7732
@@ -2,6 +2,7 @@
 
 	* gnu/javax/crypto/pad/BasePad.java (selfTest): Re-factored to allow more
 	flexible self-test by sub-classes.
+	(test1BlockSize): New method.
 
 2006-06-09  David Gilbert  <david.gilbert@object-refinery.com>
 



From MAILER-DAEMON Fri Jun 16 14:16:38 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrIs2-0005TF-Pp
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 14:16:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrIs0-0005SZ-A8
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:16:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrIrz-0005SE-Dj
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:16:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrIrz-0005SB-7R
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:16:35 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrJ1f-0001UQ-5r
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:26:35 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrIry-0006LB-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 14:16:34 -0400
Received: from kgallowa by savannah.gnu.org with local (Exim 4.50)
	id 1FrIrx-0006L6-M3
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 18:16:34 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrIrx-0006L6-M3@savannah.gnu.org>
From: Kyle Galloway <kgallowa@redhat.com>
Date: Fri, 16 Jun 2006 18:16:33 +0000
Subject: [commit-cp] classpath/gnu/classpath/jdwp/event MethodExitEv...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 18:16:36 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Kyle Galloway <kgallowa>	06/06/16 18:16:33

Modified files:
	gnu/classpath/jdwp/event: MethodExitEvent.java 
	                          MethodEntryEvent.java 
	                          ExceptionEvent.java 
	                          SingleStepEvent.java 
	.              : ChangeLog 

Log message:
	2006-06-16  Kyle Galloway  <kgallowa@redhat.com>
	
	    * gnu/classpath/jdwp/event/ExceptionEvent:
	    Added Object instance to javadoc in constructor
	    * gnu/classpath/jdwp/event/MethodEntryEvent:
	    Ditto.
	    * gnu/classpath/jdwp/event/MethodExitEvent:
	    Ditto,
	    * gnu/classpath/jdwp/event/SingleStepEvent:
	    Ditto. 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/MethodExitEvent.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/MethodEntryEvent.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/ExceptionEvent.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/SingleStepEvent.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7849&r2=1.7850

Patches:




Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7849
retrieving revision 1.7850
diff -u -b -r1.7849 -r1.7850
--- ChangeLog	16 Jun 2006 18:12:22 -0000	1.7849
+++ ChangeLog	16 Jun 2006 18:16:33 -0000	1.7850
@@ -1,3 +1,14 @@
+2006-06-16  Kyle Galloway  <kgallowa@redhat.com>
+
+	* gnu/classpath/jdwp/event/ExceptionEvent:
+	Added Object instance to javadoc in constructor
+	* gnu/classpath/jdwp/event/MethodEntryEvent:
+	Ditto.
+	* gnu/classpath/jdwp/event/MethodExitEvent:
+	Ditto,
+	* gnu/classpath/jdwp/event/SingleStepEvent:
+	Ditto. 
+
 2006-06-16  Tom Tromey  <tromey@redhat.com>
 
 	* external/jsr166: Removed files from cvs trunk.



From MAILER-DAEMON Fri Jun 16 14:19:37 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrIuv-0006hf-E0
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 14:19:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrIuu-0006gx-2s
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:19:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrIus-0006g8-Q8
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:19:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrIus-0006fv-GH
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:19:34 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrJ4Y-00027f-FH
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:29:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrIus-0006XO-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 14:19:34 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FrIur-0006XI-FP
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 18:19:33 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrIur-0006XI-FP@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 18:19:33 +0000
Subject: [commit-cp] classpath ChangeLog NEWS [generics-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 18:19:36 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics-branch
Changes by:	Tom Tromey <tromey>	06/06/16 18:19:31

Modified files:
	.              : ChangeLog NEWS 

Log message:
		* NEWS: Updated for JSR 166.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.272&r2=1.2386.2.273
http://cvs.savannah.gnu.org/viewcvs/classpath/NEWS?cvsroot=classpath&only_with_tag=generics-branch&r1=1.47.2.28&r2=1.47.2.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.272
retrieving revision 1.2386.2.273
diff -u -b -r1.2386.2.272 -r1.2386.2.273
--- ChangeLog	16 Jun 2006 18:04:06 -0000	1.2386.2.272
+++ ChangeLog	16 Jun 2006 18:19:29 -0000	1.2386.2.273
@@ -1,5 +1,9 @@
 2006-06-16  Tom Tromey  <tromey@redhat.com>
 
+	* NEWS: Updated for JSR 166.
+
+2006-06-16  Tom Tromey  <tromey@redhat.com>
+
 	* lib/Makefile.am (compile_classpath): Added jsr166.
 	* configure.ac: Added external/jsr166/Makefile.
 	* external/Makefile.am (SUBDIRS): Added jsr166.

Index: NEWS
===================================================================
RCS file: /cvsroot/classpath/classpath/NEWS,v
retrieving revision 1.47.2.28
retrieving revision 1.47.2.29
diff -u -b -r1.47.2.28 -r1.47.2.29
--- NEWS	11 Jun 2006 18:23:17 -0000	1.47.2.28
+++ NEWS	16 Jun 2006 18:19:31 -0000	1.47.2.29
@@ -20,6 +20,7 @@
   * serialver
   A new configure option --enable-tool-wrappers causes wrapper
   binaries to be built for VMs that support the JNI Invocation API.
+* We've imported the JSR 166 (concurrency) reference implementation.
 
 Runtime interface changes:
 
@@ -30,6 +31,10 @@
 * The method gnu.java.io.PlatformHelper.toCanonicalForm() has been
   replaced with a JNI implementation of VMFile.toCanonicalForm() for
   GNU/Posix systems.
+* The Unsafe class was moved back to the place expected by the JSR 166
+  reference implementation.  We've also added a couple other new VM
+  classes to support the JSR 166 code -- sun.reflect.Reflection and
+  sun.reflect.misc.ReflectUtil.
 
 New in release 0.91 (May 15, 2006)
 



From MAILER-DAEMON Fri Jun 16 14:28:52 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrJ3s-000153-Oj
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 14:28:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrJ3q-00014Z-OM
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:28:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrJ3o-00013I-VH
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:28:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrJ3o-000139-ML
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:28:48 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrJDU-0002ly-6n
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:38:48 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrJ3n-00078T-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 14:28:47 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FrJ3l-00078O-Ub
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 18:28:47 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrJ3l-00078O-Ub@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 18:28:45 +0000
Subject: [commit-cp] classpath ChangeLog NEWS vm/reference/sun/misc/...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 18:28:50 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/16 18:28:45

Modified files:
	.              : ChangeLog NEWS 
Added files:
	vm/reference/sun/misc: ReflectUtil.java Unsafe.java 
	vm/reference/sun/reflect: Reflection.java 
Removed files:
	vm/reference/gnu/classpath: Unsafe.java 

Log message:
		* NEWS: Updated for JSR 166.
		* vm/reference/sun/reflect/Reflection.java (verifyMemberAccess):
		Removed.
		(getCallerClass): Now static.
		* vm/reference/sun/reflect/misc/ReflectUtil.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7850&r2=1.7851
http://cvs.savannah.gnu.org/viewcvs/classpath/NEWS?cvsroot=classpath&r1=1.149&r2=1.150
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/gnu/classpath/Unsafe.java?cvsroot=classpath&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/sun/misc/ReflectUtil.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/sun/misc/Unsafe.java?cvsroot=classpath&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/sun/reflect/Reflection.java?cvsroot=classpath&rev=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7850
retrieving revision 1.7851
diff -u -b -r1.7850 -r1.7851
--- ChangeLog	16 Jun 2006 18:16:33 -0000	1.7850
+++ ChangeLog	16 Jun 2006 18:28:45 -0000	1.7851
@@ -1,3 +1,11 @@
+2006-06-16  Tom Tromey  <tromey@redhat.com>
+
+	* NEWS: Updated for JSR 166.
+	* vm/reference/sun/reflect/Reflection.java (verifyMemberAccess):
+	Removed.
+	(getCallerClass): Now static.
+	* vm/reference/sun/reflect/misc/ReflectUtil.java: New file.
+
 2006-06-16  Kyle Galloway  <kgallowa@redhat.com>
 
 	* gnu/classpath/jdwp/event/ExceptionEvent:

Index: NEWS
===================================================================
RCS file: /cvsroot/classpath/classpath/NEWS,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -b -r1.149 -r1.150
--- NEWS	11 Jun 2006 21:57:14 -0000	1.149
+++ NEWS	16 Jun 2006 18:28:45 -0000	1.150
@@ -36,6 +36,10 @@
   time of the VM.  In addition, one of sun.boot.class.path
   or java.boot.class.path should be defined by the VM to
   support the optional boot class path access functionality.
+* The Unsafe class was moved back to the place expected by the JSR 166
+  reference implementation.  We've also added a couple other new VM
+  classes to support the JSR 166 code -- sun.reflect.Reflection and
+  sun.reflect.misc.ReflectUtil.
 
 New in release 0.91 (May 15, 2006)
 

Index: vm/reference/sun/misc/ReflectUtil.java
===================================================================
RCS file: vm/reference/sun/misc/ReflectUtil.java
diff -N vm/reference/sun/misc/ReflectUtil.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ vm/reference/sun/misc/ReflectUtil.java	16 Jun 2006 18:28:45 -0000	1.1
@@ -0,0 +1,93 @@
+/* ReflectUtil.java - JSR 166 reflection hooks
+   Copyright (C) 2006 Free Software Foundation
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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 sun.reflect.misc;
+
+import java.lang.reflect.Modifier;
+
+public class ReflectUtil
+{
+  // We use this inaccessible inner class as an argument type
+  // in verifyMemberAccess.  All current users of this method
+  // in the JSR 166 RI pass 'null' for this argument, and
+  // consequently we don't know what it means.  Using a funny
+  // type like this for the argument means that if the RI changes,
+  // we will see a compilation error.
+  private static class MustBeNull
+  {
+  }
+
+  public static void checkPackageAccess(Class declaringClass)
+  {
+    // FIXME: not sure what to check here.
+  }
+
+  /**
+   * Perform access checks on a member of a class.  This API is
+   * derived from the public domain code in the JSR 166 reference
+   * implementation.
+   * @param caller the class requesting access to the member
+   * @param declarer the declaring class of the member
+   * @param ignored unknown parameter; always null
+   * @param modifiers the modifiers on the member
+   * @return true if access is granted, false otherwise
+   */
+  public static void ensureMemberAccess(Class caller,
+                                        Class declarer,
+                                        MustBeNull ignored,
+                                        int modifiers)
+  {
+    // Same class, always ok.
+    if (caller == declarer)
+      return;
+    // Public access is ok.
+    if ((modifiers & Modifier.PUBLIC) != 0)
+      return;
+    // Protected access and request comes from
+    // a subclass of the declarer -- ok.
+    if ((modifiers & Modifier.PROTECTED) != 0
+        && declarer.isAssignableFrom(caller))
+      return;
+    // Package-private access, or protected access,
+    // and the packages are the same --ok.
+    if ((modifiers & Modifier.PRIVATE) == 0
+        && caller.getPackage() == declarer.getPackage())
+      return;
+    // Otherwise, no.
+    throw new IllegalAccessError();
+  }
+}

Index: vm/reference/sun/misc/Unsafe.java
===================================================================
RCS file: vm/reference/sun/misc/Unsafe.java
diff -N vm/reference/sun/misc/Unsafe.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ vm/reference/sun/misc/Unsafe.java	16 Jun 2006 18:28:45 -0000	1.2
@@ -0,0 +1,328 @@
+/* Unsafe.java - Unsafe operations needed for concurrency
+   Copyright (C) 2006 Free Software Foundation
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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 sun.misc;
+
+import java.lang.reflect.Field;
+
+/**
+ * This class should provide access to low-level operations and its
+ * use should be limited to trusted code.  Fields can be accessed using
+ * memory addresses, with undefined behaviour occurring if invalid memory
+ * addresses are given.
+ *
+ * @author Tom Tromey (tromey@redhat.com)
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ */
+public class Unsafe
+{
+  // Singleton class.
+  private static Unsafe unsafe = new Unsafe();
+
+  /**
+   * Private default constructor to prevent creation of an arbitrary
+   * number of instances.
+   */
+  private Unsafe()
+  {
+  }
+
+  /**
+   * Retrieve the singleton instance of <code>Unsafe</code>.  The calling
+   * method should guard this instance from untrusted code, as it provides
+   * access to low-level operations such as direct memory access.
+   *
+   * @throws SecurityException if a security manager exists and prevents
+   *                           access to the system properties.
+   */
+  public static Unsafe getUnsafe()
+  {
+    SecurityManager sm = System.getSecurityManager();
+    if (sm != null)
+      sm.checkPropertiesAccess();
+    return unsafe;
+  }
+  
+  /**
+   * Returns the memory address offset of the given static field.
+   * The offset is merely used as a means to access a particular field
+   * in the other methods of this class.  The value is unique to the given
+   * field and the same value should be returned on each subsequent call.
+   *
+   * @param field the field whose offset should be returned.
+   * @return the offset of the given field.
+   */
+  public native long objectFieldOffset(Field field);
+
+  /**
+   * Compares the value of the integer field at the specified offset
+   * in the supplied object with the given expected value, and updates
+   * it if they match.  The operation of this method should be atomic,
+   * thus providing an uninterruptible way of updating an integer field.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the integer field within <code>obj</code>.
+   * @param expect the expected value of the field.
+   * @param update the new value of the field if it equals <code>expect</code>.
+   * @return true if the field was changed.
+   */
+  public native boolean compareAndSwapInt(Object obj, long offset,
+                                          int expect, int update);
+
+  /**
+   * Compares the value of the long field at the specified offset
+   * in the supplied object with the given expected value, and updates
+   * it if they match.  The operation of this method should be atomic,
+   * thus providing an uninterruptible way of updating a long field.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the long field within <code>obj</code>.
+   * @param expect the expected value of the field.
+   * @param update the new value of the field if it equals <code>expect</code>.
+   * @return true if the field was changed.
+   */
+  public native boolean compareAndSwapLong(Object obj, long offset,
+                                           long expect, long update);
+
+  /**
+   * Compares the value of the object field at the specified offset
+   * in the supplied object with the given expected value, and updates
+   * it if they match.  The operation of this method should be atomic,
+   * thus providing an uninterruptible way of updating an object field.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the object field within <code>obj</code>.
+   * @param expect the expected value of the field.
+   * @param update the new value of the field if it equals <code>expect</code>.
+   * @return true if the field was changed.
+   */
+  public native boolean compareAndSwapObject(Object obj, long offset,
+                                             Object expect, Object update);
+
+  /**
+   * Sets the value of the integer field at the specified offset in the
+   * supplied object to the given value.  This is an ordered or lazy
+   * version of <code>putIntVolatile(Object,long,int)</code>, which
+   * doesn't guarantee the immediate visibility of the change to other
+   * threads.  It is only really useful where the integer field is
+   * <code>volatile</code>, and is thus expected to change unexpectedly.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the integer field within <code>obj</code>.
+   * @param value the new value of the field.
+   * @see #putIntVolatile(Object,long,int)
+   */
+  public native void putOrderedInt(Object obj, long offset, int value);
+
+  /**
+   * Sets the value of the long field at the specified offset in the
+   * supplied object to the given value.  This is an ordered or lazy
+   * version of <code>putLongVolatile(Object,long,long)</code>, which
+   * doesn't guarantee the immediate visibility of the change to other
+   * threads.  It is only really useful where the long field is
+   * <code>volatile</code>, and is thus expected to change unexpectedly.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the long field within <code>obj</code>.
+   * @param value the new value of the field.
+   * @see #putLongVolatile(Object,long,long)
+   */
+  public native void putOrderedLong(Object obj, long offset, long value);
+
+  /**
+   * Sets the value of the object field at the specified offset in the
+   * supplied object to the given value.  This is an ordered or lazy
+   * version of <code>putObjectVolatile(Object,long,Object)</code>, which
+   * doesn't guarantee the immediate visibility of the change to other
+   * threads.  It is only really useful where the object field is
+   * <code>volatile</code>, and is thus expected to change unexpectedly.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the object field within <code>obj</code>.
+   * @param value the new value of the field.
+   */
+  public native void putOrderedObject(Object obj, long offset, Object value);
+
+  /**
+   * Sets the value of the integer field at the specified offset in the
+   * supplied object to the given value, with volatile store semantics.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the integer field within <code>obj</code>.
+   * @param value the new value of the field.
+   */
+  public native void putIntVolatile(Object obj, long offset, int value);
+
+  /**
+   * Retrieves the value of the integer field at the specified offset in the
+   * supplied object with volatile load semantics.
+   *
+   * @param obj the object containing the field to read.
+   * @param offset the offset of the integer field within <code>obj</code>.
+   */
+  public native int getIntVolatile(Object obj, long offset);
+
+  /**
+   * Sets the value of the long field at the specified offset in the
+   * supplied object to the given value, with volatile store semantics.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the long field within <code>obj</code>.
+   * @param value the new value of the field.
+   * @see #putLong(Object,long,long)
+   */
+  public native void putLongVolatile(Object obj, long offset, long value);
+
+  /**
+   * Sets the value of the long field at the specified offset in the
+   * supplied object to the given value.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the long field within <code>obj</code>.
+   * @param value the new value of the field.
+   * @see #putLongVolatile(Object,long,long)
+   */
+  public native void putLong(Object obj, long offset, long value);
+
+  /**
+   * Retrieves the value of the long field at the specified offset in the
+   * supplied object with volatile load semantics.
+   *
+   * @param obj the object containing the field to read.
+   * @param offset the offset of the long field within <code>obj</code>.
+   * @see #getLong(Object,long)
+   */
+  public native long getLongVolatile(Object obj, long offset);
+
+  /**
+   * Retrieves the value of the long field at the specified offset in the
+   * supplied object.
+   *
+   * @param obj the object containing the field to read.
+   * @param offset the offset of the long field within <code>obj</code>.
+   * @see #getLongVolatile(Object,long)
+   */
+  public native long getLong(Object obj, long offset);
+
+  /**
+   * Sets the value of the object field at the specified offset in the
+   * supplied object to the given value, with volatile store semantics.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the object field within <code>obj</code>.
+   * @param value the new value of the field.
+   * @see #putObject(Object,long,Object)
+   */
+  public native void putObjectVolatile(Object obj, long offset, Object value);
+
+  /**
+   * Sets the value of the object field at the specified offset in the
+   * supplied object to the given value.
+   *
+   * @param obj the object containing the field to modify.
+   * @param offset the offset of the object field within <code>obj</code>.
+   * @param value the new value of the field.
+   * @see #putObjectVolatile(Object,long,Object)
+   */
+  public native void putObject(Object obj, long offset, Object value);
+
+  /**
+   * Retrieves the value of the object field at the specified offset in the
+   * supplied object with volatile load semantics.
+   *
+   * @param obj the object containing the field to read.
+   * @param offset the offset of the object field within <code>obj</code>.
+   */
+  public native Object getObjectVolatile(Object obj, long offset);
+
+  /**
+   * Returns the offset of the first element for a given array class.
+   * To access elements of the array class, this value may be used along
+   * with that returned by 
+   * <a href="#arrayIndexScale"><code>arrayIndexScale</code></a>,
+   * if non-zero.
+   *
+   * @param arrayClass the class for which the first element's address should
+   *                   be obtained.
+   * @return the offset of the first element of the array class.
+   * @see arrayIndexScale(Class)
+   */
+  public native int arrayBaseOffset(Class arrayClass);
+
+  /**
+   * Returns the scale factor used for addressing elements of the supplied
+   * array class.  Where a suitable scale factor can not be returned (e.g.
+   * for primitive types), zero should be returned.  The returned value
+   * can be used with 
+   * <a href="#arrayBaseOffset"><code>arrayBaseOffset</code></a>
+   * to access elements of the class.
+   *
+   * @param arrayClass the class whose scale factor should be returned.
+   * @return the scale factor, or zero if not supported for this array class.
+   */
+  public native int arrayIndexScale(Class arrayClass);
+  
+  /**
+   * Releases the block on a thread created by 
+   * <a href="#park"><code>park</code></a>.  This method can also be used
+   * to terminate a blockage caused by a prior call to <code>park</code>.
+   * This operation is unsafe, as the thread must be guaranteed to be
+   * live.  This is true of Java, but not native code.
+   *
+   * @param thread the thread to unblock.
+   */
+  public native void unpark(Thread thread);
+
+  /**
+   * Blocks the thread until a matching 
+   * <a href="#unpark"><code>unpark</code></a> occurs, the thread is
+   * interrupted or the optional timeout expires.  If an <code>unpark</code>
+   * call has already occurred, this also counts.  A timeout value of zero
+   * is defined as no timeout.  When <code>isAbsolute</code> is
+   * <code>true</code>, the timeout is in milliseconds relative to the
+   * epoch.  Otherwise, the value is the number of nanoseconds which must
+   * occur before timeout.  This call may also return spuriously (i.e.
+   * for no apparent reason).
+   *
+   * @param isAbsolute true if the timeout is specified in milliseconds from
+   *                   the epoch.
+   * @param time either the number of nanoseconds to wait, or a time in
+   *             milliseconds from the epoch to wait for.
+   */
+  public native void park(boolean isAbsolute, long time);
+
+}

Index: vm/reference/sun/reflect/Reflection.java
===================================================================
RCS file: vm/reference/sun/reflect/Reflection.java
diff -N vm/reference/sun/reflect/Reflection.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ vm/reference/sun/reflect/Reflection.java	16 Jun 2006 18:28:45 -0000	1.2
@@ -0,0 +1,51 @@
+/* Reflection.java - JSR 166 reflection hooks
+   Copyright (C) 2006 Free Software Foundation
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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 sun.reflect;
+
+import gnu.classpath.VMStackWalker;
+
+public class Reflection
+{
+  /**
+   * A stack-walking wrapper method used by the JSR 166 RI. 
+   */
+  public static Class getCallerClass(int depth)
+  {
+    return VMStackWalker.getClassContext()[depth];
+  }
+}

Index: vm/reference/gnu/classpath/Unsafe.java
===================================================================
RCS file: vm/reference/gnu/classpath/Unsafe.java
diff -N vm/reference/gnu/classpath/Unsafe.java
--- vm/reference/gnu/classpath/Unsafe.java	21 Mar 2006 22:04:55 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,328 +0,0 @@
-/* Unsafe.java - Unsafe operations needed for concurrency
-   Copyright (C) 2006 Free Software Foundation
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.classpath;
-
-import java.lang.reflect.Field;
-
-/**
- * This class should provide access to low-level operations and its
- * use should be limited to trusted code.  Fields can be accessed using
- * memory addresses, with undefined behaviour occurring if invalid memory
- * addresses are given.
- *
- * @author Tom Tromey (tromey@redhat.com)
- * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- */
-public final class Unsafe
-{
-  // Singleton class.
-  private static Unsafe unsafe = new Unsafe();
-
-  /**
-   * Private default constructor to prevent creation of an arbitrary
-   * number of instances.
-   */
-  private Unsafe()
-  {
-  }
-
-  /**
-   * Retrieve the singleton instance of <code>Unsafe</code>.  The calling
-   * method should guard this instance from untrusted code, as it provides
-   * access to low-level operations such as direct memory access.
-   *
-   * @throws SecurityException if a security manager exists and prevents
-   *                           access to the system properties.
-   */
-  public static Unsafe getUnsafe()
-  {
-    SecurityManager sm = System.getSecurityManager();
-    if (sm != null)
-      sm.checkPropertiesAccess();
-    return unsafe;
-  }
-  
-  /**
-   * Returns the memory address offset of the given static field.
-   * The offset is merely used as a means to access a particular field
-   * in the other methods of this class.  The value is unique to the given
-   * field and the same value should be returned on each subsequent call.
-   *
-   * @param field the field whose offset should be returned.
-   * @return the offset of the given field.
-   */
-  public native long objectFieldOffset(Field field);
-
-  /**
-   * Compares the value of the integer field at the specified offset
-   * in the supplied object with the given expected value, and updates
-   * it if they match.  The operation of this method should be atomic,
-   * thus providing an uninterruptible way of updating an integer field.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the integer field within <code>obj</code>.
-   * @param expect the expected value of the field.
-   * @param update the new value of the field if it equals <code>expect</code>.
-   * @return true if the field was changed.
-   */
-  public native boolean compareAndSwapInt(Object obj, long offset,
-                                          int expect, int update);
-
-  /**
-   * Compares the value of the long field at the specified offset
-   * in the supplied object with the given expected value, and updates
-   * it if they match.  The operation of this method should be atomic,
-   * thus providing an uninterruptible way of updating a long field.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the long field within <code>obj</code>.
-   * @param expect the expected value of the field.
-   * @param update the new value of the field if it equals <code>expect</code>.
-   * @return true if the field was changed.
-   */
-  public native boolean compareAndSwapLong(Object obj, long offset,
-                                           long expect, long update);
-
-  /**
-   * Compares the value of the object field at the specified offset
-   * in the supplied object with the given expected value, and updates
-   * it if they match.  The operation of this method should be atomic,
-   * thus providing an uninterruptible way of updating an object field.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the object field within <code>obj</code>.
-   * @param expect the expected value of the field.
-   * @param update the new value of the field if it equals <code>expect</code>.
-   * @return true if the field was changed.
-   */
-  public native boolean compareAndSwapObject(Object obj, long offset,
-                                             Object expect, Object update);
-
-  /**
-   * Sets the value of the integer field at the specified offset in the
-   * supplied object to the given value.  This is an ordered or lazy
-   * version of <code>putIntVolatile(Object,long,int)</code>, which
-   * doesn't guarantee the immediate visibility of the change to other
-   * threads.  It is only really useful where the integer field is
-   * <code>volatile</code>, and is thus expected to change unexpectedly.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the integer field within <code>obj</code>.
-   * @param value the new value of the field.
-   * @see #putIntVolatile(Object,long,int)
-   */
-  public native void putOrderedInt(Object obj, long offset, int value);
-
-  /**
-   * Sets the value of the long field at the specified offset in the
-   * supplied object to the given value.  This is an ordered or lazy
-   * version of <code>putLongVolatile(Object,long,long)</code>, which
-   * doesn't guarantee the immediate visibility of the change to other
-   * threads.  It is only really useful where the long field is
-   * <code>volatile</code>, and is thus expected to change unexpectedly.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the long field within <code>obj</code>.
-   * @param value the new value of the field.
-   * @see #putLongVolatile(Object,long,long)
-   */
-  public native void putOrderedLong(Object obj, long offset, long value);
-
-  /**
-   * Sets the value of the object field at the specified offset in the
-   * supplied object to the given value.  This is an ordered or lazy
-   * version of <code>putObjectVolatile(Object,long,Object)</code>, which
-   * doesn't guarantee the immediate visibility of the change to other
-   * threads.  It is only really useful where the object field is
-   * <code>volatile</code>, and is thus expected to change unexpectedly.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the object field within <code>obj</code>.
-   * @param value the new value of the field.
-   */
-  public native void putOrderedObject(Object obj, long offset, Object value);
-
-  /**
-   * Sets the value of the integer field at the specified offset in the
-   * supplied object to the given value, with volatile store semantics.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the integer field within <code>obj</code>.
-   * @param value the new value of the field.
-   */
-  public native void putIntVolatile(Object obj, long offset, int value);
-
-  /**
-   * Retrieves the value of the integer field at the specified offset in the
-   * supplied object with volatile load semantics.
-   *
-   * @param obj the object containing the field to read.
-   * @param offset the offset of the integer field within <code>obj</code>.
-   */
-  public native int getIntVolatile(Object obj, long offset);
-
-  /**
-   * Sets the value of the long field at the specified offset in the
-   * supplied object to the given value, with volatile store semantics.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the long field within <code>obj</code>.
-   * @param value the new value of the field.
-   * @see #putLong(Object,long,long)
-   */
-  public native void putLongVolatile(Object obj, long offset, long value);
-
-  /**
-   * Sets the value of the long field at the specified offset in the
-   * supplied object to the given value.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the long field within <code>obj</code>.
-   * @param value the new value of the field.
-   * @see #putLongVolatile(Object,long,long)
-   */
-  public native void putLong(Object obj, long offset, long value);
-
-  /**
-   * Retrieves the value of the long field at the specified offset in the
-   * supplied object with volatile load semantics.
-   *
-   * @param obj the object containing the field to read.
-   * @param offset the offset of the long field within <code>obj</code>.
-   * @see #getLong(Object,long)
-   */
-  public native long getLongVolatile(Object obj, long offset);
-
-  /**
-   * Retrieves the value of the long field at the specified offset in the
-   * supplied object.
-   *
-   * @param obj the object containing the field to read.
-   * @param offset the offset of the long field within <code>obj</code>.
-   * @see #getLongVolatile(Object,long)
-   */
-  public native long getLong(Object obj, long offset);
-
-  /**
-   * Sets the value of the object field at the specified offset in the
-   * supplied object to the given value, with volatile store semantics.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the object field within <code>obj</code>.
-   * @param value the new value of the field.
-   * @see #putObject(Object,long,Object)
-   */
-  public native void putObjectVolatile(Object obj, long offset, Object value);
-
-  /**
-   * Sets the value of the object field at the specified offset in the
-   * supplied object to the given value.
-   *
-   * @param obj the object containing the field to modify.
-   * @param offset the offset of the object field within <code>obj</code>.
-   * @param value the new value of the field.
-   * @see #putObjectVolatile(Object,long,Object)
-   */
-  public native void putObject(Object obj, long offset, Object value);
-
-  /**
-   * Retrieves the value of the object field at the specified offset in the
-   * supplied object with volatile load semantics.
-   *
-   * @param obj the object containing the field to read.
-   * @param offset the offset of the object field within <code>obj</code>.
-   */
-  public native Object getObjectVolatile(Object obj, long offset);
-
-  /**
-   * Returns the offset of the first element for a given array class.
-   * To access elements of the array class, this value may be used along
-   * with that returned by 
-   * <a href="#arrayIndexScale"><code>arrayIndexScale</code></a>,
-   * if non-zero.
-   *
-   * @param arrayClass the class for which the first element's address should
-   *                   be obtained.
-   * @return the offset of the first element of the array class.
-   * @see #arrayIndexScale(Class)
-   */
-  public native int arrayBaseOffset(Class arrayClass);
-
-  /**
-   * Returns the scale factor used for addressing elements of the supplied
-   * array class.  Where a suitable scale factor can not be returned (e.g.
-   * for primitive types), zero should be returned.  The returned value
-   * can be used with 
-   * <a href="#arrayBaseOffset"><code>arrayBaseOffset</code></a>
-   * to access elements of the class.
-   *
-   * @param arrayClass the class whose scale factor should be returned.
-   * @return the scale factor, or zero if not supported for this array class.
-   */
-  public native int arrayIndexScale(Class arrayClass);
-  
-  /**
-   * Releases the block on a thread created by 
-   * <a href="#park"><code>park</code></a>.  This method can also be used
-   * to terminate a blockage caused by a prior call to <code>park</code>.
-   * This operation is unsafe, as the thread must be guaranteed to be
-   * live.  This is true of Java, but not native code.
-   *
-   * @param thread the thread to unblock.
-   */
-  public native void unpark(Thread thread);
-
-  /**
-   * Blocks the thread until a matching 
-   * <a href="#unpark"><code>unpark</code></a> occurs, the thread is
-   * interrupted or the optional timeout expires.  If an <code>unpark</code>
-   * call has already occurred, this also counts.  A timeout value of zero
-   * is defined as no timeout.  When <code>isAbsolute</code> is
-   * <code>true</code>, the timeout is in milliseconds relative to the
-   * epoch.  Otherwise, the value is the number of nanoseconds which must
-   * occur before timeout.  This call may also return spuriously (i.e.
-   * for no apparent reason).
-   *
-   * @param isAbsolute true if the timeout is specified in milliseconds from
-   *                   the epoch.
-   * @param time either the number of nanoseconds to wait, or a time in
-   *             milliseconds from the epoch to wait for.
-   */
-  public native void park(boolean isAbsolute, long time);
-
-}



From MAILER-DAEMON Fri Jun 16 14:32:54 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrJ7l-0005Nd-QH
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 14:32:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrJ7j-0005LY-Pg
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:32:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrJ7i-0005KW-TZ
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:32:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrJ7i-0005KK-O2
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:32:50 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrJHO-00032O-Ml
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:42:50 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrJ7i-00089P-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 14:32:50 -0400
Received: from keiths by savannah.gnu.org with local (Exim 4.50)
	id 1FrJ7h-00089C-Fj
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 18:32:49 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrJ7h-00089C-Fj@savannah.gnu.org>
From: Keith Seitz <keiths@redhat.com>
Date: Fri, 16 Jun 2006 18:32:49 +0000
Subject: [commit-cp] classpath ChangeLog gnu/classpath/jdwp/Jdwp.jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 18:32:52 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Keith Seitz <keiths>	06/06/16 18:32:49

Modified files:
	.              : ChangeLog 
	gnu/classpath/jdwp: Jdwp.java 
	gnu/classpath/jdwp/transport: JdwpConnection.java 
	gnu/classpath/jdwp/processor: PacketProcessor.java 

Log message:
	        * gnu/classpath/jdwp/Jdwp.java (_initLock): New field.
	        (_initCount): New field.
	        (Jdwp): Don't set isDebugging until fully initialized.
	        (subcomponentInitialized): New method.
	        (run): Wait for PacketProcessor and JdwpConnection to
	        startup, then set isDebugging, and then let this thread
	        die.
	        * gnu/classpath/jdwp/transport/JdwpConnection.java
	        (run): Add synchronization notification.
	        * gnu/classpath/jdwp/processor/PacketProcessor.java
	        (run): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7851&r2=1.7852
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/Jdwp.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/transport/JdwpConnection.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/processor/PacketProcessor.java?cvsroot=classpath&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7851
retrieving revision 1.7852
diff -u -b -r1.7851 -r1.7852
--- ChangeLog	16 Jun 2006 18:28:45 -0000	1.7851
+++ ChangeLog	16 Jun 2006 18:32:48 -0000	1.7852
@@ -1,3 +1,17 @@
+2006-06-16  Keith Seitz  <keiths@redhat.com>
+
+	* gnu/classpath/jdwp/Jdwp.java (_initLock): New field.
+	(_initCount): New field.
+	(Jdwp): Don't set isDebugging until fully initialized.
+	(subcomponentInitialized): New method.
+	(run): Wait for PacketProcessor and JdwpConnection to
+	startup, then set isDebugging, and then let this thread
+	die.
+	* gnu/classpath/jdwp/transport/JdwpConnection.java
+	(run): Add synchronization notification.
+	* gnu/classpath/jdwp/processor/PacketProcessor.java
+	(run): Likewise.
+
 2006-06-16  Tom Tromey  <tromey@redhat.com>
 
 	* NEWS: Updated for JSR 166.

Index: gnu/classpath/jdwp/Jdwp.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/Jdwp.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnu/classpath/jdwp/Jdwp.java	16 Mar 2006 23:26:10 -0000	1.6
+++ gnu/classpath/jdwp/Jdwp.java	16 Jun 2006 18:32:48 -0000	1.7
@@ -56,6 +56,9 @@
 /**
  * Main interface from the virtual machine to the JDWP back-end.
  *
+ * The thread created by this class is only used for initialization.
+ * Once it exits, the JDWP backend is fully initialized.
+ *
  * @author Keith Seitz (keiths@redhat.com)
  */
 public class Jdwp
@@ -65,7 +68,8 @@
   private static Jdwp _instance = null;
 
   /**
-   * Are we debugging?
+   * Are we debugging? Only true if debugging
+   * *and* initialized.
    */
   public static boolean isDebugging = false;
 
@@ -89,13 +93,16 @@
   // A thread group for the JDWP threads
   private ThreadGroup _group;
 
+  // Initialization synchronization
+  private Object _initLock = new Object ();
+  private int _initCount = 0;
+
   /**
    * constructor
    */
   public Jdwp ()
   {
     _shutdown = false;
-    isDebugging = true;
     _instance = this;
   }
 
@@ -271,17 +278,45 @@
       }
   }
 
+  /**
+   * Allows subcomponents to specify that they are
+   * initialized.
+   *
+   * Subcomponents include JdwpConnection and PacketProcessor.
+   */
+  public void subcomponentInitialized ()
+  {
+    synchronized (_initLock)
+      {
+	++_initCount;
+	_initLock.notify ();
+      }
+  }
+
   public void run ()
   {
     try
       {
 	_doInitialization ();
+
+	/* We need a little internal synchronization here, so that
+	   when this thread dies, the back-end will be fully initialized,
+	   ready to start servicing the VM and debugger. */
+	synchronized (_initLock)
+	  {
+	    while (_initCount != 2)
+	      _initLock.wait ();
+	  }
+	_initLock = null;
       }
     catch (Throwable t)
       {
 	System.out.println ("Exception in JDWP back-end: " + t);
 	System.exit (1);
       }
+
+    // Now we are finally ready and initialized
+    isDebugging = true;
   }
 
   // A helper function to process the configure string "-Xrunjdwp:..."

Index: gnu/classpath/jdwp/transport/JdwpConnection.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/transport/JdwpConnection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/classpath/jdwp/transport/JdwpConnection.java	3 Sep 2005 00:22:30 -0000	1.5
+++ gnu/classpath/jdwp/transport/JdwpConnection.java	16 Jun 2006 18:32:49 -0000	1.6
@@ -1,5 +1,5 @@
 /* JdwpConnection.java -- A JDWP-speaking connection
-   Copyright (C) 2005 Free Software Foundation
+   Copyright (C) 2005, 2006 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -165,6 +165,10 @@
    */
   public void run ()
   {
+    // Notify initialization thread (gnu.classpath.jdwp.Jdwp) that
+    // the JdwpConnection thread is ready.
+    Jdwp.getDefault().subcomponentInitialized ();
+
     while (!_shutdown)
       {
 	try

Index: gnu/classpath/jdwp/processor/PacketProcessor.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/processor/PacketProcessor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/classpath/jdwp/processor/PacketProcessor.java	27 Jul 2005 19:04:14 -0000	1.5
+++ gnu/classpath/jdwp/processor/PacketProcessor.java	16 Jun 2006 18:32:49 -0000	1.6
@@ -1,6 +1,6 @@
 /* PacketProcessor.java -- a thread which processes command packets
    from the debugger
-   Copyright (C) 2005 Free Software Foundation
+   Copyright (C) 2005, 2006 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -137,6 +137,10 @@
    */
   public Object run ()
   {
+    // Notify initialization thread (gnu.classpath.jdwp.Jdwp) that
+    // the PacketProcessor thread is ready.
+    Jdwp.getDefault().subcomponentInitialized ();
+	
     try
       {
         while (!_shutdown)
@@ -144,7 +148,7 @@
             _processOnePacket ();
           }
       }
-    catch (IOException ex)
+    catch (Exception ex)
       {
         ex.printStackTrace();
       }



From MAILER-DAEMON Fri Jun 16 14:43:51 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrJIN-0002lA-0Y
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 14:43:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrJIL-0002jF-Er
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:43:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrJIJ-0002hD-RQ
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:43:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrJIJ-0002gv-Im
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:43:47 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrJRz-0003iU-JK
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 14:53:47 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrJII-00012R-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 14:43:46 -0400
Received: from keiths by savannah.gnu.org with local (Exim 4.50)
	id 1FrJIH-00012J-6I
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 18:43:46 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrJIH-00012J-6I@savannah.gnu.org>
From: Keith Seitz <keiths@redhat.com>
Date: Fri, 16 Jun 2006 18:43:45 +0000
Subject: [commit-cp] classpath ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 18:43:49 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Keith Seitz <keiths>	06/06/16 18:43:44

Modified files:
	.              : ChangeLog 

Log message:
	delete spurious CVS conflict markers

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7852&r2=1.7853

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7852
retrieving revision 1.7853
diff -u -b -r1.7852 -r1.7853
--- ChangeLog	16 Jun 2006 18:32:48 -0000	1.7852
+++ ChangeLog	16 Jun 2006 18:43:44 -0000	1.7853
@@ -355,7 +355,6 @@
 	(Java_gnu_java_awt_peer_gtk_GtkImage_getPixels): Return when array
 	cannot be allocated.
 
->>>>>>> 1.7848
 2006-06-14  Tom Tromey  <tromey@redhat.com>
 
 	PR java/28024:
@@ -449,7 +448,6 @@
 	compatibility with filters.
 	(getParameter): Modified to allow access to above. 
 
->>>>>>> 1.7824
 2006-06-13  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/peer/gtk/CairoSurface.java
@@ -471,7 +469,6 @@
 	or not the labels are visible,
 	(paintTrack): Shift track down one pixel.
 
->>>>>>> 1.7799
 2006-06-13  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/image/PixelGrabber.java
@@ -1242,7 +1239,6 @@
 	(TreeIncrementAction.actionPerformed): Use action name as command.
 	(TreeIncrementAction.isEnabled): Implemented.
 
->>>>>>> 1.7796
 2006-06-08  Mark Wielaard  <mark@klomp.org>
 
 	PR 27917



From MAILER-DAEMON Fri Jun 16 15:40:09 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrKAr-0007lY-F1
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 15:40:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrKAp-0007ku-GD
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 15:40:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrKAo-0007kR-TW
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 15:40:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrKAo-0007kK-78
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 15:40:06 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrKKU-0007qH-OB
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 15:50:06 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrKAn-0005np-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 15:40:05 -0400
Received: from keiths by savannah.gnu.org with local (Exim 4.50)
	id 1FrKAm-0005nk-Uw
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 19:40:05 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrKAm-0005nk-Uw@savannah.gnu.org>
From: Keith Seitz <keiths@redhat.com>
Date: Fri, 16 Jun 2006 19:40:04 +0000
Subject: [commit-cp] classpath ChangeLog gnu/classpath/jdwp/Jdwp.jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 19:40:07 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Keith Seitz <keiths>	06/06/16 19:40:04

Modified files:
	.              : ChangeLog 
	gnu/classpath/jdwp: Jdwp.java 
	gnu/classpath/jdwp/event: EventManager.java 

Log message:
	        * gnu/classpath/jdwp/event/EventManager.java (getDefault): Redo
	        instantiation so that EventManager is created when getDefault
	        is first called.
	        * gnu/classpath/jdwp/Jdwp.java (Thread): Force creation
	        of EventManager.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7853&r2=1.7854
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/Jdwp.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/EventManager.java?cvsroot=classpath&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7853
retrieving revision 1.7854
diff -u -b -r1.7853 -r1.7854
--- ChangeLog	16 Jun 2006 18:43:44 -0000	1.7853
+++ ChangeLog	16 Jun 2006 19:40:00 -0000	1.7854
@@ -1,5 +1,13 @@
 2006-06-16  Keith Seitz  <keiths@redhat.com>
 
+	* gnu/classpath/jdwp/event/EventManager.java (getDefault): Redo
+	instantiation so that EventManager is created when getDefault
+	is first called.
+	* gnu/classpath/jdwp/Jdwp.java (Thread): Force creation
+	of EventManager.
+
+2006-06-16  Keith Seitz  <keiths@redhat.com>
+
 	* gnu/classpath/jdwp/Jdwp.java (_initLock): New field.
 	(_initCount): New field.
 	(Jdwp): Don't set isDebugging until fully initialized.

Index: gnu/classpath/jdwp/Jdwp.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/Jdwp.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnu/classpath/jdwp/Jdwp.java	16 Jun 2006 18:32:48 -0000	1.7
+++ gnu/classpath/jdwp/Jdwp.java	16 Jun 2006 19:40:04 -0000	1.8
@@ -315,6 +315,13 @@
 	System.exit (1);
       }
 
+    /* Force creation of the EventManager. If the event manager
+       has not been created when isDebugging is set, it is possible
+       that the VM will call Jdwp.notify (which uses EventManager)
+       while the EventManager is being created (or at least this is
+       a problem with gcj/gij). */
+    EventManager.getDefault();
+
     // Now we are finally ready and initialized
     isDebugging = true;
   }

Index: gnu/classpath/jdwp/event/EventManager.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/EventManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/classpath/jdwp/event/EventManager.java	9 Mar 2006 23:18:29 -0000	1.4
+++ gnu/classpath/jdwp/event/EventManager.java	16 Jun 2006 19:40:04 -0000	1.5
@@ -1,5 +1,5 @@
 /* EventManager.java -- event management and notification infrastructure
-   Copyright (C) 2005 Free Software Foundation
+   Copyright (C) 2005, 2006 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -69,7 +69,7 @@
 public class EventManager
 {
   // Single instance
-  private static EventManager _instance = new EventManager ();
+  private static EventManager _instance = null;
 
   // maps event (EVENT_*) to lists of EventRequests
   private Hashtable _requests = null;
@@ -79,8 +79,11 @@
    *
    * @return the event manager
    */
-  public static EventManager getDefault ()
+  public static EventManager getDefault()
   {
+    if (_instance == null)
+      _instance = new EventManager();
+
     return _instance;
   }
 



From MAILER-DAEMON Fri Jun 16 16:34:07 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrL15-0002zu-H2
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 16:34:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrL14-0002z3-2f
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:34:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrL13-0002yk-CC
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:34:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrL13-0002yg-7T
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:34:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrLAk-0003gl-AW
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:44:06 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrL12-0000bT-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 16:34:04 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FrL0y-0000b7-Sy
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 20:34:02 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrL0y-0000b7-Sy@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 20:34:00 +0000
Subject: [commit-cp] classpath ChangeLog vm/reference/sun/reflect/mi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 20:34:06 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/16 20:34:00

Modified files:
	.              : ChangeLog 
Added files:
	vm/reference/sun/reflect/misc: ReflectUtil.java 
Removed files:
	vm/reference/sun/misc: ReflectUtil.java 

Log message:
		* vm/reference/sun/reflect/misc/ReflectUtil.java: Moved...
		* vm/reference/sun/misc/ReflectUtil.java: ...from here.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7854&r2=1.7855
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/sun/misc/ReflectUtil.java?cvsroot=classpath&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/sun/reflect/misc/ReflectUtil.java?cvsroot=classpath&rev=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7854
retrieving revision 1.7855
diff -u -b -r1.7854 -r1.7855
--- ChangeLog	16 Jun 2006 19:40:00 -0000	1.7854
+++ ChangeLog	16 Jun 2006 20:33:59 -0000	1.7855
@@ -1,3 +1,8 @@
+2006-06-16  Tom Tromey  <tromey@redhat.com>
+
+	* vm/reference/sun/reflect/misc/ReflectUtil.java: Moved...
+	* vm/reference/sun/misc/ReflectUtil.java: ...from here.
+
 2006-06-16  Keith Seitz  <keiths@redhat.com>
 
 	* gnu/classpath/jdwp/event/EventManager.java (getDefault): Redo

Index: vm/reference/sun/reflect/misc/ReflectUtil.java
===================================================================
RCS file: vm/reference/sun/reflect/misc/ReflectUtil.java
diff -N vm/reference/sun/reflect/misc/ReflectUtil.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ vm/reference/sun/reflect/misc/ReflectUtil.java	16 Jun 2006 20:34:00 -0000	1.2
@@ -0,0 +1,92 @@
+/* ReflectUtil.java - JSR 166 reflection hooks
+   Copyright (C) 2006 Free Software Foundation
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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 sun.reflect.misc;
+
+import java.lang.reflect.Modifier;
+
+public class ReflectUtil
+{
+  // We use this inaccessible inner class as an argument type
+  // in verifyMemberAccess.  All current users of this method
+  // in the JSR 166 RI pass 'null' for this argument, and
+  // consequently we don't know what it means.  Using a funny
+  // type like this for the argument means that if the RI changes,
+  // we will see a compilation error.
+  private static class MustBeNull
+  {
+  }
+
+  public static void checkPackageAccess(Class declaringClass)
+  {
+    // FIXME: not sure what to check here.
+  }
+
+  /**
+   * Perform access checks on a member of a class.  This API is
+   * derived from the public domain code in the JSR 166 reference
+   * implementation.
+   * @param caller the class requesting access to the member
+   * @param declarer the declaring class of the member
+   * @param ignored unknown parameter; always null
+   * @param modifiers the modifiers on the member
+   */
+  public static void ensureMemberAccess(Class caller,
+                                        Class declarer,
+                                        MustBeNull ignored,
+                                        int modifiers)
+  {
+    // Same class, always ok.
+    if (caller == declarer)
+      return;
+    // Public access is ok.
+    if ((modifiers & Modifier.PUBLIC) != 0)
+      return;
+    // Protected access and request comes from
+    // a subclass of the declarer -- ok.
+    if ((modifiers & Modifier.PROTECTED) != 0
+        && declarer.isAssignableFrom(caller))
+      return;
+    // Package-private access, or protected access,
+    // and the packages are the same --ok.
+    if ((modifiers & Modifier.PRIVATE) == 0
+        && caller.getPackage() == declarer.getPackage())
+      return;
+    // Otherwise, no.
+    throw new IllegalAccessError();
+  }
+}

Index: vm/reference/sun/misc/ReflectUtil.java
===================================================================
RCS file: vm/reference/sun/misc/ReflectUtil.java
diff -N vm/reference/sun/misc/ReflectUtil.java
--- vm/reference/sun/misc/ReflectUtil.java	16 Jun 2006 18:28:45 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,93 +0,0 @@
-/* ReflectUtil.java - JSR 166 reflection hooks
-   Copyright (C) 2006 Free Software Foundation
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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 sun.reflect.misc;
-
-import java.lang.reflect.Modifier;
-
-public class ReflectUtil
-{
-  // We use this inaccessible inner class as an argument type
-  // in verifyMemberAccess.  All current users of this method
-  // in the JSR 166 RI pass 'null' for this argument, and
-  // consequently we don't know what it means.  Using a funny
-  // type like this for the argument means that if the RI changes,
-  // we will see a compilation error.
-  private static class MustBeNull
-  {
-  }
-
-  public static void checkPackageAccess(Class declaringClass)
-  {
-    // FIXME: not sure what to check here.
-  }
-
-  /**
-   * Perform access checks on a member of a class.  This API is
-   * derived from the public domain code in the JSR 166 reference
-   * implementation.
-   * @param caller the class requesting access to the member
-   * @param declarer the declaring class of the member
-   * @param ignored unknown parameter; always null
-   * @param modifiers the modifiers on the member
-   * @return true if access is granted, false otherwise
-   */
-  public static void ensureMemberAccess(Class caller,
-                                        Class declarer,
-                                        MustBeNull ignored,
-                                        int modifiers)
-  {
-    // Same class, always ok.
-    if (caller == declarer)
-      return;
-    // Public access is ok.
-    if ((modifiers & Modifier.PUBLIC) != 0)
-      return;
-    // Protected access and request comes from
-    // a subclass of the declarer -- ok.
-    if ((modifiers & Modifier.PROTECTED) != 0
-        && declarer.isAssignableFrom(caller))
-      return;
-    // Package-private access, or protected access,
-    // and the packages are the same --ok.
-    if ((modifiers & Modifier.PRIVATE) == 0
-        && caller.getPackage() == declarer.getPackage())
-      return;
-    // Otherwise, no.
-    throw new IllegalAccessError();
-  }
-}



From MAILER-DAEMON Fri Jun 16 16:37:39 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrL4U-000571-WD
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 16:37:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrL4S-00053c-SX
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:37:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrL4S-00052t-Bg
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:37:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrL4S-00052m-8w
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:37:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrLE9-0003u0-DY
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:47:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrL4R-00014D-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 16:37:35 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FrL4R-000149-1X
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 20:37:35 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrL4R-000149-1X@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 16 Jun 2006 20:37:35 +0000
Subject: [commit-cp] classpath ChangeLog tools/.cvsignore
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 20:37:37 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/16 20:37:34

Modified files:
	.              : ChangeLog 
	tools          : .cvsignore 

Log message:
		* tools/.cvsignore: Added new tool names.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7855&r2=1.7856
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/.cvsignore?cvsroot=classpath&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7855
retrieving revision 1.7856
diff -u -b -r1.7855 -r1.7856
--- ChangeLog	16 Jun 2006 20:33:59 -0000	1.7855
+++ ChangeLog	16 Jun 2006 20:37:34 -0000	1.7856
@@ -1,5 +1,9 @@
 2006-06-16  Tom Tromey  <tromey@redhat.com>
 
+	* tools/.cvsignore: Added new tool names.
+
+2006-06-16  Tom Tromey  <tromey@redhat.com>
+
 	* vm/reference/sun/reflect/misc/ReflectUtil.java: Moved...
 	* vm/reference/sun/misc/ReflectUtil.java: ...from here.
 

Index: tools/.cvsignore
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tools/.cvsignore	9 Jun 2006 16:44:55 -0000	1.8
+++ tools/.cvsignore	16 Jun 2006 20:37:34 -0000	1.9
@@ -5,3 +5,6 @@
 tools.zip
 appletviewer
 .deps
+gappletviewer
+gjarsigner
+gkeytool



From MAILER-DAEMON Fri Jun 16 16:46:49 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrLDN-0002r7-JV
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 16:46:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrLDL-0002qL-Dt
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:46:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrLDK-0002q3-Og
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:46:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrLDK-0002q0-K0
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:46:46 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrLN1-0004Rj-TG
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:56:47 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrLDI-0001aW-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 16:46:44 -0400
Received: from fkung by savannah.gnu.org with local (Exim 4.50)
	id 1FrLDI-0001aT-Fe
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 20:46:44 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrLDI-0001aT-Fe@savannah.gnu.org>
From: Francis Kung <fkung@redhat.com>
Date: Fri, 16 Jun 2006 20:46:44 +0000
Subject: [commit-cp] classpath/examples/gnu/classpath/examples/java2d
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 20:46:47 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Francis Kung <fkung>	06/06/16 20:46:44

New directory:
	examples/gnu/classpath/examples/java2d

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/java2d/?cvsroot=classpath



From MAILER-DAEMON Fri Jun 16 16:47:01 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrLDY-00030Y-TY
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 16:47:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrLDW-0002yn-OE
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:46:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrLDW-0002yN-5f
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:46:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrLDV-0002yI-RM
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:46:57 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrLND-0004T5-0h
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 16:56:59 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrLDU-0001fO-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 16:46:56 -0400
Received: from fkung by savannah.gnu.org with local (Exim 4.50)
	id 1FrLDT-0001fF-0k
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 20:46:55 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrLDT-0001fF-0k@savannah.gnu.org>
From: Francis Kung <fkung@redhat.com>
Date: Fri, 16 Jun 2006 20:46:55 +0000
Subject: [commit-cp] classpath/examples/gnu/classpath/examples swing...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2006 20:46:59 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Francis Kung <fkung>	06/06/16 20:46:54

Modified files:
	examples/gnu/classpath/examples/swing: Demo.java 
	.              : ChangeLog 
Added files:
	examples/gnu/classpath/examples/java2d: palme.gif 
	                                        J2dBenchmark.java 
	                                        JNIOverhead.java 
	                                        aicas.png 
Removed files:
	examples/gnu/classpath/examples/swing: FillRect.java 

Log message:
	2006-06-16  Francis Kung  <fkung@redhat.com>
	
		* examples/gnu/classpath/examples/swing/Demo.java:
		(mkButtonBar): Rename FillRect to JNIOverhead.
		(mkMenuBar): Rename FillRect to JNIOverhead.
		* examples/gnu/classpath/examples/swing/FillRect.java: Removed.
		* examples/gnu/classpath/examples/java2d/aicas.png: New file.
		* examples/gnu/classpath/examples/java2d/J2dBenchmark.java: New file.
		* examples/gnu/classpath/examples/java2d/JNIOverhead.java:
		Moved from old FillRect.
		* examples/gnu/classpath/examples/java2d/palme.java: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/swing/Demo.java?cvsroot=classpath&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/swing/FillRect.java?cvsroot=classpath&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/java2d/palme.gif?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/java2d/J2dBenchmark.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/java2d/JNIOverhead.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/java2d/aicas.png?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7856&r2=1.7857

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7856
retrieving revision 1.7857
diff -u -b -r1.7856 -r1.7857
--- ChangeLog	16 Jun 2006 20:37:34 -0000	1.7856
+++ ChangeLog	16 Jun 2006 20:46:54 -0000	1.7857
@@ -1,3 +1,13 @@
+2006-06-16  Francis Kung  <fkung@redhat.com>
+
+	* examples/gnu/classpath/examples/swing/Demo.java:
+	(mkButtonBar): Rename FillRect to JNIOverhead.
+	(mkMenuBar): Rename FillRect to JNIOverhead.
+	* examples/gnu/classpath/examples/swing/FillRect.java: Removed.
+	* examples/gnu/classpath/examples/java2d/J2dBenchmark.java: New file.
+	* examples/gnu/classpath/examples/java2d/JNIOverhead.java:
+	Moved from old FillRect.
+        
 2006-06-16  Tom Tromey  <tromey@redhat.com>
 
 	* tools/.cvsignore: Added new tool names.








From MAILER-DAEMON Fri Jun 16 23:56:25 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrRv7-0005Qj-2c
	for mharc-commit-classpath@gnu.org; Fri, 16 Jun 2006 23:56:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrRv5-0005Qb-IY
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 23:56:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrRv4-0005QH-Mf
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 23:56:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrRv4-0005Q8-Hh
	for commit-classpath@gnu.org; Fri, 16 Jun 2006 23:56:22 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrS4p-0007H7-R7
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 00:06:27 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrRv2-0005VB-00
	for <commit-classpath@gnu.org>; Fri, 16 Jun 2006 23:56:20 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FrRv1-0005V4-9k
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 03:56:20 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrRv1-0005V4-9k@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sat, 17 Jun 2006 03:56:19 +0000
Subject: [commit-cp] classpath ChangeLog gnu/javax/crypto/jce/cipher...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Jun 2006 03:56:24 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/17 03:56:19

Modified files:
	.              : ChangeLog 
	gnu/javax/crypto/jce/cipher: CipherAdapter.java 

Log message:
	2006-06-17  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		On behalf of Vivek Lakshmanan <vivekl@redhat.com>
		* gnu/javax/crypto/jce/cipher/CipherAdapter.java
		(engineInit(int, Key, SecureRandom)): Seperate common initialization logic
		into engineInitHandler and reuse the code in
		engineInit(int, Key, AlgorithmSpec, SecureRandom).
		(engineInitHandler): New method.
		(engineInit(int, Key, AlgorithmParameterSpec, SecureRandom)): When param is
		null, use random or default information when possible.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7857&r2=1.7858
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java?cvsroot=classpath&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7857
retrieving revision 1.7858
diff -u -b -r1.7857 -r1.7858
--- ChangeLog	16 Jun 2006 20:46:54 -0000	1.7857
+++ ChangeLog	17 Jun 2006 03:56:18 -0000	1.7858
@@ -1,3 +1,14 @@
+2006-06-17  Raif S. Naffah  <raif@swiftdsl.com.au>
+
+	On behalf of Vivek Lakshmanan <vivekl@redhat.com>
+	* gnu/javax/crypto/jce/cipher/CipherAdapter.java
+	(engineInit(int, Key, SecureRandom)): Seperate common initialization logic
+	into engineInitHandler and reuse the code in
+	engineInit(int, Key, AlgorithmSpec, SecureRandom).
+	(engineInitHandler): New method.
+	(engineInit(int, Key, AlgorithmParameterSpec, SecureRandom)): When param is
+	null, use random or default information when possible.
+
 2006-06-16  Francis Kung  <fkung@redhat.com>
 
 	* examples/gnu/classpath/examples/swing/Demo.java:

Index: gnu/javax/crypto/jce/cipher/CipherAdapter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/javax/crypto/jce/cipher/CipherAdapter.java	4 Jun 2006 06:57:26 -0000	1.3
+++ gnu/javax/crypto/jce/cipher/CipherAdapter.java	17 Jun 2006 03:56:18 -0000	1.4
@@ -38,6 +38,7 @@
 
 package gnu.javax.crypto.jce.cipher;
 
+import gnu.java.security.Registry;
 import gnu.javax.crypto.cipher.IBlockCipher;
 import gnu.javax.crypto.cipher.CipherFactory;
 import gnu.javax.crypto.jce.spec.BlockCipherParameterSpec;
@@ -246,6 +247,30 @@
   protected void engineInit(int opmode, Key key, SecureRandom random)
       throws InvalidKeyException
   {
+    try
+      {
+        engineInit(opmode, key, (AlgorithmParameterSpec) null, random);
+      }
+    catch (InvalidAlgorithmParameterException e)
+      {
+        throw new InvalidKeyException(e.getMessage(), e);
+      }
+  }
+
+  /**
+   * Executes initialization logic after all parameters have been handled by the
+   * engineInit()s.
+   * 
+   * @param opmode the desired mode of operation for this instance.
+   * @param key the key material to use for initialization.
+   * @param random a source of randmoness to use if/when needed.
+   * @throws InvalidKeyException if <code>key</code> is invalid or the cipher
+   *           needs extra parameters which can not be derived from
+   *           <code>key</code>; e.g. an IV.
+   */
+  private void engineInitHandler(int opmode, Key key, SecureRandom random)
+      throws InvalidKeyException
+  {
     switch (opmode)
       {
       case Cipher.ENCRYPT_MODE:
@@ -280,11 +305,29 @@
   {
     if (params == null)
       {
+        // All cipher modes require parameters (like an IV) except ECB. When
+        // these cant be derived from the given key then it must be generated
+        // randomly if in ENCRYPT or WRAP mode. Parameters that have defaults
+        // for our cipher must be set to these defaults.
+        if(! mode.name().toLowerCase().startsWith(Registry.ECB_MODE + "("))
+          {
+            switch (opmode)
+              {
+              case Cipher.ENCRYPT_MODE:
+              case Cipher.WRAP_MODE:
         byte[] iv = new byte[blockLen];
         random.nextBytes(iv);
         attributes.put(IMode.IV, iv);
+                break;
+              default:
+                throw new InvalidAlgorithmParameterException(
+                    "Required algorithm parameters are missing for mode: "
+                    + mode.name());
+              } 
+          }
+        // Add default for block length etc.
         blockLen = cipher.defaultBlockSize();
-        attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(blockLen));
+        attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, Integer.valueOf(blockLen));
         keyLen = 0;
       }
     else if (params instanceof BlockCipherParameterSpec)
@@ -304,7 +347,7 @@
         attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(blockLen));
         keyLen = 0;
       }
-    engineInit(opmode, key, random);
+    engineInitHandler(opmode, key, random);
   }
 
   protected void engineInit(int opmode, Key key, AlgorithmParameters params,



From MAILER-DAEMON Sat Jun 17 07:10:09 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrYgr-0007hl-4O
	for mharc-commit-classpath@gnu.org; Sat, 17 Jun 2006 07:10:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrYgp-0007fL-LD
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 07:10:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrYgo-0007d2-CY
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 07:10:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrYgo-0007cd-72
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 07:10:06 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrYqd-0001L6-Sh
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 07:20:16 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrYgn-0008UP-00
	for <commit-classpath@gnu.org>; Sat, 17 Jun 2006 07:10:05 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FrYgm-0008UM-Pk
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:10:05 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrYgm-0008UM-Pk@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sat, 17 Jun 2006 11:10:04 +0000
Subject: [commit-cp] classpath ChangeLog javax/management/DynamicMBe...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Jun 2006 11:10:07 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/17 11:10:04

Modified files:
	.              : ChangeLog 
	javax/management: DynamicMBean.java 
Added files:
	javax/management: MBeanFeatureInfo.java 

Log message:
	2006-06-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* javax/management/DynamicMBean.java:
		(setAttribute): Fixed to return void.
		* javax/management/MBeanFeatureInfo.java:
		New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7858&r2=1.7859
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/DynamicMBean.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/MBeanFeatureInfo.java?cvsroot=classpath&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7858
retrieving revision 1.7859
diff -u -b -r1.7858 -r1.7859
--- ChangeLog	17 Jun 2006 03:56:18 -0000	1.7858
+++ ChangeLog	17 Jun 2006 11:10:01 -0000	1.7859
@@ -1,3 +1,10 @@
+2006-06-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* javax/management/DynamicMBean.java:
+	(setAttribute): Fixed to return void.
+	* javax/management/MBeanFeatureInfo.java:
+	New file.
+	
 2006-06-17  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	On behalf of Vivek Lakshmanan <vivekl@redhat.com>
@@ -21345,8 +21352,3 @@
 	* java/net/InetAddress.java (getAllByName): use LOCALHOST if
 	localhost is null or is an empty string. Trim hostname before
 	lookup.
-
-
-Local Variables:
-coding: iso-latin-1-unix	
-End:

Index: javax/management/DynamicMBean.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/management/DynamicMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- javax/management/DynamicMBean.java	15 Jun 2006 21:18:54 -0000	1.1
+++ javax/management/DynamicMBean.java	17 Jun 2006 11:10:04 -0000	1.2
@@ -143,7 +143,7 @@
    *                             this exception.
    * @see #getAttribute(String)
    */
-  Object setAttribute(Attribute attribute)
+  void setAttribute(Attribute attribute)
     throws AttributeNotFoundException, InvalidAttributeValueException,
 	   MBeanException, ReflectionException;
 

Index: javax/management/MBeanFeatureInfo.java
===================================================================
RCS file: javax/management/MBeanFeatureInfo.java
diff -N javax/management/MBeanFeatureInfo.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/management/MBeanFeatureInfo.java	17 Jun 2006 11:10:04 -0000	1.1
@@ -0,0 +1,154 @@
+/* MBeanFeatureInfo.java -- Information about a bean feature.
+   Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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.management;
+
+import java.io.Serializable;
+
+/**
+ * A general superclass for the description of features
+ * of management beans.  This allows the user to access
+ * the feature dynamically, without knowing the details
+ * beforehand.  The information is immutable as standard.
+ * Of course, subclasses may change this, but this
+ * behaviour is not recommended.
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class MBeanFeatureInfo
+  implements Serializable
+{
+
+  /**
+   * Compatible with JDK 1.5
+   */
+  private static final long serialVersionUID = 3952882688968447265L;
+
+  /**
+   * A description of the feature in human-readable form.
+   * Subclasses should access this via the {@link #getDescription()}
+   * function rather than using the value directly.
+   *
+   * @serial a description of the feature.
+   */
+  protected String description;
+
+  /**
+   * The name of the feature.  Subclasses should access this
+   * via the {@link #getName()} function rather than using the
+   * value directly.
+   *
+   * @serial the name of the feature.
+   */
+  protected String name;
+
+  /**
+   * Constructs a new {@link MBeanFeatureInfo} with the specified
+   * name and description.
+   *
+   * @param name the name of the management bean feature.
+   * @param description the description of the feature.
+   */
+  public MBeanFeatureInfo(String name, String description)
+  {
+    this.name = name;
+    this.description = description;
+  }
+
+  /**
+   * Compares this feature with the supplied object.  This
+   * returns true iff the object is an instance of
+   * {@link MBeanFeatureInfo} and {@link Object#equals()}
+   * returns true for a comparison of both the name and
+   * description of this feature with that of the specified
+   * object.
+   *
+   * @param obj the object to compare.
+   * @return true if the object is a {@link MBeanFeatureInfo}
+   *         instance, 
+   *         <code>name.equals(object.getName())</code> and
+   *         <code>description.equals(object.getDescription</code>.
+   */
+  public boolean equals(Object obj)
+  {
+    if (obj instanceof MBeanFeatureInfo)
+      {
+	MBeanFeatureInfo o = (MBeanFeatureInfo) obj;
+	return ((name == null ? 
+		 o.getName() == null : 
+		 name.equals(o.getName())) &&
+		(description == null ?
+		 o.getDescription() == null :
+		 description.equals(o.getDescription())));
+      }
+    else
+      return false;
+  }
+
+  /**
+   * Returns a description of this feature.
+   *
+   * @return a human-readable description.
+   */
+  public String getDescription()
+  {
+    return description;
+  }
+
+  /**
+   * Returns the name of this feature.
+   *
+   * @return the name of the feature.
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * Returns the hashcode of the feature as
+   * the multiplication of the hashcodes of
+   * its name and description.
+   *
+   * @return the hashcode of this feature.
+   */
+  public int hashCode()
+  {
+    return name.hashCode() * description.hashCode();
+  }
+
+}



From MAILER-DAEMON Sat Jun 17 08:07:08 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrZa0-0008H7-BV
	for mharc-commit-classpath@gnu.org; Sat, 17 Jun 2006 08:07:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrZZw-0008Ct-6m
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 08:07:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrZZr-00088C-Tl
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 08:07:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrZZq-00087T-Nn
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 08:06:59 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrZjg-0002wu-6B
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 08:17:08 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrZZm-0001sk-00
	for <commit-classpath@gnu.org>; Sat, 17 Jun 2006 08:06:54 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FrZZm-0001sh-1E
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 12:06:54 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrZZm-0001sh-1E@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sat, 17 Jun 2006 12:06:54 +0000
Subject: [commit-cp] classpath gnu/java/security/x509X509Certificate...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Jun 2006 12:07:05 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/17 12:06:53

Modified files:
	gnu/java/security/x509: X509Certificate.java 
	gnu/javax/crypto/cipher: Twofish.java DES.java NullCipher.java 
	                         TripleDES.java Rijndael.java 
	                         Serpent.java Cast5.java Blowfish.java 
	                         Square.java Anubis.java Khazad.java 
	gnu/javax/crypto/keyring: PasswordProtectedEntry.java 
	                          PasswordEncryptedEntry.java 
	                          PasswordAuthenticatedEntry.java 
	                          EncryptedEntry.java 
	                          AuthenticatedEntry.java 
	gnu/java/security/util: Sequence.java 
	java/security/cert: X509CertSelector.java 
	gnu/javax/crypto/mode: EAX.java BaseMode.java 
	gnu/javax/crypto/jce/prng: ICMRandomSpi.java UMacRandomSpi.java 
	gnu/javax/crypto/sasl/srp: KDF.java 
	gnu/javax/crypto/jce: PBKDF2SecretKeyFactory.java 
	gnu/javax/crypto/jce/key: SecretKeyGeneratorImpl.java 
	gnu/javax/crypto/mac: UHash32.java UMac32.java 
	gnu/java/security/x509/ext: GeneralNames.java 
	gnu/java/security/jce/sig: EncodedKeyFactory.java 
	                           RSAKeyPairGeneratorSpi.java 
	                           DSSKeyPairGeneratorSpi.java 
	gnu/javax/crypto/jce/cipher: PBES2.java CipherAdapter.java 
	gnu/javax/crypto/prng: ICMGenerator.java UMacGenerator.java 
	gnu/javax/crypto/jce/sig: DHKeyPairGeneratorSpi.java 
	gnu/javax/security/auth/callback: ConsoleCallbackHandler.java 
	gnu/javax/crypto/assembly: ModeStage.java 

Log message:
	2006-06-17  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java:
		Use Integer.valueOf() instead of new Integer().
		* gnu/java/security/jce/sig/EncodedKeyFactory.java: Likewise.
		* gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java: Likewise.
		* gnu/java/security/util/Sequence.java: Likewise.
		* gnu/java/security/x509/ext/GeneralNames.java: Likewise.
		* gnu/java/security/x509/X509Certificate.java: Likewise.
		* gnu/javax/crypto/assembly/ModeStage.java: Likewise.
		* gnu/javax/crypto/cipher/Anubis.java: Likewise.
		* gnu/javax/crypto/cipher/Blowfish.java: Likewise.
		* gnu/javax/crypto/cipher/Cast5.java: Likewise.
		* gnu/javax/crypto/cipher/DES.java: Likewise.
		* gnu/javax/crypto/cipher/Khazad.java: Likewise.
		* gnu/javax/crypto/cipher/NullCipher.java: Likewise.
		* gnu/javax/crypto/cipher/Rijndael.java: Likewise.
		* gnu/javax/crypto/cipher/Serpent.java: Likewise.
		* gnu/javax/crypto/cipher/Square.java: Likewise.
		* gnu/javax/crypto/cipher/TripleDES.java: Likewise.
		* gnu/javax/crypto/cipher/Twofish.java: Likewise.
		* gnu/javax/crypto/jce/cipher/CipherAdapter.java: Likewise.
		* gnu/javax/crypto/jce/cipher/PBES2.java: Likewise.
		* gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java: Likewise.
		* gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java: Likewise.
		* gnu/javax/crypto/jce/prng/ICMRandomSpi.java: Likewise.
		* gnu/javax/crypto/jce/prng/UMacRandomSpi.java: Likewise.
		* gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java: Likewise.
		* gnu/javax/crypto/keyring/AuthenticatedEntry.java: Likewise.
		* gnu/javax/crypto/keyring/EncryptedEntry.java: Likewise.
		* gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java: Likewise.
		* gnu/javax/crypto/keyring/PasswordEncryptedEntry.java: Likewise.
		* gnu/javax/crypto/keyring/PasswordProtectedEntry.java: Likewise.
		* gnu/javax/crypto/mac/UHash32.java: Likewise.
		* gnu/javax/crypto/mac/UMac32.java: Likewise.
		* gnu/javax/crypto/mode/BaseMode.java: Likewise.
		* gnu/javax/crypto/mode/EAX.java: Likewise.
		* gnu/javax/crypto/prng/ICMGenerator.java: Likewise.
		* gnu/javax/crypto/prng/UMacGenerator.java: Likewise.
		* gnu/javax/crypto/sasl/srp/KDF.java: Likewise.
		* gnu/javax/security/auth/callback/ConsoleCallbackHandler.java: Likewise.
		* java/security/cert/X509CertSelector.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/X509Certificate.java?cvsroot=classpath&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Twofish.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/DES.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/NullCipher.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/TripleDES.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Rijndael.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Serpent.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Cast5.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Blowfish.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Square.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Anubis.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Khazad.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PasswordProtectedEntry.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/EncryptedEntry.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/Sequence.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/security/cert/X509CertSelector.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mode/EAX.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mode/BaseMode.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/srp/KDF.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mac/UHash32.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mac/UMac32.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/ext/GeneralNames.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/EncodedKeyFactory.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/PBES2.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/prng/ICMGenerator.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/prng/UMacGenerator.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/ModeStage.java?cvsroot=classpath&r1=1.2&r2=1.3

Patches:
Index: gnu/java/security/x509/X509Certificate.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/x509/X509Certificate.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gnu/java/security/x509/X509Certificate.java	23 Jan 2006 18:21:44 -0000	1.10
+++ gnu/java/security/x509/X509Certificate.java	17 Jun 2006 12:06:52 -0000	1.11
@@ -552,7 +552,7 @@
     // Certificate ::= SEQUENCE {
     DERValue cert = der.read();
     logger.log (Component.X509, "start Certificate  len == {0}",
-                new Integer (cert.getLength()));
+                Integer.valueOf(cert.getLength()));
 
     this.encoded = cert.getEncoded();
     if (!cert.isConstructed())
@@ -568,7 +568,7 @@
       }
     tbsCertBytes = tbsCert.getEncoded();
     logger.log (Component.X509, "start TBSCertificate  len == {0}",
-                new Integer (tbsCert.getLength()));
+                Integer.valueOf(tbsCert.getLength()));
 
     // Version ::= INTEGER [0] { v1(0), v2(1), v3(2) }
     DERValue val = der.read();
@@ -582,7 +582,7 @@
         version = 1;
       }
     logger.log (Component.X509, "read version == {0}",
-                new Integer (version));
+                Integer.valueOf(version));
 
     // SerialNumber ::= INTEGER
     serialNo = (BigInteger) val.getValue();
@@ -596,7 +596,7 @@
       }
     int certAlgLen = val.getLength();
     logger.log (Component.X509, "start AlgorithmIdentifier  len == {0}",
-                new Integer (certAlgLen));
+                Integer.valueOf(certAlgLen));
     val = der.read();
 
     //   algorithm    OBJECT IDENTIFIER,
@@ -677,20 +677,20 @@
       {
         val = der.read();
         logger.log (Component.X509, "start Extensions  len == {0}",
-                    new Integer (val.getLength()));
+                    Integer.valueOf(val.getLength()));
         int len = 0;
         while (len < val.getLength())
           {
             DERValue ext = der.read();
             logger.log (Component.X509, "start extension  len == {0}",
-                        new Integer (ext.getLength()));
+                        Integer.valueOf(ext.getLength()));
             Extension e = new Extension(ext.getEncoded());
             extensions.put(e.getOid(), e);
             der.skip(ext.getLength());
             len += ext.getEncodedLength();
             logger.log (Component.X509, "read extension {0} == {1}",
                         new Object[] { e.getOid (), e });
-            logger.log (Component.X509, "count == {0}", new Integer (len));
+            logger.log (Component.X509, "count == {0}", Integer.valueOf(len));
           }
 
         val = der.read ();
@@ -703,7 +703,7 @@
       }
     int sigAlgLen = val.getLength();
     logger.log (Component.X509, "start AlgorithmIdentifier  len == {0}",
-                new Integer (sigAlgLen));
+                Integer.valueOf(sigAlgLen));
     val = der.read();
     sigAlgId = (OID) val.getValue();
     logger.log (Component.X509, "read algorithm id == {0}", sigAlgId);

Index: gnu/javax/crypto/cipher/Twofish.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Twofish.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/javax/crypto/cipher/Twofish.java	11 Jun 2006 12:14:43 -0000	1.3
+++ gnu/javax/crypto/cipher/Twofish.java	17 Jun 2006 12:06:52 -0000	1.4
@@ -481,7 +481,7 @@
   public Iterator blockSizes()
   {
     ArrayList al = new ArrayList();
-    al.add(new Integer(DEFAULT_BLOCK_SIZE));
+    al.add(Integer.valueOf(DEFAULT_BLOCK_SIZE));
 
     return Collections.unmodifiableList(al).iterator();
   }
@@ -489,10 +489,10 @@
   public Iterator keySizes()
   {
     ArrayList al = new ArrayList();
-    al.add(new Integer(8)); //   64-bit
-    al.add(new Integer(16)); // 128-bit
-    al.add(new Integer(24)); // 192-bit
-    al.add(new Integer(32)); // 256-bit
+    al.add(Integer.valueOf(8)); //   64-bit
+    al.add(Integer.valueOf(16)); // 128-bit
+    al.add(Integer.valueOf(24)); // 192-bit
+    al.add(Integer.valueOf(32)); // 256-bit
 
     return Collections.unmodifiableList(al).iterator();
   }

Index: gnu/javax/crypto/cipher/DES.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/DES.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/cipher/DES.java	26 Jan 2006 02:25:08 -0000	1.1
+++ gnu/javax/crypto/cipher/DES.java	17 Jun 2006 12:06:52 -0000	1.2
@@ -725,12 +725,12 @@
 
   public Iterator blockSizes()
   {
-    return Collections.singleton(new Integer(BLOCK_SIZE)).iterator();
+    return Collections.singleton(Integer.valueOf(BLOCK_SIZE)).iterator();
   }
 
   public Iterator keySizes()
   {
-    return Collections.singleton(new Integer(KEY_SIZE)).iterator();
+    return Collections.singleton(Integer.valueOf(KEY_SIZE)).iterator();
   }
 
   public Object makeKey(byte[] kb, int bs) throws InvalidKeyException

Index: gnu/javax/crypto/cipher/NullCipher.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/NullCipher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/cipher/NullCipher.java	26 Jan 2006 02:25:08 -0000	1.1
+++ gnu/javax/crypto/cipher/NullCipher.java	17 Jun 2006 12:06:52 -0000	1.2
@@ -88,10 +88,10 @@
   public Iterator blockSizes()
   {
     ArrayList al = new ArrayList();
-    al.add(new Integer(64 / 8));
-    al.add(new Integer(128 / 8));
-    al.add(new Integer(192 / 8));
-    al.add(new Integer(256 / 8));
+    al.add(Integer.valueOf(64 / 8));
+    al.add(Integer.valueOf(128 / 8));
+    al.add(Integer.valueOf(192 / 8));
+    al.add(Integer.valueOf(256 / 8));
 
     return Collections.unmodifiableList(al).iterator();
   }
@@ -101,7 +101,7 @@
     ArrayList al = new ArrayList();
     for (int n = 8; n < 64; n++)
       {
-        al.add(new Integer(n));
+        al.add(Integer.valueOf(n));
       }
 
     return Collections.unmodifiableList(al).iterator();

Index: gnu/javax/crypto/cipher/TripleDES.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/TripleDES.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/cipher/TripleDES.java	26 Jan 2006 02:25:08 -0000	1.1
+++ gnu/javax/crypto/cipher/TripleDES.java	17 Jun 2006 12:06:52 -0000	1.2
@@ -141,12 +141,12 @@
 
   public Iterator blockSizes()
   {
-    return Collections.singleton(new Integer(BLOCK_SIZE)).iterator();
+    return Collections.singleton(Integer.valueOf(BLOCK_SIZE)).iterator();
   }
 
   public Iterator keySizes()
   {
-    return Collections.singleton(new Integer(KEY_SIZE)).iterator();
+    return Collections.singleton(Integer.valueOf(KEY_SIZE)).iterator();
   }
 
   public Object makeKey(byte[] kb, int bs) throws InvalidKeyException

Index: gnu/javax/crypto/cipher/Rijndael.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Rijndael.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/javax/crypto/cipher/Rijndael.java	11 Jun 2006 12:14:43 -0000	1.3
+++ gnu/javax/crypto/cipher/Rijndael.java	17 Jun 2006 12:06:52 -0000	1.4
@@ -611,9 +611,9 @@
   public Iterator blockSizes()
   {
     ArrayList al = new ArrayList();
-    al.add(new Integer(128 / 8));
-    al.add(new Integer(192 / 8));
-    al.add(new Integer(256 / 8));
+    al.add(Integer.valueOf(128 / 8));
+    al.add(Integer.valueOf(192 / 8));
+    al.add(Integer.valueOf(256 / 8));
 
     return Collections.unmodifiableList(al).iterator();
   }
@@ -621,9 +621,9 @@
   public Iterator keySizes()
   {
     ArrayList al = new ArrayList();
-    al.add(new Integer(128 / 8));
-    al.add(new Integer(192 / 8));
-    al.add(new Integer(256 / 8));
+    al.add(Integer.valueOf(128 / 8));
+    al.add(Integer.valueOf(192 / 8));
+    al.add(Integer.valueOf(256 / 8));
 
     return Collections.unmodifiableList(al).iterator();
   }

Index: gnu/javax/crypto/cipher/Serpent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Serpent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/cipher/Serpent.java	21 Apr 2006 10:52:26 -0000	1.2
+++ gnu/javax/crypto/cipher/Serpent.java	17 Jun 2006 12:06:52 -0000	1.3
@@ -130,15 +130,15 @@
 
   public Iterator blockSizes()
   {
-    return Collections.singleton(new Integer(DEFAULT_BLOCK_SIZE)).iterator();
+    return Collections.singleton(Integer.valueOf(DEFAULT_BLOCK_SIZE)).iterator();
   }
 
   public Iterator keySizes()
   {
     ArrayList keySizes = new ArrayList();
-    keySizes.add(new Integer(16));
-    keySizes.add(new Integer(24));
-    keySizes.add(new Integer(32));
+    keySizes.add(Integer.valueOf(16));
+    keySizes.add(Integer.valueOf(24));
+    keySizes.add(Integer.valueOf(32));
 
     return Collections.unmodifiableList(keySizes).iterator();
   }

Index: gnu/javax/crypto/cipher/Cast5.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Cast5.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/cipher/Cast5.java	21 Apr 2006 10:52:26 -0000	1.2
+++ gnu/javax/crypto/cipher/Cast5.java	17 Jun 2006 12:06:52 -0000	1.3
@@ -866,7 +866,7 @@
   public Iterator blockSizes()
   {
     ArrayList al = new ArrayList();
-    al.add(new Integer(DEFAULT_BLOCK_SIZE));
+    al.add(Integer.valueOf(DEFAULT_BLOCK_SIZE));
 
     return Collections.unmodifiableList(al).iterator();
   }
@@ -876,7 +876,7 @@
     ArrayList al = new ArrayList();
     for (int n = 5; n < 17; n++)
       {
-        al.add(new Integer(n));
+        al.add(Integer.valueOf(n));
       }
 
     return Collections.unmodifiableList(al).iterator();

Index: gnu/javax/crypto/cipher/Blowfish.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Blowfish.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/cipher/Blowfish.java	21 Apr 2006 10:52:26 -0000	1.2
+++ gnu/javax/crypto/cipher/Blowfish.java	17 Jun 2006 12:06:52 -0000	1.3
@@ -474,7 +474,7 @@
 
   public Iterator blockSizes()
   {
-    return Collections.singleton(new Integer(DEFAULT_BLOCK_SIZE)).iterator();
+    return Collections.singleton(Integer.valueOf(DEFAULT_BLOCK_SIZE)).iterator();
   }
 
   public Object makeKey(byte[] k, int bs)

Index: gnu/javax/crypto/cipher/Square.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Square.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/javax/crypto/cipher/Square.java	21 Apr 2006 10:52:26 -0000	1.3
+++ gnu/javax/crypto/cipher/Square.java	17 Jun 2006 12:06:52 -0000	1.4
@@ -411,7 +411,7 @@
   public Iterator blockSizes()
   {
     ArrayList al = new ArrayList();
-    al.add(new Integer(DEFAULT_BLOCK_SIZE));
+    al.add(Integer.valueOf(DEFAULT_BLOCK_SIZE));
 
     return Collections.unmodifiableList(al).iterator();
   }
@@ -419,7 +419,7 @@
   public Iterator keySizes()
   {
     ArrayList al = new ArrayList();
-    al.add(new Integer(DEFAULT_KEY_SIZE));
+    al.add(Integer.valueOf(DEFAULT_KEY_SIZE));
 
     return Collections.unmodifiableList(al).iterator();
   }

Index: gnu/javax/crypto/cipher/Anubis.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Anubis.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/javax/crypto/cipher/Anubis.java	11 Jun 2006 12:14:43 -0000	1.3
+++ gnu/javax/crypto/cipher/Anubis.java	17 Jun 2006 12:06:52 -0000	1.4
@@ -328,7 +328,7 @@
   public Iterator blockSizes()
   {
     ArrayList al = new ArrayList();
-    al.add(new Integer(DEFAULT_BLOCK_SIZE));
+    al.add(Integer.valueOf(DEFAULT_BLOCK_SIZE));
 
     return Collections.unmodifiableList(al).iterator();
   }
@@ -338,7 +338,7 @@
     ArrayList al = new ArrayList();
     for (int n = 4; n < 10; n++)
       {
-        al.add(new Integer(n * 32 / 8));
+        al.add(Integer.valueOf(n * 32 / 8));
       }
 
     return Collections.unmodifiableList(al).iterator();

Index: gnu/javax/crypto/cipher/Khazad.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Khazad.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/javax/crypto/cipher/Khazad.java	11 Jun 2006 12:14:43 -0000	1.3
+++ gnu/javax/crypto/cipher/Khazad.java	17 Jun 2006 12:06:52 -0000	1.4
@@ -328,7 +328,7 @@
   public Iterator blockSizes()
   {
     ArrayList al = new ArrayList();
-    al.add(new Integer(DEFAULT_BLOCK_SIZE));
+    al.add(Integer.valueOf(DEFAULT_BLOCK_SIZE));
 
     return Collections.unmodifiableList(al).iterator();
   }
@@ -336,7 +336,7 @@
   public Iterator keySizes()
   {
     ArrayList al = new ArrayList();
-    al.add(new Integer(DEFAULT_KEY_SIZE));
+    al.add(Integer.valueOf(DEFAULT_KEY_SIZE));
 
     return Collections.unmodifiableList(al).iterator();
   }

Index: gnu/javax/crypto/keyring/PasswordProtectedEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/PasswordProtectedEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/keyring/PasswordProtectedEntry.java	26 Jan 2006 02:25:09 -0000	1.1
+++ gnu/javax/crypto/keyring/PasswordProtectedEntry.java	17 Jun 2006 12:06:52 -0000	1.2
@@ -50,7 +50,7 @@
   /**
    * The iteration count for password-based KDFs.
    */
-  Integer ITERATION_COUNT = new Integer(1000);
+  Integer ITERATION_COUNT = Integer.valueOf(1000);
 
   // Method.
   // ------------------------------------------------------------------------

Index: gnu/javax/crypto/keyring/PasswordEncryptedEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/javax/crypto/keyring/PasswordEncryptedEntry.java	11 Jun 2006 12:14:43 -0000	1.4
+++ gnu/javax/crypto/keyring/PasswordEncryptedEntry.java	17 Jun 2006 12:06:52 -0000	1.5
@@ -313,7 +313,7 @@
       }
     HashMap modeAttr = new HashMap();
     modeAttr.put(IMode.KEY_MATERIAL, dk);
-    modeAttr.put(IMode.STATE, new Integer(state));
+    modeAttr.put(IMode.STATE, Integer.valueOf(state));
     modeAttr.put(IMode.IV, iv);
     try
       {

Index: gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java	11 Jun 2006 12:14:43 -0000	1.4
+++ gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java	17 Jun 2006 12:06:52 -0000	1.5
@@ -309,7 +309,7 @@
 
     HashMap macAttr = new HashMap();
     macAttr.put(IMac.MAC_KEY_MATERIAL, dk);
-    macAttr.put(IMac.TRUNCATED_SIZE, new Integer(maclen));
+    macAttr.put(IMac.TRUNCATED_SIZE, Integer.valueOf(maclen));
     try
       {
         mac.init(macAttr);

Index: gnu/javax/crypto/keyring/EncryptedEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/EncryptedEntry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/keyring/EncryptedEntry.java	4 Jun 2006 06:57:25 -0000	1.2
+++ gnu/javax/crypto/keyring/EncryptedEntry.java	17 Jun 2006 12:06:52 -0000	1.3
@@ -214,7 +214,7 @@
 
     HashMap modeAttr = new HashMap();
     modeAttr.put(IMode.KEY_MATERIAL, key);
-    modeAttr.put(IMode.STATE, new Integer(state));
+    modeAttr.put(IMode.STATE, Integer.valueOf(state));
     modeAttr.put(IMode.IV, iv);
     try
       {

Index: gnu/javax/crypto/keyring/AuthenticatedEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/keyring/AuthenticatedEntry.java	4 Jun 2006 06:57:25 -0000	1.2
+++ gnu/javax/crypto/keyring/AuthenticatedEntry.java	17 Jun 2006 12:06:52 -0000	1.3
@@ -210,7 +210,7 @@
 
     HashMap macAttr = new HashMap();
     macAttr.put(IMac.MAC_KEY_MATERIAL, key);
-    macAttr.put(IMac.TRUNCATED_SIZE, new Integer(maclen));
+    macAttr.put(IMac.TRUNCATED_SIZE, Integer.valueOf(maclen));
     mac.init(macAttr);
     return mac;
   }

Index: gnu/java/security/util/Sequence.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/util/Sequence.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/java/security/util/Sequence.java	26 Jan 2006 02:25:11 -0000	1.1
+++ gnu/java/security/util/Sequence.java	17 Jun 2006 12:06:52 -0000	1.2
@@ -105,11 +105,11 @@
       {
         if (start != end)
           {
-            sequence = new Integer[] { new Integer(start), new Integer(end) };
+            sequence = new Integer[] { Integer.valueOf(start), Integer.valueOf(end) };
           }
         else
           {
-            sequence = new Integer[] { new Integer(start) };
+            sequence = new Integer[] { Integer.valueOf(start) };
           }
       }
     else
@@ -117,9 +117,9 @@
         LinkedList l = new LinkedList();
         for (int i = start; i != end; i += span)
           {
-            l.add(new Integer(i));
+            l.add(Integer.valueOf(i));
           }
-        l.add(new Integer(end));
+        l.add(Integer.valueOf(end));
         sequence = (Integer[]) l.toArray(new Integer[l.size()]);
       }
   }

Index: java/security/cert/X509CertSelector.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/cert/X509CertSelector.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- java/security/cert/X509CertSelector.java	20 Mar 2006 23:57:04 -0000	1.7
+++ java/security/cert/X509CertSelector.java	17 Jun 2006 12:06:52 -0000	1.8
@@ -695,7 +695,7 @@
     if (altNames == null)
       altNames = new LinkedList();
     ArrayList l = new ArrayList(2);
-    l.add(new Integer(id));
+    l.add(Integer.valueOf(id));
     l.add(name);
     altNames.add(l);
   }
@@ -714,7 +714,7 @@
     if (altNames == null)
       altNames = new LinkedList();
     ArrayList l = new ArrayList(2);
-    l.add(new Integer(id));
+    l.add(Integer.valueOf(id));
     l.add(name);
     altNames.add(l);
   }

Index: gnu/javax/crypto/mode/EAX.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mode/EAX.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/mode/EAX.java	26 Jan 2006 02:25:09 -0000	1.1
+++ gnu/javax/crypto/mode/EAX.java	17 Jun 2006 12:06:52 -0000	1.2
@@ -200,12 +200,12 @@
     Integer modeSize = (Integer) attrib.get(MODE_BLOCK_SIZE);
     if (modeSize == null)
       {
-        modeSize = new Integer(cipherBlockSize);
+        modeSize = Integer.valueOf(cipherBlockSize);
       }
     HashMap ctrAttr = new HashMap();
     ctrAttr.put(KEY_MATERIAL, key);
     ctrAttr.put(IV, N);
-    ctrAttr.put(STATE, new Integer(ENCRYPTION));
+    ctrAttr.put(STATE, Integer.valueOf(ENCRYPTION));
     ctrAttr.put(MODE_BLOCK_SIZE, modeSize);
     ctr.reset();
     ctr.init(ctrAttr);

Index: gnu/javax/crypto/mode/BaseMode.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mode/BaseMode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/mode/BaseMode.java	4 Jun 2006 06:57:26 -0000	1.2
+++ gnu/javax/crypto/mode/BaseMode.java	17 Jun 2006 12:06:52 -0000	1.3
@@ -178,7 +178,7 @@
   public Iterator blockSizes()
   {
     ArrayList al = new ArrayList();
-    al.add(new Integer(cipherBlockSize));
+    al.add(Integer.valueOf(cipherBlockSize));
 
     return Collections.unmodifiableList(al).iterator();
   }
@@ -320,10 +320,10 @@
 
         Map map = new HashMap();
         map.put(KEY_MATERIAL, k);
-        map.put(CIPHER_BLOCK_SIZE, new Integer(cipherBlockSize));
-        map.put(STATE, new Integer(ENCRYPTION));
+        map.put(CIPHER_BLOCK_SIZE, Integer.valueOf(cipherBlockSize));
+        map.put(STATE, Integer.valueOf(ENCRYPTION));
         map.put(IV, iv);
-        map.put(MODE_BLOCK_SIZE, new Integer(bs));
+        map.put(MODE_BLOCK_SIZE, Integer.valueOf(bs));
 
         mode.reset();
         mode.init(map);
@@ -333,7 +333,7 @@
           }
 
         mode.reset();
-        map.put(STATE, new Integer(DECRYPTION));
+        map.put(STATE, Integer.valueOf(DECRYPTION));
         mode.init(map);
         for (i = 0; i < blockCount; i++)
           {

Index: gnu/javax/crypto/jce/prng/ICMRandomSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/jce/prng/ICMRandomSpi.java	11 Jun 2006 12:14:44 -0000	1.2
+++ gnu/javax/crypto/jce/prng/ICMRandomSpi.java	17 Jun 2006 12:06:52 -0000	1.3
@@ -107,7 +107,7 @@
       {
         ndxLen = rand.nextInt(limit + 1);
       }
-    attributes.put(ICMGenerator.SEGMENT_INDEX_LENGTH, new Integer(ndxLen));
+    attributes.put(ICMGenerator.SEGMENT_INDEX_LENGTH, Integer.valueOf(ndxLen));
     byte[] index = new byte[ndxLen];
     rand.nextBytes(index);
     attributes.put(ICMGenerator.SEGMENT_INDEX, new BigInteger(1, index));
@@ -220,7 +220,7 @@
     // use AES cipher with 128-bit block size
     attributes.put(ICMGenerator.CIPHER, Registry.AES_CIPHER);
     // use an index the size of quarter of an AES block
-    attributes.put(ICMGenerator.SEGMENT_INDEX_LENGTH, new Integer(4));
+    attributes.put(ICMGenerator.SEGMENT_INDEX_LENGTH, Integer.valueOf(4));
     // specify the key
     byte[] key = new byte[16];
     System.arraycopy(material, 0, key, 0, 16);

Index: gnu/javax/crypto/jce/prng/UMacRandomSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/jce/prng/UMacRandomSpi.java	11 Jun 2006 12:14:44 -0000	1.2
+++ gnu/javax/crypto/jce/prng/UMacRandomSpi.java	17 Jun 2006 12:06:52 -0000	1.3
@@ -90,7 +90,7 @@
     rand.nextBytes(key);
     attributes.put(IBlockCipher.KEY_MATERIAL, key);
     int index = rand.nextInt() & 0xFF;
-    attributes.put(UMacGenerator.INDEX, new Integer(index));
+    attributes.put(UMacGenerator.INDEX, Integer.valueOf(index));
 
     prng.setup(attributes);
   }
@@ -184,7 +184,7 @@
     System.arraycopy(material, 0, key, 0, 16);
     attributes.put(IBlockCipher.KEY_MATERIAL, key);
     // use a 1-byte index
-    attributes.put(UMacGenerator.INDEX, new Integer(material[16] & 0xFF));
+    attributes.put(UMacGenerator.INDEX, Integer.valueOf(material[16] & 0xFF));
 
     adaptee.init(attributes);
   }

Index: gnu/javax/crypto/sasl/srp/KDF.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/sasl/srp/KDF.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/sasl/srp/KDF.java	3 Feb 2006 19:29:01 -0000	1.2
+++ gnu/javax/crypto/sasl/srp/KDF.java	17 Jun 2006 12:06:53 -0000	1.3
@@ -88,8 +88,8 @@
     //      }
     final HashMap map = new HashMap();
     map.put(UMacGenerator.CIPHER, Registry.AES_CIPHER);
-    map.put(UMacGenerator.INDEX, new Integer(ndx));
-    map.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(AES_BLOCK_SIZE));
+    map.put(UMacGenerator.INDEX, Integer.valueOf(ndx));
+    map.put(IBlockCipher.CIPHER_BLOCK_SIZE, Integer.valueOf(AES_BLOCK_SIZE));
     final byte[] key = new byte[AES_KEY_SIZE];
     System.arraycopy(keyMaterial, 0, key, 0, AES_KEY_SIZE);
     map.put(IBlockCipher.KEY_MATERIAL, key);

Index: gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java	26 Jan 2006 02:25:08 -0000	1.1
+++ gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java	17 Jun 2006 12:06:53 -0000	1.2
@@ -97,7 +97,7 @@
       {
         ic = DEFAULT_ITERATION_COUNT;
       }
-    attr.put(IPBE.ITERATION_COUNT, new Integer(ic));
+    attr.put(IPBE.ITERATION_COUNT, Integer.valueOf(ic));
     kdf.init(attr);
     int len = ((PBEKeySpec) spec).getKeyLength();
     if (len <= 0)

Index: gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java	26 Jan 2006 02:25:08 -0000	1.1
+++ gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java	17 Jun 2006 12:06:53 -0000	1.2
@@ -106,7 +106,7 @@
   protected void engineInit (int keySize, SecureRandom random)
   {
     keySize >>>= 3; // Use bytes.
-    if (!keySizes.contains (new Integer (keySize)))
+    if (! keySizes.contains(Integer.valueOf(keySize)))
       throw new InvalidParameterException ("unsupported key size: " + keySize);
     currentKeySize = keySize;
     this.random = random;

Index: gnu/javax/crypto/mac/UHash32.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mac/UHash32.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/mac/UHash32.java	26 Jan 2006 02:25:09 -0000	1.1
+++ gnu/javax/crypto/mac/UHash32.java	17 Jun 2006 12:06:53 -0000	1.2
@@ -261,13 +261,13 @@
     IRandom kdf4 = new UMacGenerator();
     Map map = new HashMap();
     map.put(IBlockCipher.KEY_MATERIAL, K);
-    map.put(UMacGenerator.INDEX, new Integer(0));
+    map.put(UMacGenerator.INDEX, Integer.valueOf(0));
     kdf1.init(map);
-    map.put(UMacGenerator.INDEX, new Integer(1));
+    map.put(UMacGenerator.INDEX, Integer.valueOf(1));
     kdf2.init(map);
-    map.put(UMacGenerator.INDEX, new Integer(2));
+    map.put(UMacGenerator.INDEX, Integer.valueOf(2));
     kdf3.init(map);
-    map.put(UMacGenerator.INDEX, new Integer(3));
+    map.put(UMacGenerator.INDEX, Integer.valueOf(3));
     kdf4.init(map);
 
     // need to generate all bytes for use later in a Toepliz construction

Index: gnu/javax/crypto/mac/UMac32.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mac/UMac32.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/mac/UMac32.java	21 Apr 2006 10:52:26 -0000	1.2
+++ gnu/javax/crypto/mac/UMac32.java	17 Jun 2006 12:06:53 -0000	1.3
@@ -447,7 +447,7 @@
     Map map = new HashMap();
     map.put(IBlockCipher.KEY_MATERIAL, K);
     //      map.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(128/8));
-    map.put(UMacGenerator.INDEX, new Integer(128));
+    map.put(UMacGenerator.INDEX, Integer.valueOf(128));
     //      map.put(UMacGenerator.CIPHER, Registry.AES_CIPHER);
     kdf.init(map);
     byte[] Kp = new byte[KEY_LEN];

Index: gnu/java/security/x509/ext/GeneralNames.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/x509/ext/GeneralNames.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/java/security/x509/ext/GeneralNames.java	4 Jun 2006 05:29:43 -0000	1.5
+++ gnu/java/security/x509/ext/GeneralNames.java	17 Jun 2006 12:06:53 -0000	1.6
@@ -90,7 +90,7 @@
         int tagClass = name.getTagClass();
         if (tagClass != DER.CONTEXT)
           throw new IOException("malformed GeneralName: Tag class is " + tagClass);
-        namePair.add(new Integer(name.getTag()));
+        namePair.add(Integer.valueOf(name.getTag()));
         DERValue val = null;
         switch (name.getTag())
           {

Index: gnu/java/security/jce/sig/EncodedKeyFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/jce/sig/EncodedKeyFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnu/java/security/jce/sig/EncodedKeyFactory.java	11 Jun 2006 12:14:44 -0000	1.6
+++ gnu/java/security/jce/sig/EncodedKeyFactory.java	17 Jun 2006 12:06:53 -0000	1.7
@@ -365,7 +365,7 @@
     BigInteger p = spec.getP();
     BigInteger g = spec.getG();
     BigInteger y = spec.getY();
-    Object[] params = new Object[] {new Integer(Registry.X509_ENCODING_ID),
+    Object[] params = new Object[] {Integer.valueOf(Registry.X509_ENCODING_ID),
                                     null, p, g, y};
     Object obj = invokeConstructor("gnu.javax.crypto.key.dh.GnuDHPublicKey",
                                    params);
@@ -435,7 +435,7 @@
     BigInteger p = spec.getP();
     BigInteger g = spec.getG();
     BigInteger x = spec.getX();
-    Object[] params = new Object[] {new Integer(Registry.PKCS8_ENCODING_ID),
+    Object[] params = new Object[] {Integer.valueOf(Registry.PKCS8_ENCODING_ID),
                                     null, p, g, x};
     Object obj = invokeConstructor("gnu.javax.crypto.key.dh.GnuDHPrivateKey",
                                    params);

Index: gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java	9 Feb 2006 11:52:48 -0000	1.2
+++ gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java	17 Jun 2006 12:06:53 -0000	1.3
@@ -78,14 +78,14 @@
   public void initialize(int keysize, SecureRandom random)
   {
     HashMap attributes = new HashMap();
-    attributes.put(RSAKeyPairGenerator.MODULUS_LENGTH, new Integer(keysize));
+    attributes.put(RSAKeyPairGenerator.MODULUS_LENGTH, Integer.valueOf(keysize));
     if (random != null)
       {
         attributes.put(RSAKeyPairGenerator.SOURCE_OF_RANDOMNESS, random);
       }
 
     attributes.put(RSAKeyPairGenerator.PREFERRED_ENCODING_FORMAT,
-                   new Integer(Registry.ASN1_ENCODING_ID));
+                   Integer.valueOf(Registry.ASN1_ENCODING_ID));
     adaptee.setup(attributes);
   }
 
@@ -109,7 +109,7 @@
       }
 
     attributes.put(RSAKeyPairGenerator.PREFERRED_ENCODING_FORMAT,
-                   new Integer(Registry.ASN1_ENCODING_ID));
+                   Integer.valueOf(Registry.ASN1_ENCODING_ID));
     adaptee.setup(attributes);
   }
 }

Index: gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java	26 Mar 2006 22:57:46 -0000	1.4
+++ gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java	17 Jun 2006 12:06:53 -0000	1.5
@@ -104,7 +104,7 @@
       }
 
     attributes.put(DSSKeyPairGenerator.PREFERRED_ENCODING_FORMAT,
-                   new Integer(Registry.ASN1_ENCODING_ID));
+                   Integer.valueOf(Registry.ASN1_ENCODING_ID));
     try
       {
         adaptee.setup(attributes);
@@ -144,7 +144,7 @@
       throws InvalidParameterException
   {
     HashMap attributes = new HashMap();
-    attributes.put(DSSKeyPairGenerator.MODULUS_LENGTH, new Integer(modlen));
+    attributes.put(DSSKeyPairGenerator.MODULUS_LENGTH, Integer.valueOf(modlen));
     if (random != null)
       attributes.put(DSSKeyPairGenerator.SOURCE_OF_RANDOMNESS, random);
 
@@ -152,7 +152,7 @@
                    Boolean.valueOf(!genParams));
     attributes.put(DSSKeyPairGenerator.STRICT_DEFAULTS, Boolean.TRUE);
     attributes.put(DSSKeyPairGenerator.PREFERRED_ENCODING_FORMAT,
-                   new Integer(Registry.ASN1_ENCODING_ID));
+                   Integer.valueOf(Registry.ASN1_ENCODING_ID));
     try
       {
         adaptee.setup(attributes);

Index: gnu/javax/crypto/jce/cipher/PBES2.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/cipher/PBES2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/jce/cipher/PBES2.java	13 Apr 2006 21:07:02 -0000	1.2
+++ gnu/javax/crypto/jce/cipher/PBES2.java	17 Jun 2006 12:06:53 -0000	1.3
@@ -121,7 +121,7 @@
         throw new IllegalArgumentException("no such KDF: PBKDF2-" + macName);
       }
     HashMap attrib = new HashMap();
-    attrib.put(IPBE.ITERATION_COUNT, new Integer(key.getIterationCount()));
+    attrib.put(IPBE.ITERATION_COUNT, Integer.valueOf(key.getIterationCount()));
     attrib.put(IPBE.PASSWORD, key.getPassword());
     attrib.put(IPBE.SALT, key.getSalt());
     try

Index: gnu/javax/crypto/jce/cipher/CipherAdapter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/javax/crypto/jce/cipher/CipherAdapter.java	17 Jun 2006 03:56:18 -0000	1.4
+++ gnu/javax/crypto/jce/cipher/CipherAdapter.java	17 Jun 2006 12:06:53 -0000	1.5
@@ -132,7 +132,7 @@
     attributes = new HashMap();
     this.blockLen = blockLen;
     mode = ModeFactory.getInstance("ECB", cipher, blockLen);
-    attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(blockLen));
+    attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, Integer.valueOf(blockLen));
   }
 
   /**
@@ -146,7 +146,7 @@
     blockLen = cipher.defaultBlockSize();
     attributes = new HashMap();
     mode = ModeFactory.getInstance("ECB", cipher, blockLen);
-    attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(blockLen));
+    attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, Integer.valueOf(blockLen));
   }
 
   // Instance methods implementing javax.crypto.CipherSpi.
@@ -162,7 +162,7 @@
             try
               {
                 int bs = Integer.parseInt(modeName.substring(3));
-                attributes.put(IMode.MODE_BLOCK_SIZE, new Integer(bs / 8));
+                attributes.put(IMode.MODE_BLOCK_SIZE, Integer.valueOf(bs / 8));
               }
             catch (NumberFormatException nfe)
               {
@@ -274,10 +274,10 @@
     switch (opmode)
       {
       case Cipher.ENCRYPT_MODE:
-        attributes.put(IMode.STATE, new Integer(IMode.ENCRYPTION));
+        attributes.put(IMode.STATE, Integer.valueOf(IMode.ENCRYPTION));
         break;
       case Cipher.DECRYPT_MODE:
-        attributes.put(IMode.STATE, new Integer(IMode.DECRYPTION));
+        attributes.put(IMode.STATE, Integer.valueOf(IMode.DECRYPTION));
         break;
       }
     if (!key.getFormat().equalsIgnoreCase("RAW"))
@@ -332,10 +332,8 @@
       }
     else if (params instanceof BlockCipherParameterSpec)
       {
-        attributes.put(
-                       IBlockCipher.CIPHER_BLOCK_SIZE,
-                       new Integer(
-                                   ((BlockCipherParameterSpec) params).getBlockSize()));
+        attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE,
+                       Integer.valueOf(((BlockCipherParameterSpec) params).getBlockSize()));
         attributes.put(IMode.IV, ((BlockCipherParameterSpec) params).getIV());
         keyLen = ((BlockCipherParameterSpec) params).getKeySize();
         blockLen = ((BlockCipherParameterSpec) params).getBlockSize();
@@ -344,7 +342,7 @@
       {
         attributes.put(IMode.IV, ((IvParameterSpec) params).getIV());
         blockLen = cipher.defaultBlockSize();
-        attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(blockLen));
+        attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, Integer.valueOf(blockLen));
         keyLen = 0;
       }
     engineInitHandler(opmode, key, random);

Index: gnu/javax/crypto/prng/ICMGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/prng/ICMGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/prng/ICMGenerator.java	13 Apr 2006 21:07:03 -0000	1.2
+++ gnu/javax/crypto/prng/ICMGenerator.java	17 Jun 2006 12:06:53 -0000	1.3
@@ -214,7 +214,7 @@
     HashMap map = new HashMap();
     if (cipherBlockSize != 0)
       { // only needed if new or changed
-        map.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(cipherBlockSize));
+        map.put(IBlockCipher.CIPHER_BLOCK_SIZE, Integer.valueOf(cipherBlockSize));
       }
     map.put(IBlockCipher.KEY_MATERIAL, key);
     try

Index: gnu/javax/crypto/prng/UMacGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/prng/UMacGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/prng/UMacGenerator.java	26 Jan 2006 02:25:09 -0000	1.1
+++ gnu/javax/crypto/prng/UMacGenerator.java	17 Jun 2006 12:06:53 -0000	1.2
@@ -198,7 +198,7 @@
     Map map = new HashMap();
     if (cipherBlockSize != 0)
       { // only needed if new or changed
-        map.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(cipherBlockSize));
+        map.put(IBlockCipher.CIPHER_BLOCK_SIZE, Integer.valueOf(cipherBlockSize));
       }
     map.put(IBlockCipher.KEY_MATERIAL, key);
     try

Index: gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java	22 Apr 2006 17:57:19 -0000	1.2
+++ gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java	17 Jun 2006 12:06:53 -0000	1.3
@@ -61,12 +61,12 @@
   public void initialize(int keysize, SecureRandom random)
   {
     HashMap attributes = new HashMap();
-    attributes.put(GnuDHKeyPairGenerator.PRIME_SIZE, new Integer(keysize));
+    attributes.put(GnuDHKeyPairGenerator.PRIME_SIZE, Integer.valueOf(keysize));
     if (random != null)
       attributes.put(GnuDHKeyPairGenerator.SOURCE_OF_RANDOMNESS, random);
 
     attributes.put(GnuDHKeyPairGenerator.PREFERRED_ENCODING_FORMAT,
-                   new Integer(Registry.ASN1_ENCODING_ID));
+                   Integer.valueOf(Registry.ASN1_ENCODING_ID));
     adaptee.setup(attributes);
   }
 
@@ -87,7 +87,7 @@
       attributes.put(GnuDHKeyPairGenerator.SOURCE_OF_RANDOMNESS, random);
 
     attributes.put(GnuDHKeyPairGenerator.PREFERRED_ENCODING_FORMAT,
-                   new Integer(Registry.ASN1_ENCODING_ID));
+                   Integer.valueOf(Registry.ASN1_ENCODING_ID));
     adaptee.setup(attributes);
   }
 }

Index: gnu/javax/security/auth/callback/ConsoleCallbackHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/security/auth/callback/ConsoleCallbackHandler.java	29 Apr 2006 07:19:44 -0000	1.2
+++ gnu/javax/security/auth/callback/ConsoleCallbackHandler.java	17 Jun 2006 12:06:53 -0000	1.3
@@ -137,7 +137,7 @@
             {
               if (choices[i].equals(replies[j]))
                 {
-                  indices.add(new Integer(i));
+                  indices.add(Integer.valueOf(i));
                 }
             }
         if (indices.size() == 0)

Index: gnu/javax/crypto/assembly/ModeStage.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/assembly/ModeStage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/assembly/ModeStage.java	13 Apr 2006 21:07:02 -0000	1.2
+++ gnu/javax/crypto/assembly/ModeStage.java	17 Jun 2006 12:06:53 -0000	1.3
@@ -99,7 +99,7 @@
   {
     Direction flow = (Direction) attributes.get(DIRECTION);
     attributes.put(IMode.STATE,
-                   new Integer(flow.equals(forward) ? IMode.ENCRYPTION
+                   Integer.valueOf(flow.equals(forward) ? IMode.ENCRYPTION
                                                    : IMode.DECRYPTION));
 
     delegate.init(attributes);



From MAILER-DAEMON Sat Jun 17 11:43:07 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Frcx1-0007mw-OO
	for mharc-commit-classpath@gnu.org; Sat, 17 Jun 2006 11:43:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Frcx0-0007l4-BD
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:43:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Frcwz-0007ko-Rz
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:43:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Frcwz-0007kl-MG
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:43:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Frd6r-0005tW-Vj
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:53:18 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Frcwz-0001Ua-00
	for <commit-classpath@gnu.org>; Sat, 17 Jun 2006 11:43:05 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Frcwy-0001UX-Jy
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 15:43:04 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Frcwy-0001UX-Jy@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Sat, 17 Jun 2006 15:43:04 +0000
Subject: [commit-cp] classpath ChangeLog lib/gen-classlist.sh.in
	[generics-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Jun 2006 15:43:06 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics-branch
Changes by:	Tom Tromey <tromey>	06/06/17 15:43:02

Modified files:
	.              : ChangeLog 
	lib            : gen-classlist.sh.in 

Log message:
		* lib/gen-classlist.sh.in: Search all top-level directories, not
		just 'org', in external.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.274&r2=1.2386.2.275
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/gen-classlist.sh.in?cvsroot=classpath&only_with_tag=generics-branch&r1=1.12.2.15&r2=1.12.2.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.274
retrieving revision 1.2386.2.275
diff -u -b -r1.2386.2.274 -r1.2386.2.275
--- ChangeLog	16 Jun 2006 22:16:36 -0000	1.2386.2.274
+++ ChangeLog	17 Jun 2006 15:42:59 -0000	1.2386.2.275
@@ -1,3 +1,8 @@
+2006-06-17  Tom Tromey  <tromey@redhat.com>
+
+	* lib/gen-classlist.sh.in: Search all top-level directories, not
+	just 'org', in external.
+
 2006-06-16  Keith Seitz  <keiths@redhat.com>
 
 	* gnu/classpath/jdwp/event/EventManager.java (getDefault): Redo

Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.12.2.15
retrieving revision 1.12.2.16
diff -u -b -r1.12.2.15 -r1.12.2.16
--- lib/gen-classlist.sh.in	16 Jun 2006 18:04:09 -0000	1.12.2.15
+++ lib/gen-classlist.sh.in	17 Jun 2006 15:43:02 -0000	1.12.2.16
@@ -25,7 +25,6 @@
  done) > ${top_builddir}/lib/classes.1
 
 # The same, but for the external code.
-# Right now all external code is in org/.
 for dir in \
    @top_srcdir@/external/w3c_dom \
    @top_srcdir@/external/sax \
@@ -33,10 +32,14 @@
    @top_srcdir@/external/jsr166 \
    ; do
   (cd $dir
-  @FIND@ org -follow -name '*.java' -print |
+   for subdir in java javax gnu org sun; do
+      if test -d $subdir; then
+	 @FIND@ $subdir -follow -name '*.java' -print |
   sort -r | sed -e 's,/\([^/]*\)$, \1,' |
   while read pkg file; do
      echo $pkg $dir $pkg/$file
+	 done
+      fi
   done)
 done >> ${top_builddir}/lib/classes.1
 



From MAILER-DAEMON Sat Jun 17 11:45:57 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Frczl-0001wI-D8
	for mharc-commit-classpath@gnu.org; Sat, 17 Jun 2006 11:45:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Frczk-0001uf-1r
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:45:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Frczi-0001sp-NL
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:45:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Frczi-0001sa-5Y
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:45:54 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Frd9a-000657-HF
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:56:06 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Frczg-0001Wo-00
	for <commit-classpath@gnu.org>; Sat, 17 Jun 2006 11:45:52 -0400
Received: from mkoch by savannah.gnu.org with local (Exim 4.50)
	id 1Frczg-0001Wl-QM
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 15:45:52 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Frczg-0001Wl-QM@savannah.gnu.org>
From: Michael Koch <konqueror@gmx.de>
Date: Sat, 17 Jun 2006 15:45:52 +0000
Subject: [commit-cp] classpath/gnu/java/util/prefs/gconf
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Jun 2006 15:45:56 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Michael Koch <mkoch>	06/06/17 15:45:52

New directory:
	gnu/java/util/prefs/gconf

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/util/prefs/gconf/?cvsroot=classpath



From MAILER-DAEMON Sat Jun 17 11:45:57 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Frczl-0001w1-84
	for mharc-commit-classpath@gnu.org; Sat, 17 Jun 2006 11:45:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Frczj-0001u5-GK
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:45:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Frczi-0001sx-Kk
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:45:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Frczi-0001sq-Ce
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:45:54 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Frd9a-000658-OA
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:56:06 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Frczh-0001Wu-00
	for <commit-classpath@gnu.org>; Sat, 17 Jun 2006 11:45:53 -0400
Received: from mkoch by savannah.gnu.org with local (Exim 4.50)
	id 1Frczh-0001Wq-45
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 15:45:53 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Frczh-0001Wq-45@savannah.gnu.org>
From: Michael Koch <konqueror@gmx.de>
Date: Sat, 17 Jun 2006 15:45:53 +0000
Subject: [commit-cp] classpath/native/jni/gconf-peer
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Jun 2006 15:45:56 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Michael Koch <mkoch>	06/06/17 15:45:53

New directory:
	native/jni/gconf-peer

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gconf-peer/?cvsroot=classpath



From MAILER-DAEMON Sat Jun 17 11:53:43 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Frd7H-0005iA-FK
	for mharc-commit-classpath@gnu.org; Sat, 17 Jun 2006 11:53:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Frd7G-0005i4-97
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:53:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Frd7D-0005hs-V2
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:53:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Frd7D-0005hp-Oy
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 11:53:39 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrdH5-0006q6-Lf
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 12:03:52 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Frd7C-0001bb-00
	for <commit-classpath@gnu.org>; Sat, 17 Jun 2006 11:53:38 -0400
Received: from mkoch by savannah.gnu.org with local (Exim 4.50)
	id 1Frd7B-0001bY-G8
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 15:53:38 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Frd7B-0001bY-G8@savannah.gnu.org>
From: Michael Koch <konqueror@gmx.de>
Date: Sat, 17 Jun 2006 15:53:37 +0000
Subject: [commit-cp] classpath ChangeLog configure.ac include/Makefi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Jun 2006 15:53:42 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Michael Koch <mkoch>	06/06/17 15:53:37

Modified files:
	.              : ChangeLog configure.ac 
	include        : Makefile.am 
	native/jni     : Makefile.am 
	scripts        : check_jni_methods.sh 
Added files:
	gnu/java/util/prefs: GConfBasedFactory.java 
	                     GConfBasedPreferences.java 
	gnu/java/util/prefs/gconf: GConfNativePeer.java 
	include        : gnu_java_util_prefs_gconf_GConfNativePeer.h 
	native/jni/gconf-peer: GConfNativePeer.c Makefile.am 

Log message:
	2006-0-12  Mario torre  <neugens at limasoftware.net>
	
	       * gnu/java/util/prefs/GConfBasedPreferences.java: new class.
	       * gnu/java/util/prefs/GConfBasedFactory.java: new class.
	       * gnu/java/util/prefs/gconf/GConfNativePeer.java: new class.
	       * gnu_java_util_prefs_gconf_GConfNativePeer.h: generated
	       header file.
	       * classpath/native/jni/gconf-peer/GConfNativePeer.c: new C file. +       * configure.ac: update to introduce new files. Added options
	       to build gconf native peer used by the GConf preference backend.
	       * include/Makefile.am: update to introduce new files.
	       * native/jni/Makefile.am update to introduce new files.
	       * scripts/check_jni_methods.sh: added three new ignored file
	       from check.
	       * native/jni/gconf-peer/Makefile.am: new Makefile needed to
	       build gconf-peer shared library.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7859&r2=1.7860
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&r1=1.162&r2=1.163
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/util/prefs/GConfBasedFactory.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/util/prefs/GConfBasedPreferences.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/util/prefs/gconf/GConfNativePeer.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/include/Makefile.am?cvsroot=classpath&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_util_prefs_gconf_GConfNativePeer.h?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/Makefile.am?cvsroot=classpath&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gconf-peer/GConfNativePeer.c?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gconf-peer/Makefile.am?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/scripts/check_jni_methods.sh?cvsroot=classpath&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7859
retrieving revision 1.7860
diff -u -b -r1.7859 -r1.7860
--- ChangeLog	17 Jun 2006 11:10:01 -0000	1.7859
+++ ChangeLog	17 Jun 2006 15:53:36 -0000	1.7860
@@ -1,3 +1,20 @@
+2006-0-12  Mario torre  <neugens at limasoftware.net>
+
+	* gnu/java/util/prefs/GConfBasedPreferences.java: new class.
+	* gnu/java/util/prefs/GConfBasedFactory.java: new class.
+	* gnu/java/util/prefs/gconf/GConfNativePeer.java: new class.
+	* gnu_java_util_prefs_gconf_GConfNativePeer.h: generated
+	header file.
+	* classpath/native/jni/gconf-peer/GConfNativePeer.c: new C file.
+	* configure.ac: update to introduce new files. Added options
+	to build gconf native peer used by the GConf preference backend.
+	* include/Makefile.am: update to introduce new files.
+	* native/jni/Makefile.am update to introduce new files.
+	* scripts/check_jni_methods.sh: added three new ignored file
+	from check.
+	* native/jni/gconf-peer/Makefile.am: new Makefile needed to
+	build gconf-peer shared library.
+
 2006-06-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* javax/management/DynamicMBean.java:

Index: configure.ac
===================================================================
RCS file: /sources/classpath/classpath/configure.ac,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -b -r1.162 -r1.163
--- configure.ac	15 Jun 2006 23:08:48 -0000	1.162
+++ configure.ac	17 Jun 2006 15:53:36 -0000	1.163
@@ -82,6 +82,25 @@
               [COMPILE_CORE_JNI=yes])
 AM_CONDITIONAL(CREATE_CORE_JNI_LIBRARIES, test "x${COMPILE_CORE_JNI}" = xyes)
 
+dnl -----------------------------------------------------------
+dnl GConf native peer (enabled by default)
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE([gconf-peer],
+              [AS_HELP_STRING(--disable-gconf-peer,compile GConf native peers (disabled by --disable-jni) [default=yes])],
+              [case "${enableval}" in
+                yes) COMPILE_GCONF_PEER=yes ;;
+                no) COMPILE_GCONF_PEER=no ;;
+                *) COMPILE_GCONF_PEER=yes ;;
+              esac],
+              [COMPILE_GCONF_PEER=yes])
+AM_CONDITIONAL(CREATE_GCONF_PEER_LIBRARIES, test "x${COMPILE_GCONF_PEER}" = xyes)
+
+dnl -----------------------------------------------------------
+dnl GTK native peer error checking
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE([gconf-peers],,AC_MSG_ERROR([No --enable-gconf-peers (or --disable-gconf-peers) option; you want --enable-gconf-peer]))
+
+
 dnl ------------------------------------------------------------
 dnl Whether to compile with -Werror or not (disabled by default)
 dnl ------------------------------------------------------------
@@ -432,6 +451,13 @@
     AC_SUBST(XTEST_LIBS)
   fi
 
+  dnl gconf-peer
+  if  test "x${COMPILE_GCONF_PEER}" = xyes; then
+    PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.11.2)
+    AC_SUBST(GCONF_CFLAGS)
+    AC_SUBST(GCONF_LIBS)
+  fi
+
   dnl Check for AWT related Qt4
   if test "x${COMPILE_QT_PEER}" = xyes; then
     PKG_CHECK_MODULES(QT, QtCore QtGui >= 4.1.0, HAVE_QT4="yes", HAVE_QT4="no")
@@ -719,6 +745,7 @@
 native/jni/java-nio/Makefile
 native/jni/java-util/Makefile
 native/jni/gtk-peer/Makefile
+native/jni/gconf-peer/Makefile
 native/jni/qt-peer/Makefile
 native/jni/xmlj/Makefile
 native/jni/midi-alsa/Makefile

Index: include/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/include/Makefile.am,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- include/Makefile.am	7 Jun 2006 13:54:32 -0000	1.64
+++ include/Makefile.am	17 Jun 2006 15:53:36 -0000	1.65
@@ -117,11 +117,15 @@
 $(top_srcdir)/include/gnu_java_awt_peer_qt_QtContainerPeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h 
 
+GCONF_PREFS_FILES = \
+$(top_srcdir)/include/gnu_java_util_prefs_gconf_GConfNativePeer.h
+
 H_FILES = \
 $(SOUND_H_FILES) \
 $(XMLJ_H_FILES) \
 $(GTKPEER_H_FILES) \
 $(QTPEER_H_FILES) \
+$(GCONF_PREFS_FILES) \
 $(top_srcdir)/include/gnu_java_net_VMPlainDatagramSocketImpl.h \
 $(top_srcdir)/include/gnu_java_net_VMPlainSocketImpl.h \
 $(top_srcdir)/include/gnu_java_net_local_LocalSocketImpl.h \
@@ -172,6 +176,9 @@
 $(top_srcdir)/include/gnu_javax_sound_midi_dssi_%.h: $(top_builddir)/$(CLASSDIR)/gnu/javax/sound/midi/dssi/%.class
 	$(JAVAH) -o $@ gnu.javax.sound.midi.dssi.$*
 
+$(top_srcdir)/include/gnu_java_util_prefs_gconf_%.h: $(top_builddir)/$(CLASSDIR)/java/util/prefs/gconf/%.class
+	$(JAVAH) -o $@ gnu.java.util.prefs.gconf.$*
+
 $(top_srcdir)/include/gnu_java_net_VMPlainDatagramSocketImpl.h: $(top_srcdir)/vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java
 	$(JAVAH) -o $@ gnu.java.net.VMPlainDatagramSocketImpl
 $(top_srcdir)/include/gnu_java_net_VMPlainSocketImpl.h: $(top_srcdir)/vm/reference/gnu/java/net/VMPlainSocketImpl.java

Index: native/jni/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/native/jni/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- native/jni/Makefile.am	3 Oct 2005 01:53:12 -0000	1.16
+++ native/jni/Makefile.am	17 Jun 2006 15:53:36 -0000	1.17
@@ -20,14 +20,19 @@
   CLASSPATH_QT_PEER_DIR = qt-peer
 endif
 
+if CREATE_GCONF_PEER_LIBRARIES
+  CLASSPATH_GCONF_PEER_DIR = gconf-peer
+endif
+
 if CREATE_XMLJ_LIBRARY
   XMLJDIR = xmlj
 endif
 
 SUBDIRS = classpath $(JNIDIRS) \
-  $(ALSADIR) $(DSSIDIR) $(GTKDIR) $(CLASSPATH_QT_PEER_DIR) $(XMLJDIR)
+  $(ALSADIR) $(DSSIDIR) $(GTKDIR) $(CLASSPATH_QT_PEER_DIR) $(XMLJDIR) \
+  $(CLASSPATH_GCONF_PEER_DIR)
 DIST_SUBDIRS = classpath java-io java-lang java-net java-nio java-util \
-               gtk-peer qt-peer xmlj midi-alsa midi-dssi
+               gtk-peer gconf-peer qt-peer xmlj midi-alsa midi-dssi
 
 all-local:
 	cd $(top_srcdir) && $(SHELL) ./scripts/check_jni_methods.sh

Index: scripts/check_jni_methods.sh
===================================================================
RCS file: /sources/classpath/classpath/scripts/check_jni_methods.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- scripts/check_jni_methods.sh	27 May 2006 18:23:37 -0000	1.11
+++ scripts/check_jni_methods.sh	17 Jun 2006 15:53:37 -0000	1.12
@@ -37,6 +37,9 @@
 -Java_gnu_java_awt_peer_gtk_GtkMenuComponentPeer_dispose
 -Java_java_lang_VMSystem_arraycopy
 -Java_java_lang_VMSystem_identityHashCode
+-Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class
+-Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1cache
+-Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class
 EOF
 
 # Compare again silently.

Index: gnu/java/util/prefs/GConfBasedFactory.java
===================================================================
RCS file: gnu/java/util/prefs/GConfBasedFactory.java
diff -N gnu/java/util/prefs/GConfBasedFactory.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/util/prefs/GConfBasedFactory.java	17 Jun 2006 15:53:36 -0000	1.1
@@ -0,0 +1,78 @@
+/* GConfBasedFactory.java -- GConf based PreferencesFactory implementation
+ Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library.  Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module.  An independent module is a module which is not derived from
+ or based on this library.  If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so.  If you do not wish to do so, delete this
+ exception statement from your version. */
+
+package gnu.java.util.prefs;
+
+import java.util.prefs.Preferences;
+import java.util.prefs.PreferencesFactory;
+
+/**
+ * Factory object that generates a Preferences nodes that are read from a GConf
+ * daemon.
+ * 
+ * @author Mario Torre <neugens@limasoftware.net>
+ */
+public class GConfBasedFactory implements PreferencesFactory
+{
+  /** System preference root. */
+  private static final Preferences systemPreferences
+    = new GConfBasedPreferences(null, "", false);
+
+  /** User preference root. */
+  private static final Preferences userPreferences
+    = new GConfBasedPreferences(null, "", true);
+
+  /**
+   * Returns the system root preference node.
+   * 
+   * @see java.util.prefs.PreferencesFactory#systemRoot()
+   */
+  public Preferences systemRoot()
+  {
+    return systemPreferences;
+  }
+
+  /**
+   * Returns the user root preference node corresponding to the calling user.
+   * 
+   * @see java.util.prefs.PreferencesFactory#userRoot()
+   */
+  public Preferences userRoot()
+  {
+    return userPreferences;
+  }
+}

Index: gnu/java/util/prefs/GConfBasedPreferences.java
===================================================================
RCS file: gnu/java/util/prefs/GConfBasedPreferences.java
diff -N gnu/java/util/prefs/GConfBasedPreferences.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/util/prefs/GConfBasedPreferences.java	17 Jun 2006 15:53:36 -0000	1.1
@@ -0,0 +1,406 @@
+/* GConfBasedPreferences.java -- GConf based Preferences implementation
+ Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library.  Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module.  An independent module is a module which is not derived from
+ or based on this library.  If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so.  If you do not wish to do so, delete this
+ exception statement from your version. */
+
+package gnu.java.util.prefs;
+
+import gnu.java.util.prefs.gconf.GConfNativePeer;
+
+import java.security.Permission;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.prefs.AbstractPreferences;
+import java.util.prefs.BackingStoreException;
+
+/**
+ * This is a GConf based preference implementation which writes the preferences
+ * as GConf key-value pairs. System Root is defined to be the
+ * <code>"/system"</code> directory of GConf for the current user, while User
+ * Root is <code>"/apps/java"</code>. These defaults can be modified by
+ * defining two system properties:<br />
+ * <br />
+ * User Root:<br />
+ * <br />
+ * 
+ * <pre>
+ * gnu.java.util.prefs.gconf.user_root
+ * </pre>
+ * 
+ * <br />
+ * <br />
+ * and System Root:<br />
+ * <br />
+ * 
+ * <pre>
+ * gnu.java.util.prefs.gconf.system_root
+ * </pre>
+ * 
+ * <br />
+ * 
+ * @author Mario Torre <neugens@limasoftware.net>
+ */
+public class GConfBasedPreferences
+    extends AbstractPreferences
+{
+  /** Get access to Runtime permission */
+  private static final Permission PERMISSION
+    = new RuntimePermission("preferences");
+
+  /** CGonf client backend */
+  private static GConfNativePeer backend = new GConfNativePeer();
+
+  /** Default user root path */
+  private static final String DEFAULT_USER_ROOT = "/apps/java";
+
+  /** Default system root path */
+  private static final String DEFAULT_SYSTEM_ROOT = "/system";
+
+  /** current node full path */
+  private String node = "";
+
+  /** True if this is a preference node in the user tree, false otherwise. */
+  private final boolean isUser;
+
+  /**
+   * Creates a preference root user node.
+   */
+  public GConfBasedPreferences()
+  {
+    this(true);
+  }
+
+  /**
+   * Creates a preference root node. When <code>isUser</code> is true it will
+   * be user node otherwise it will be a system node.
+   */
+  public GConfBasedPreferences(boolean isUser)
+  {
+    this(null, "", isUser);
+  }
+
+  /**
+   * Creates a new preference node given a parent node and a name, which has to
+   * be relative to its parent. When <code>isUser</code> is true it will be user
+   * node otherwise it will be a system node.
+   * 
+   * @param parent The parent node of this newly created node.
+   * @param name A name relative to the parent node.
+   * @param isUser Set to <code>true</code> initializes this node to be
+   * a user node, <code>false</code> initialize it to be a system node.
+   */
+  public GConfBasedPreferences(AbstractPreferences parent, String name,
+                               boolean isUser)
+  {
+    super(parent, name);
+    this.isUser = isUser;
+
+    // stores the fully qualified name of this node
+    this.node = this.getRealRoot(isUser) + this.absolutePath();
+
+    boolean nodeExist = backend.nodeExist(this.node);
+
+    this.newNode = !nodeExist;
+    backend.startWatchingNode(this.node);
+  }
+
+  /**
+   * Returns a child node with the given name.
+   * If the child node does not exists, it will be created.
+   * 
+   * @param name The name of the requested node.
+   * @return A new reference to the node, creating the node if it is necessary.
+   */
+  protected AbstractPreferences childSpi(String name)
+  {
+    // we don't check anything here, if the node is a new node this will be
+    // detected in the constructor, so we simply return a new reference to
+    // the requested node.
+    return new GConfBasedPreferences(this, name, this.isUser);
+  }
+
+  /**
+   * Returns an array of names of the children of this preference node.
+   * If the current node does not have children, the returned array will be
+   * of <code>size</code> 0 (that is, not <code>null</code>).
+   * 
+   * @return A <code>String</code> array of names of children of the current
+   * node.
+   * @throws BackingStoreException if this operation cannot be completed.
+   */
+  protected String[] childrenNamesSpi() throws BackingStoreException
+  {
+    List nodeList = backend.getChildrenNodes(this.node);
+    String[] nodes = new String[nodeList.size()];
+    nodeList.toArray(nodes);
+
+    return nodes;
+  }
+
+  /**
+   * Suggest a flush to the backend. Actually, this is only a suggestion as
+   * GConf handles this for us asynchronously. More over, both sync and flush
+   * have the same meaning in this class, so calling sync has exactly the same
+   * effect.
+   * 
+   * @see #sync
+   * @throws BackingStoreException if this operation cannot be completed.
+   */
+  public void flush() throws BackingStoreException
+  {
+    backend.suggestSync();
+  }
+
+  /**
+   * Request a flush.
+   * 
+   * @see #flush
+   * @throws BackingStoreException if this operation cannot be completed.
+   */
+  protected void flushSpi() throws BackingStoreException
+  {
+    this.flush();
+  }
+
+  /**
+   * Returns all of the key in this preference node.
+   * If the current node does not have preferences, the returned array will be
+   * of size zero.
+   * 
+   * @return A <code>String</code> array of keys stored under the current
+   * node.
+   * @throws BackingStoreException if this operation cannot be completed.
+   */
+  protected String[] keysSpi() throws BackingStoreException
+  {
+    List keyList = backend.getKeys(this.node);
+    String[] keys = new String[keyList.size()];
+    keyList.toArray(keys);
+
+    return keys;
+  }
+
+  /**
+   * Does a recursive postorder traversal of the preference tree, starting from
+   * the given directory invalidating every preference found in the node.
+   * 
+   * @param directory The name of the starting directory (node)
+   */
+  private void postorderRemove(String directory)
+  {
+    try
+      {
+        // gets the listing of directories in this node
+        List dirs = backend.getChildrenNodes(directory);
+
+        if (dirs.size() != 0)
+          {
+            String currentDir = null;
+
+            for (Iterator itr = dirs.iterator(); itr.hasNext();)
+              {
+                currentDir = (String) itr.next();
+
+                // recursive search inside this directory
+                postorderRemove(currentDir);
+              }
+          }
+
+        // remove all the keys associated to this directory
+        List entries = backend.getKeys(directory);
+
+        if (entries.size() != 0)
+          {
+            String key = null;
+
+            for (Iterator keys = entries.iterator(); keys.hasNext();)
+              {
+                key = (String) keys.next();
+                this.removeSpi(key);
+              }
+          }
+      }
+    catch (BackingStoreException ex)
+      {
+        /* ignore */
+      }
+  }
+
+  /**
+   * Stores the given key-value pair into this preference node.
+   * 
+   * @param key The key of this preference.
+   * @param value The value of this preference.
+   */
+  protected void putSpi(String key, String value)
+  {
+    backend.setString(this.getGConfKey(key), value);
+  }
+
+  /**
+   * Removes this preference node, including all its children.
+   * Also removes the preferences associated.
+   */
+  protected void removeNodeSpi() throws BackingStoreException
+  {
+    this.postorderRemove(this.node);
+    this.flush();
+  }
+
+  /**
+   * Removes the given key from this preference node.
+   * If the key does not exist, no operation is performed.
+   * 
+   * @param key The key to remove.
+   */
+  protected void removeSpi(String key)
+  {
+    backend.unset(this.getGConfKey(key));
+  }
+
+  /**
+   * Suggest a sync to the backend. Actually, this is only a suggestion as GConf
+   * handles this for us asynchronously. More over, both sync and flush have the
+   * same meaning in this class, so calling flush has exactly the same effect.
+   * 
+   * @see #flush
+   * @throws BackingStoreException if this operation cannot be completed due to
+   *           a failure in the backing store, or inability to communicate with
+   *           it.
+   */
+  public void sync() throws BackingStoreException
+  {
+    this.flush();
+  }
+
+  /**
+   * Request a sync.
+   * 
+   * @see #sync
+   * @throws BackingStoreException if this operation cannot be completed due to
+   *           a failure in the backing store, or inability to communicate with
+   *           it.
+   */
+  protected void syncSpi() throws BackingStoreException
+  {
+    this.sync();
+  }
+
+  /**
+   * Returns the value of the given key.
+   * If the keys does not have a value, or there is an error in the backing
+   * store, <code>null</code> is returned instead.
+   * 
+   * @param key The key to retrieve.
+   * @return The value associated with the given key.
+   */
+  protected String getSpi(String key)
+  {
+    return backend.getKey(this.getGConfKey(key));
+  }
+
+  /**
+   * Returns <code>true</code> if this preference node is a user node,
+   * <code>false</code> if is a system preference node.
+   * 
+   * @return <code>true</code> if this preference node is a user node,
+   * <code>false</code> if is a system preference node.
+   */
+  public boolean isUserNode()
+  {
+    return this.isUser;
+  }
+
+  /*
+   * PRIVATE METHODS
+   */
+
+  /**
+   * Builds a GConf key string suitable for operations on the backend.
+   * 
+   * @param key The key to convert into a valid GConf key.
+   * @return A valid Gconf key.
+   */
+  private String getGConfKey(String key)
+  {
+
+    String nodeName = "";
+
+    if (this.node.endsWith("/"))
+      {
+        nodeName = this.node + key;
+      }
+    else
+      {
+        nodeName = this.node + "/" + key;
+      }
+
+    return nodeName;
+  }
+
+  /**
+   * Builds the root node to use for this preference.
+   * 
+   * @param isUser Defines if this node is a user (<code>true</code>) or system
+   * (<code>false</code>) node.
+   * @return The real root of this preference tree.
+   */
+  private String getRealRoot(boolean isUser)
+  {
+    // not sure about this, we should have already these permissions...
+    SecurityManager security = System.getSecurityManager();
+
+    if (security != null)
+      {
+        security.checkPermission(PERMISSION);
+      }
+
+    String root = null;
+
+    if (isUser)
+      {
+        root = System.getProperty("gnu.java.util.prefs.gconf.user_root",
+                                  DEFAULT_USER_ROOT);
+      }
+    else
+      {
+        root = System.getProperty("gnu.java.util.prefs.gconf.system_root",
+                                  DEFAULT_SYSTEM_ROOT);
+      }
+
+    return root;
+  }
+}

Index: gnu/java/util/prefs/gconf/GConfNativePeer.java
===================================================================
RCS file: gnu/java/util/prefs/gconf/GConfNativePeer.java
diff -N gnu/java/util/prefs/gconf/GConfNativePeer.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/util/prefs/gconf/GConfNativePeer.java	17 Jun 2006 15:53:36 -0000	1.1
@@ -0,0 +1,262 @@
+/* GConfNativePeer.java -- GConf based preference peer for native methods
+ Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library.  Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module.  An independent module is a module which is not derived from
+ or based on this library.  If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so.  If you do not wish to do so, delete this
+ exception statement from your version. */
+
+
+package gnu.java.util.prefs.gconf;
+
+import java.util.List;
+import java.util.prefs.BackingStoreException;
+
+/**
+ * Native peer for GConf based preference backend.
+ * 
+ * @author Mario Torre <neugens@limasoftware.net>
+ * @version 1.0
+ */
+public final class GConfNativePeer
+{
+  /**
+   * Object to achieve locks for methods that need to be synchronized.
+   */
+  private static final Object[] semaphore = new Object[0];
+
+  /**
+   * Creates a new instance of GConfNativePeer
+   */
+  public GConfNativePeer()
+  {
+    synchronized (semaphore)
+      {
+        init_class();
+      }
+  }
+
+  /**
+   * Queries whether the node <code>node</code> exists in theGConf database.
+   * Returns <code>true</code> or <code>false</code>.
+   * 
+   * @param node the node to check.
+   */
+  public boolean nodeExist(String node)
+  {
+    if (node.endsWith("/"))
+      {
+        node = node.substring(0, node.length() - 1);
+      }
+    return gconf_client_dir_exists(node);
+  }
+
+  /**
+   * Add the node <code>node</code> to the list of nodes the GConf will watch.
+   * An event is raised everytime this node is changed. You can add a node
+   * multiple times.
+   * 
+   * @param node the node to track.
+   */
+  public void startWatchingNode(String node)
+  {
+    if (node.endsWith("/"))
+      {
+        node = node.substring(0, node.length() - 1);
+      }
+    gconf_client_add_dir(node);
+  }
+
+  /**
+   * Remove the node <code>node</code> to the list of nodes the GConf is
+   * watching. Note that if a node has been added multiple times, you must
+   * remove it the same number of times before the remove takes effect.
+   * 
+   * @param node the node you don't want to track anymore.
+   */
+  public void stopWatchingNode(String node)
+  {
+    if (node.endsWith("/"))
+      {
+        node = node.substring(0, node.length() - 1);
+      }
+    gconf_client_remove_dir(node);
+  }
+
+  /**
+   * Change the value of key to val. Automatically creates the key if it didn't
+   * exist before (ie it was unset or it only had a default value).
+   * 
+   * @param key the key to alter (or add).
+   * @param value the new value for this key.
+   * @return true if the key was updated, false otherwise.
+   */
+  public boolean setString(String key, String value)
+  {
+    if (key.endsWith("/"))
+      {
+        key = key.substring(0, key.length() - 1);
+      }
+    return gconf_client_set_string(key, value);
+  }
+
+  /**
+   * Unsets the value of key; if key is already unset, has no effect. Depending
+   * on the GConf daemon, unsetting a key may have the side effect to remove it
+   * completely form the database.
+   * 
+   * @param key the key to unset.
+   * @return true on success, false if the key was not updated.
+   */
+  public boolean unset(String key)
+  {
+    if (key.endsWith("/"))
+      {
+        key = key.substring(0, key.length() - 1);
+      }
+    return gconf_client_unset(key);
+  }
+
+  /**
+   * Gets the value of a configuration key.
+   * 
+   * @param key the configuration key.
+   * @return the values of this key, null if the key is not valid.
+   */
+  public String getKey(String key)
+  {
+    if (key.endsWith("/"))
+      {
+        key = key.substring(0, key.length() - 1);
+      }
+    return gconf_client_get_string(key);
+  }
+
+  /**
+   * Lists the key in the given node. Does not list subnodes. Keys names are the
+   * stripped names (name relative to the current node) of the kyes stored in
+   * this node.
+   * 
+   * @param node the node where keys are stored.
+   * @return a java.util.List of keys. If there are no keys in the given node, a
+   *         list of size 0 is returned.
+   */
+  public List getKeys(String node) throws BackingStoreException
+  {
+    if (node.endsWith("/"))
+      {
+        node = node.substring(0, node.length() - 1);
+      }
+    return gconf_client_gconf_client_all_keys(node);
+  }
+
+  /**
+   * Lists the subnodes in <code>node</code>. The returned list contains
+   * allocated strings. Each string is the name relative tho the given node.
+   * 
+   * @param node the node to get subnodes from. If there are no subnodes in the
+   *          given node, a list of size 0 is returned.
+   */
+  public List getChildrenNodes(String node) throws BackingStoreException
+  {
+    if (node.endsWith("/"))
+      {
+        node = node.substring(0, node.length() - 1);
+      }
+    return gconf_client_gconf_client_all_nodes(node);
+  }
+
+  /**
+   * Suggest to the backend GConf daemon to synch with the database.
+   */
+  public void suggestSync() throws BackingStoreException
+  {
+    gconf_client_suggest_sync();
+  }
+  
+  protected void finalize() throws Throwable
+  {
+    try
+      {
+        synchronized (semaphore)
+          {
+            finalize_class();
+          }
+      }
+    finally
+      {
+        super.finalize();
+      }
+  }
+
+  /* ***** native methods ***** */
+
+  /*
+   * Basicly, these are one to one mappings to GConfClient functions.
+   * GConfClient instances are handled by the native layer, and are hidden from
+   * the main java class.
+   */
+
+  /** */
+  native static final private void init_id_cache();
+  
+  native static final private void init_class();
+
+  native static final private void finalize_class();
+
+  native static final protected boolean gconf_client_dir_exists(String node);
+
+  native static final protected void gconf_client_add_dir(String node);
+
+  native static final protected void gconf_client_remove_dir(String node);
+
+  native static final protected boolean gconf_client_set_string(String key,
+                                                                String value);
+
+  native static final protected String gconf_client_get_string(String key);
+
+  native static final protected boolean gconf_client_unset(String key);
+
+  native static final protected void gconf_client_suggest_sync();
+
+  native static final protected List gconf_client_gconf_client_all_nodes(
+                                                                         String node);
+
+  native static final protected List gconf_client_gconf_client_all_keys(
+                                                                        String node);
+
+  static
+    {
+      System.loadLibrary("gconfpeer");
+      init_id_cache();
+    }
+}

Index: include/gnu_java_util_prefs_gconf_GConfNativePeer.h
===================================================================
RCS file: include/gnu_java_util_prefs_gconf_GConfNativePeer.h
diff -N include/gnu_java_util_prefs_gconf_GConfNativePeer.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/gnu_java_util_prefs_gconf_GConfNativePeer.h	17 Jun 2006 15:53:36 -0000	1.1
@@ -0,0 +1,30 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_util_prefs_gconf_GConfNativePeer__
+#define __gnu_java_util_prefs_gconf_GConfNativePeer__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+JNIEXPORT void JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1cache (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class (JNIEnv *env, jclass);
+JNIEXPORT jboolean JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1dir_1exists (JNIEnv *env, jclass, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1add_1dir (JNIEnv *env, jclass, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1remove_1dir (JNIEnv *env, jclass, jstring);
+JNIEXPORT jboolean JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1set_1string (JNIEnv *env, jclass, jstring, jstring);
+JNIEXPORT jstring JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1get_1string (JNIEnv *env, jclass, jstring);
+JNIEXPORT jboolean JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1unset (JNIEnv *env, jclass, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1suggest_1sync (JNIEnv *env, jclass);
+JNIEXPORT jobject JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1nodes (JNIEnv *env, jclass, jstring);
+JNIEXPORT jobject JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1keys (JNIEnv *env, jclass, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gnu_java_util_prefs_gconf_GConfNativePeer__ */

Index: native/jni/gconf-peer/GConfNativePeer.c
===================================================================
RCS file: native/jni/gconf-peer/GConfNativePeer.c
diff -N native/jni/gconf-peer/GConfNativePeer.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/gconf-peer/GConfNativePeer.c	17 Jun 2006 15:53:37 -0000	1.1
@@ -0,0 +1,519 @@
+/* GConfNativePeer.c -- Implements native methods for class GConfNativePeer
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   
+   This file is part of GNU Classpath.
+   
+   GNU Classpath is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+   
+   GNU Classpath is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with GNU Classpath; see the file COPYING.  If not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 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 <stdio.h>
+#include <string.h>
+
+#include <jni.h>
+
+#include <glib.h>
+#include <gconf/gconf-client.h>
+
+#include "jcl.h"
+
+#include "gnu_java_util_prefs_gconf_GConfNativePeer.h"
+
+/*
+ * Cached id, methods and objects
+ */
+
+/** Reference count */
+static int reference_count = 0;
+
+/** GConfClient backend */
+static GConfClient *client = NULL;
+
+/** java.util.ArrayList class */
+static jclass jlist_class = NULL;
+
+/** java.util.ArrayList constructor id */
+static jmethodID jlist_init_id = NULL;
+
+/** ava.util.ArrayList add id */
+static jmethodID jlist_add_id = NULL;
+
+/* ***** PRIVATE FUNCTIONS DELCARATION ***** */
+
+/**
+ * Gets the reference of the default GConfClient and initialize the
+ * the type system.
+ * The client reference should be released with g_object_unref after use.
+ */
+static void init_gconf_client (void);
+
+/**
+ * Throws a new runtime exception after a failure, with the given message.
+ */
+static void throw_exception (JNIEnv *env, const char *msg);
+
+/**
+ * Throws the given exception after a failure, with the given message.
+ */
+static void
+throw_exception_by_name (JNIEnv *env, const char *name, const char *msg);
+
+/**
+ * Return a reference to a java.util.ArrayList class.
+ */
+static gboolean set_jlist_class (JNIEnv *env);
+
+/**
+ * Builds a new reference to a new java.util.ArrayList instace.
+ * The instance should be freed by the caller after use.
+ */
+static jclass get_jlist_reference (JNIEnv *env, jclass jlist_class);
+
+/* ***** END: PRIVATE FUNCTIONS DELCARATION ***** */
+
+/* ***** NATIVE FUNCTIONS ***** */
+
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    init_class
+ * Signature: ()V
+ */
+JNIEXPORT void
+JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class
+	(JNIEnv *env, jclass clazz)
+{
+	if (reference_count == 0) {
+		Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1chache
+				(env, clazz);
+		return;
+	}
+	
+	reference_count++;
+}			/* Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class */
+
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    init_id_chache
+ * Signature: ()V
+ */
+JNIEXPORT void
+JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1cache
+	(JNIEnv *env, jclass clazz __attribute__ ((unused)))
+{
+	reference_count++;
+
+	init_gconf_client ();
+	
+	/* if client is null, there is probably an out or memory */
+    if (client == NULL) {
+    	/* release the string and throw a runtime exception */
+       	throw_exception (env,
+       		"Unable to initialize GConfClient in native code\n");
+  		return;
+   	}
+   	
+   	/* ***** java.util.ArrayList ***** */
+   	if (set_jlist_class (env) == FALSE) {
+   		throw_exception (env,
+   			"Unable to get valid reference to java.util.List in native code\n");
+   		return;
+   	}
+}			/* Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1cache */
+
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    gconf_client_gconf_client_all_keys
+ * Signature: (Ljava/lang/String;)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1keys
+	(JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring node)
+{
+	const char 	*dir	 = NULL;
+	GError 		*err 	 = NULL;
+	GSList 		*entries = NULL;
+	
+	/* java.util.ArrayList */
+	jobject jlist = NULL;
+
+	dir = JCL_jstring_to_cstring(env, node);
+	if (dir == NULL) {
+		return NULL;
+	}
+
+    entries = gconf_client_all_entries (client, dir, &err);
+    if (err != NULL) {
+		throw_exception_by_name (env, "java/util/prefs/BackingStoreException",
+								 err->message);								 
+		g_error_free (err);
+		err = NULL;
+		
+		JCL_free_cstring(env, node, dir);
+		return NULL;
+	}
+
+	jlist = get_jlist_reference (env, jlist_class);
+	if (jlist == NULL) {
+		throw_exception_by_name (env, "java/util/prefs/BackingStoreException",
+				"Unable to get java.util.List reference in native code\n");
+		JCL_free_cstring(env, node, dir);
+		g_slist_foreach (entries, (GFunc) gconf_entry_free, NULL);
+		g_slist_free (entries);
+		return NULL;
+	}
+
+	GSList* tmp = entries;
+	while (tmp != NULL) {
+		const char *_val = gconf_entry_get_key(tmp->data);		
+		_val = strrchr (_val, '/');	++_val;
+		(*env)->CallBooleanMethod(env, jlist, jlist_add_id,
+								  (*env)->NewStringUTF(env, _val));
+		tmp = g_slist_next (tmp);
+	}
+
+	/* clean up things */
+	JCL_free_cstring(env, node, dir);
+	g_slist_foreach (entries, (GFunc) gconf_entry_free, NULL);
+	g_slist_free (entries);
+
+	return jlist;
+}			/* Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1keys */
+
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    gconf_client_gconf_client_all_nodes
+ * Signature: (Ljava/lang/String;)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1nodes
+	(JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring node)
+{
+	const char 	*dir	 = NULL;
+	GError 		*err 	 = NULL;
+	GSList 		*entries = NULL;
+	
+	/* java.util.ArrayList */
+	jobject jlist = NULL;
+	   
+    dir = JCL_jstring_to_cstring(env, node);
+	if (dir == NULL) {
+		return NULL;
+	}
+
+	entries = gconf_client_all_dirs (client, dir, &err);
+    if (err != NULL) {
+		throw_exception_by_name (env, "java/util/prefs/BackingStoreException",
+								 err->message);
+		g_error_free (err);
+		err = NULL;
+		JCL_free_cstring(env, node, dir);
+		return NULL;
+	}
+
+	jlist = get_jlist_reference (env, jlist_class);
+	if (jlist == NULL) {
+		throw_exception_by_name (env, "java/util/prefs/BackingStoreException",
+				"Unable to get java.util.List reference in native code\n");
+		JCL_free_cstring(env, node, dir);
+		g_slist_foreach (entries, (GFunc) gconf_entry_free, NULL);
+		g_slist_free (entries);
+		return NULL;
+	}
+
+	GSList* tmp = entries;
+	while (tmp != NULL) {
+		const char *_val = tmp->data;
+		_val = strrchr (_val, '/');	++_val;
+		(*env)->CallBooleanMethod(env, jlist, jlist_add_id,
+								  (*env)->NewStringUTF(env, _val));
+		tmp = g_slist_next (tmp);
+	}
+
+	/* clean up things */
+	JCL_free_cstring(env, node, dir);
+	g_slist_foreach (entries, (GFunc) gconf_entry_free, NULL);
+	g_slist_free (entries);
+
+	return jlist;
+}			/* Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1nodes */
+
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    gconf_client_suggest_sync
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1suggest_1sync
+	(JNIEnv *env, jclass clazz __attribute__ ((unused)))
+{
+	GError *err = NULL;
+	
+    gconf_client_suggest_sync (client, &err);
+    if (err != NULL) {
+		throw_exception_by_name (env, "java/util/prefs/BackingStoreException",
+								 err->message);
+		g_error_free (err);
+		err = NULL;
+	}
+}			/* Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1suggest_1sync */
+
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    gconf_client_unset
+ * Signature: (Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1unset
+	(JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring key)
+{
+    const char *_key	= NULL;
+	gboolean	result	= JNI_FALSE;
+
+	_key = JCL_jstring_to_cstring(env, key);
+	if (_key == NULL) {
+		return JNI_FALSE;
+	}
+
+	result = gconf_client_unset (client, _key, NULL);
+
+	JCL_free_cstring(env, key, _key);
+
+	return result;
+}			/* Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1unset */
+
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    gconf_client_get_string
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1get_1string
+	(JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring key)
+{
+    const char *_key 	= NULL;
+    const char *_value	= NULL;
+	jstring	 	result	= NULL;
+	
+	_key = JCL_jstring_to_cstring(env, key);
+	if (_key == NULL) {
+		return NULL;
+	}
+	
+	_value = gconf_client_get_string (client, _key, NULL);
+	JCL_free_cstring(env, key, _key);
+
+	result = (*env)->NewStringUTF (env, _value);
+	g_free ((gpointer) _value);
+
+	return result;
+}			/* Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1get_1string */
+
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    gconf_client_set_string
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1set_1string
+	(JNIEnv *env, jclass clazz __attribute__ ((unused)),
+	 jstring key, jstring value)
+{
+    const char *_key	= NULL;
+    const char *_value = NULL;
+ 	
+ 	gboolean result = JNI_FALSE;
+
+    /* load an UTF string from the virtual machine. */
+    _key   = JCL_jstring_to_cstring (env, key);
+    _value = JCL_jstring_to_cstring (env, value);
+ 	if (_key == NULL && _value == NULL) {
+		return JNI_FALSE;
+	}
+ 
+	result = gconf_client_set_string (client, _key, _value, NULL);
+
+    JCL_free_cstring (env, key, _key);
+    JCL_free_cstring (env, value, _value);
+        
+    return (jboolean) result;
+}			/* Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1set_1string */
+
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    gconf_client_remove_dir
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1remove_1dir
+	(JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring node)
+{
+    const char *dir = NULL;
+    
+    dir = JCL_jstring_to_cstring (env, node);
+	if (dir == NULL) {
+		return NULL;
+	}
+	
+	gconf_client_remove_dir (client, dir, NULL);
+	
+    JCL_free_cstring (env, node, dir);
+}			/* Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1remove_1dir */
+
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    gconf_client_add_dir
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1add_1dir
+	(JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring node)
+{
+    const char *dir	= NULL;
+
+    dir = JCL_jstring_to_cstring (env, node);
+	if (dir == NULL) {
+		return NULL;
+	}
+	
+	/* ignore errors */
+	gconf_client_add_dir (client, dir, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+
+    JCL_free_cstring (env, node, dir);
+}			/* Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1add_1dir */
+
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    gconf_client_dir_exists
+ * Signature: (Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1dir_1exists
+    (JNIEnv *env, jclass clazz, jstring node)
+{ 
+    const char *dir	  = NULL;
+	jboolean    value = JNI_FALSE;
+	
+    dir = JCL_jstring_to_cstring (env, node);
+	if (dir == NULL) {
+		return NULL;
+	}
+	
+    /* we ignore errors here */
+    value = gconf_client_dir_exists (client, dir, NULL);
+	
+	JCL_free_cstring (env, node, dir);
+
+    return value;
+}           /* Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1dir_1exists */
+
+/*
+ * Class:     gnu_java_util_prefs_gconf_GConfNativePeer
+ * Method:    finalize_class
+ * Signature: ()V
+ */
+JNIEXPORT void
+JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class
+	(JNIEnv *env, jclass clazz)
+{
+	if (reference_count == 0) {
+		/* last reference, free all resources and return */
+		g_object_unref (G_OBJECT (client));
+		
+		(*env)->DeleteGlobalRef (env, jlist_class);
+		
+		jlist_class = NULL;
+		jlist_init_id = NULL;
+		jlist_add_id = NULL;
+		
+		return;
+	}
+	
+	reference_count--;
+}			/* Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class */
+
+/* ***** END: NATIVE FUNCTIONS ***** */
+
+/* ***** PRIVATE FUNCTIONS IMPLEMENTATION ***** */
+
+static void throw_exception (JNIEnv *env, const char *msg)
+{
+    throw_exception_by_name (env, "java/lang/RuntimeException", msg);
+}			/* throw_exception */
+
+static void
+throw_exception_by_name (JNIEnv *env, const char *name, const char *msg)
+{    
+    JCL_ThrowException(env, name, msg);
+}			/* throw_exception */
+
+static void init_gconf_client (void)
+{  
+    client = gconf_client_get_default ();
+    g_type_init();
+}           /* init_gconf_client */
+
+static gboolean set_jlist_class (JNIEnv *env)
+{
+	jclass local_jlist_class = NULL;
+
+    /* gets a reference to the ArrayList class */
+	local_jlist_class = JCL_FindClass (env, "java/util/ArrayList");
+	if (local_jlist_class == NULL) {
+		return FALSE;
+	}
+	
+	jlist_class = (*env)->NewGlobalRef(env, local_jlist_class);
+	(*env)->DeleteLocalRef(env, local_jlist_class);
+	if (jlist_class == NULL) {
+		return FALSE;
+	}
+
+	/* and initialize it */
+	jlist_init_id = (*env)->GetMethodID (env, jlist_class, "<init>", "()V");
+	if (jlist_init_id == NULL) {
+		return FALSE;
+	}
+
+	jlist_add_id = (*env)->GetMethodID (env, jlist_class, "add",
+										"(Ljava/lang/Object;)Z");
+	if (jlist_add_id == NULL) {
+		return FALSE;
+	}
+
+	return TRUE;
+}		/* set_jlist_class */
+
+static jobject get_jlist_reference (JNIEnv *env, jclass jlist_class)
+{
+	return (*env)->NewObject(env, jlist_class, jlist_init_id);
+}			/* get_jlist_reference */
+
+/* ***** END: PRIVATE FUNCTIONS IMPLEMENTATION ***** */

Index: native/jni/gconf-peer/Makefile.am
===================================================================
RCS file: native/jni/gconf-peer/Makefile.am
diff -N native/jni/gconf-peer/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/gconf-peer/Makefile.am	17 Jun 2006 15:53:37 -0000	1.1
@@ -0,0 +1,14 @@
+nativeexeclib_LTLIBRARIES = libgconfpeer.la
+
+libgconfpeer_la_SOURCES = GConfNativePeer.c
+
+libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
+                       $(top_builddir)/native/jni/classpath/jcl.lo
+
+AM_LDFLAGS = @CLASSPATH_MODULE@ @GCONF_LIBS@ 
+#@CLASSPATH_MODULE@ @GCONF_LIBS@ @CAIRO_LIBS@ @FREETYPE2_LIBS@ \
+#             @PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ -lX11 -lXtst
+
+AM_CPPFLAGS = @CLASSPATH_INCLUDES@
+
+AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @GCONF_CFLAGS@



From MAILER-DAEMON Sat Jun 17 19:58:49 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Frkgi-000370-RR
	for mharc-commit-classpath@gnu.org; Sat, 17 Jun 2006 19:58:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Frkgg-00033S-Lq
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 19:58:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Frkgf-00031t-MU
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 19:58:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Frkgf-00031f-GR
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 19:58:45 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Frkqc-0008UE-H1
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 20:09:02 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Frkgd-0001cB-00
	for <commit-classpath@gnu.org>; Sat, 17 Jun 2006 19:58:43 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1Frkgb-0001c7-Vb
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 23:58:43 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Frkgb-0001c7-Vb@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sat, 17 Jun 2006 23:58:41 +0000
Subject: [commit-cp] classpath ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Jun 2006 23:58:47 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/17 23:58:41

Modified files:
	.              : ChangeLog 

Log message:
	2006-06-17  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java:
		Use Integer.valueOf() instead of new Integer().
		* gnu/java/security/jce/sig/EncodedKeyFactory.java: Likewise.
		* gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java: Likewise.
		* gnu/java/security/util/Sequence.java: Likewise.
		* gnu/java/security/x509/ext/GeneralNames.java: Likewise.
		* gnu/java/security/x509/X509Certificate.java: Likewise.
		* gnu/javax/crypto/assembly/ModeStage.java: Likewise.
		* gnu/javax/crypto/cipher/Anubis.java: Likewise.
		* gnu/javax/crypto/cipher/Blowfish.java: Likewise.
		* gnu/javax/crypto/cipher/Cast5.java: Likewise.
		* gnu/javax/crypto/cipher/DES.java: Likewise.
		* gnu/javax/crypto/cipher/Khazad.java: Likewise.
		* gnu/javax/crypto/cipher/NullCipher.java: Likewise.
		* gnu/javax/crypto/cipher/Rijndael.java: Likewise.
		* gnu/javax/crypto/cipher/Serpent.java: Likewise.
		* gnu/javax/crypto/cipher/Square.java: Likewise.
		* gnu/javax/crypto/cipher/TripleDES.java: Likewise.
		* gnu/javax/crypto/cipher/Twofish.java: Likewise.
		* gnu/javax/crypto/jce/cipher/CipherAdapter.java: Likewise.
		* gnu/javax/crypto/jce/cipher/PBES2.java: Likewise.
		* gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java: Likewise.
		* gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java: Likewise.
		* gnu/javax/crypto/jce/prng/ICMRandomSpi.java: Likewise.
		* gnu/javax/crypto/jce/prng/UMacRandomSpi.java: Likewise.
		* gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java: Likewise.
		* gnu/javax/crypto/keyring/AuthenticatedEntry.java: Likewise.
		* gnu/javax/crypto/keyring/EncryptedEntry.java: Likewise.
		* gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java: Likewise.
		* gnu/javax/crypto/keyring/PasswordEncryptedEntry.java: Likewise.
		* gnu/javax/crypto/keyring/PasswordProtectedEntry.java: Likewise.
		* gnu/javax/crypto/mac/UHash32.java: Likewise.
		* gnu/javax/crypto/mac/UMac32.java: Likewise.
		* gnu/javax/crypto/mode/BaseMode.java: Likewise.
		* gnu/javax/crypto/mode/EAX.java: Likewise.
		* gnu/javax/crypto/prng/ICMGenerator.java: Likewise.
		* gnu/javax/crypto/prng/UMacGenerator.java: Likewise.
		* gnu/javax/crypto/sasl/srp/KDF.java: Likewise.
		* gnu/javax/security/auth/callback/ConsoleCallbackHandler.java: Likewise.
		* java/security/cert/X509CertSelector.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7860&r2=1.7861

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7860
retrieving revision 1.7861
diff -u -b -r1.7860 -r1.7861
--- ChangeLog	17 Jun 2006 15:53:36 -0000	1.7860
+++ ChangeLog	17 Jun 2006 23:58:41 -0000	1.7861
@@ -15,6 +15,49 @@
 	* native/jni/gconf-peer/Makefile.am: new Makefile needed to
 	build gconf-peer shared library.
 
+2006-06-17  Raif S. Naffah  <raif@swiftdsl.com.au>
+
+	* gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java:
+	Use Integer.valueOf() instead of new Integer().
+	* gnu/java/security/jce/sig/EncodedKeyFactory.java: Likewise.
+	* gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java: Likewise.
+	* gnu/java/security/util/Sequence.java: Likewise.
+	* gnu/java/security/x509/ext/GeneralNames.java: Likewise.
+	* gnu/java/security/x509/X509Certificate.java: Likewise.
+	* gnu/javax/crypto/assembly/ModeStage.java: Likewise.
+	* gnu/javax/crypto/cipher/Anubis.java: Likewise.
+	* gnu/javax/crypto/cipher/Blowfish.java: Likewise.
+	* gnu/javax/crypto/cipher/Cast5.java: Likewise.
+	* gnu/javax/crypto/cipher/DES.java: Likewise.
+	* gnu/javax/crypto/cipher/Khazad.java: Likewise.
+	* gnu/javax/crypto/cipher/NullCipher.java: Likewise.
+	* gnu/javax/crypto/cipher/Rijndael.java: Likewise.
+	* gnu/javax/crypto/cipher/Serpent.java: Likewise.
+	* gnu/javax/crypto/cipher/Square.java: Likewise.
+	* gnu/javax/crypto/cipher/TripleDES.java: Likewise.
+	* gnu/javax/crypto/cipher/Twofish.java: Likewise.
+	* gnu/javax/crypto/jce/cipher/CipherAdapter.java: Likewise.
+	* gnu/javax/crypto/jce/cipher/PBES2.java: Likewise.
+	* gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java: Likewise.
+	* gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java: Likewise.
+	* gnu/javax/crypto/jce/prng/ICMRandomSpi.java: Likewise.
+	* gnu/javax/crypto/jce/prng/UMacRandomSpi.java: Likewise.
+	* gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java: Likewise.
+	* gnu/javax/crypto/keyring/AuthenticatedEntry.java: Likewise.
+	* gnu/javax/crypto/keyring/EncryptedEntry.java: Likewise.
+	* gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java: Likewise.
+	* gnu/javax/crypto/keyring/PasswordEncryptedEntry.java: Likewise.
+	* gnu/javax/crypto/keyring/PasswordProtectedEntry.java: Likewise.
+	* gnu/javax/crypto/mac/UHash32.java: Likewise.
+	* gnu/javax/crypto/mac/UMac32.java: Likewise.
+	* gnu/javax/crypto/mode/BaseMode.java: Likewise.
+	* gnu/javax/crypto/mode/EAX.java: Likewise.
+	* gnu/javax/crypto/prng/ICMGenerator.java: Likewise.
+	* gnu/javax/crypto/prng/UMacGenerator.java: Likewise.
+	* gnu/javax/crypto/sasl/srp/KDF.java: Likewise.
+	* gnu/javax/security/auth/callback/ConsoleCallbackHandler.java: Likewise.
+	* java/security/cert/X509CertSelector.java: Likewise.
+
 2006-06-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* javax/management/DynamicMBean.java:



From MAILER-DAEMON Sat Jun 17 20:54:55 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrlZ1-0002Jx-Gk
	for mharc-commit-classpath@gnu.org; Sat, 17 Jun 2006 20:54:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrlZ0-0002Js-Hd
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 20:54:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrlYy-0002Jg-GQ
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 20:54:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrlYy-0002Jd-AX
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 20:54:52 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Frliv-0003WB-LF
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 21:05:10 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrlYv-0003gI-00
	for <commit-classpath@gnu.org>; Sat, 17 Jun 2006 20:54:49 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FrlYu-0003gF-2T
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 00:54:48 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrlYu-0003gF-2T@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Sun, 18 Jun 2006 00:54:48 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Freet...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jun 2006 00:54:54 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/18 00:54:47

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: FreetypeGlyphVector.java 
	java/awt/font  : LineBreakMeasurer.java TextLayout.java 
	                 TextMeasurer.java 
	java/text      : AttributedString.java 

Log message:
	2006-06-18  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
		(FreetypeGlyphVector, clone): Implement cloning.
		(getGlyphLogicalBounds): Bounds should be offset to the glyph position.
		* java/awt/font/TextMeasurer.java: Implement.
		* java/awt/font/LineBreakMeasurer.java: 
		Reimplement to use TextMeasurer.
		* java/awt/font/TextLayout.java
		New constructors.
		(getBlackboxBounds, getLogicalHighlightShape): Reimplement.
		(getText, getFont): New private static methods.
		(setCharIndices): New method.
		* java/text/AttributedString.java
		(AttributedString): Fix constructor to stop at end point.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7861&r2=1.7862
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/LineBreakMeasurer.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/TextLayout.java?cvsroot=classpath&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/TextMeasurer.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/text/AttributedString.java?cvsroot=classpath&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7861
retrieving revision 1.7862
diff -u -b -r1.7861 -r1.7862
--- ChangeLog	17 Jun 2006 23:58:41 -0000	1.7861
+++ ChangeLog	18 Jun 2006 00:54:46 -0000	1.7862
@@ -1,4 +1,20 @@
-2006-0-12  Mario torre  <neugens at limasoftware.net>
+2006-06-18  Sven de Marothy  <sven@physto.se>
+
+	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
+	(FreetypeGlyphVector, clone): Implement cloning.
+	(getGlyphLogicalBounds): Bounds should be offset to the glyph position.
+	* java/awt/font/TextMeasurer.java: Implement.
+	* java/awt/font/LineBreakMeasurer.java: 
+	Reimplement to use TextMeasurer.
+	* java/awt/font/TextLayout.java
+	New constructors.
+	(getBlackboxBounds, getLogicalHighlightShape): Reimplement.
+	(getText, getFont): New private static methods.
+	(setCharIndices): New method.
+	* java/text/AttributedString.java
+	(AttributedString): Fix constructor to stop at end point.
+	
+2006-06-12  Mario torre  <neugens at limasoftware.net>
 
 	* gnu/java/util/prefs/GConfBasedPreferences.java: new class.
 	* gnu/java/util/prefs/GConfBasedFactory.java: new class.

Index: gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	11 Jun 2006 08:29:57 -0000	1.6
+++ gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	18 Jun 2006 00:54:47 -0000	1.7
@@ -137,6 +137,35 @@
   }
 
   /**
+   * Cloning constructor
+   */  
+  private FreetypeGlyphVector( FreetypeGlyphVector gv )
+  {
+    font = gv.font;
+    peer = gv.peer;
+    frc = gv.frc;
+    s = gv.s;
+    nGlyphs = gv.nGlyphs;
+    logicalBounds = gv.logicalBounds.getBounds2D();
+
+    if( gv.metricsCache != null )
+      {
+	metricsCache = new GlyphMetrics[ nGlyphs ];
+	System.arraycopy(gv.metricsCache, 0, metricsCache, 0, nGlyphs);
+      }
+
+    glyphCodes = new int[ nGlyphs ];
+    glyphPositions = new float[ nGlyphs ];
+    glyphTransforms = new AffineTransform[ nGlyphs ];
+    for(int i = 0; i < nGlyphs; i++ )
+      {
+	glyphTransforms[ i ] = new AffineTransform( gv.glyphTransforms[ i ] );
+	glyphCodes[i] = gv.glyphCodes[ i ];
+	glyphPositions[i] = gv.glyphPositions[ i ];
+      }
+  }
+
+  /**
    * Create the array of glyph codes.
    */
   private void getGlyphs()
@@ -172,6 +201,12 @@
 
   private native GeneralPath getGlyphOutlineNative(int glyphIndex);
 
+
+  public Object clone()
+  {
+    return new FreetypeGlyphVector( this );
+  }
+
   /**
    * Duh, compares two instances.
    */
@@ -260,8 +295,11 @@
     if( gm == null )
       return null; 
     Rectangle2D r = gm.getBounds2D();
-    return new Rectangle2D.Double( r.getX() - gm.getLSB(), r.getY(),
-				   gm.getAdvanceX(), r.getHeight() );
+    Point2D p = getGlyphPosition( glyphIndex );
+    return new Rectangle2D.Double( p.getX() + r.getX() - gm.getLSB(), 
+				   p.getY() + r.getY(),
+				   gm.getAdvanceX(), 
+				   r.getHeight() );
   }
 
   /*
@@ -385,8 +423,6 @@
     for( int i = 1; i < nGlyphs; i++ )
       {
 	Rectangle2D r2 = (Rectangle2D)getGlyphLogicalBounds( i );
-	Point2D p = getGlyphPosition( i );
-	r2.setRect( p.getX(), p.getY(), r2.getWidth(), r2.getHeight() );
 	rect = rect.createUnion( r2 );
       }
 

Index: java/awt/font/LineBreakMeasurer.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/font/LineBreakMeasurer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- java/awt/font/LineBreakMeasurer.java	13 Jun 2006 00:14:27 -0000	1.4
+++ java/awt/font/LineBreakMeasurer.java	18 Jun 2006 00:54:47 -0000	1.5
@@ -41,57 +41,41 @@
 import java.text.AttributedCharacterIterator;
 import java.text.AttributedString;
 import java.text.BreakIterator;
-import java.awt.font.TextLayout;
-import java.awt.font.FontRenderContext;
 import java.awt.Shape;
 
 public final class LineBreakMeasurer
 {
   private AttributedCharacterIterator text;
   private int position;
-  private FontRenderContext frc;
-  private TextLayout totalLayout;
+  private TextMeasurer tm; 
   private int numChars;
 
   public LineBreakMeasurer(AttributedCharacterIterator text, 
 			   BreakIterator breakIter, FontRenderContext frc)
   {
-    this.text = text;
-    this.frc = frc;
-    position = 0;
-    totalLayout = new TextLayout(text, frc);
-    numChars = totalLayout.getCharacterCount();
+    this( text, frc );
   }
 
   public LineBreakMeasurer(AttributedCharacterIterator text, 
 			   FontRenderContext frc)
   {
     this.text = text;
-    this.frc = frc;
     position = 0;
-    totalLayout = new TextLayout(text, frc);
-    numChars = totalLayout.getCharacterCount();
+    numChars = text.getEndIndex();
+    tm = new TextMeasurer( text, frc );
   }
 
   public void deleteChar(AttributedCharacterIterator newParagraph, 
 			 int deletePos)
   {
-    totalLayout = new TextLayout(newParagraph, frc);
-    if( deletePos < 0 || deletePos > totalLayout.getCharacterCount() )
-      throw new NullPointerException("Invalid deletePos:"+deletePos);
-    numChars = totalLayout.getCharacterCount();
-    text = newParagraph;
+    tm.deleteChar( newParagraph, deletePos );
     position = 0;
   }
 
   public void insertChar(AttributedCharacterIterator newParagraph, 
 			 int insertPos)
   {
-    totalLayout = new TextLayout(newParagraph, frc);
-    if( insertPos < 0 || insertPos > totalLayout.getCharacterCount() )
-      throw new NullPointerException("Invalid insertPos:"+insertPos);
-    numChars = totalLayout.getCharacterCount();
-    text = newParagraph;
+    tm.insertChar( newParagraph, insertPos );
     position = 0;
   }
 
@@ -104,11 +88,9 @@
 			       boolean requireNextWord)
   {
     int next = nextOffset( wrappingWidth, offsetLimit, requireNextWord );
-    AttributedCharacterIterator aci = (new AttributedString( text, 
-							     position, next )
-				       ).getIterator();
+    TextLayout tl = tm.getLayout( position, next );
     position = next;
-    return new TextLayout( aci, frc );
+    return tl;
   }
 
   public int nextOffset(float wrappingWidth)
@@ -119,69 +101,40 @@
   public int nextOffset(float wrappingWidth, int offsetLimit, 
 			boolean requireNextWord)
   {
-    Shape s = totalLayout.getBlackBoxBounds( position, offsetLimit );
-    double remainingLength = s.getBounds2D().getWidth();
+    int guessOffset = tm.getLineBreakIndex(position, wrappingWidth);
+    if( offsetLimit > numChars )
+      offsetLimit = numChars;
 
-    int guessOffset = (int)( ( (double)wrappingWidth / (double)remainingLength)
-			     * ( (double)numChars - (double)position ) );
-    guessOffset += position;
     if( guessOffset > offsetLimit )
-      guessOffset = offsetLimit;
-
-    s = totalLayout.getBlackBoxBounds( position, guessOffset );
-    double guessLength = s.getBounds2D().getWidth();
-
-    boolean makeSmaller = ( guessLength > wrappingWidth );
-    int inc = makeSmaller ? -1 : 1;
-    boolean keepGoing = true;
-
-    do
-      {
-	guessOffset = guessOffset + inc;
-	if( guessOffset <= position || guessOffset > offsetLimit )
 	  {
-	    keepGoing = false;
-	  }
-	else
-	  {
-	    s = totalLayout.getBlackBoxBounds( position, guessOffset );
-	    guessLength = s.getBounds2D().getWidth();
-	    if( makeSmaller && ( guessLength <= wrappingWidth) )	  
-	      keepGoing = false;
-	    if( !makeSmaller && ( guessLength >= wrappingWidth) )
-	      keepGoing = false;
-	  }
+	text.setIndex( offsetLimit );
+	return offsetLimit;
       }
-    while( keepGoing );
 
-    if( !makeSmaller )
-      guessOffset--;
+    text.setIndex( guessOffset );
 
-    if( guessOffset >= offsetLimit )
-      return offsetLimit;
+    // If we're on a breaking character, return directly
+    if( Character.isWhitespace( text.current() ) )
+      return guessOffset;
 
-    text.setIndex( guessOffset );
+    // Otherwise jump forward or backward to the last such char.
     if( !requireNextWord )
-      {
-	char c = text.previous();
-	while( !Character.isWhitespace( c ) && c != '-' && 
+      while( !Character.isWhitespace( text.previous() ) && 
 	       guessOffset > position )
-	  { 
 	    guessOffset--; 
-	    c = text.previous();
-	  }
-      }
     else
-      {
-	char c = text.next();
-	while( !Character.isWhitespace( c ) && c != '-' && 
+      while( !Character.isWhitespace( text.next() ) && 
 	       guessOffset < offsetLimit )
-	  {
 	    guessOffset++;
-	    c = text.next();
-	  }
+    
+    if( guessOffset > offsetLimit )
+      {
+	text.setIndex( offsetLimit );
+	return offsetLimit;
       }
 
+    text.setIndex( guessOffset );
+
     return guessOffset;
   }
 

Index: java/awt/font/TextLayout.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/font/TextLayout.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- java/awt/font/TextLayout.java	16 Jun 2006 15:14:56 -0000	1.12
+++ java/awt/font/TextLayout.java	18 Jun 2006 00:54:47 -0000	1.13
@@ -47,6 +47,7 @@
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Point2D;
+import java.text.CharacterIterator;
 import java.text.AttributedCharacterIterator;
 import java.text.Bidi;
 import java.util.Map;
@@ -71,6 +72,12 @@
   private int[][] runIndices;
 
   /**
+   * Character indices.
+   * Fixt index is the glyphvector, second index is the (first) glyph.
+   */
+  private int[][] charIndices;
+
+  /**
    * Base directionality, determined from the first char.
    */
   private boolean leftToRight;
@@ -137,6 +144,7 @@
 					    Font.LAYOUT_LEFT_TO_RIGHT :
 					    Font.LAYOUT_RIGHT_TO_LEFT );
       }
+    setCharIndices();
   }
 
   public TextLayout (String string, Map attributes, FontRenderContext frc)  
@@ -145,9 +153,97 @@
   }
 
   public TextLayout (AttributedCharacterIterator text, FontRenderContext frc)
-    throws NotImplementedException
   {
-    throw new Error ("not implemented");
+    // FIXME: Very rudimentary.
+    this(getText(text), getFont(text), frc);
+  }
+
+  /**
+   * Package-private constructor to make a textlayout from an existing one.
+   * This is used by TextMeasurer for returning sub-layouts, and it 
+   * saves a lot of time in not having to relayout the text.
+   */
+  TextLayout(TextLayout t, int startIndex, int endIndex)
+  {
+    font = t.font;
+    frc = t.frc;
+    boundsCache = null;
+    lm = t.lm;
+    leftToRight = t.leftToRight;
+
+    if( endIndex > t.getCharacterCount() )
+      endIndex = t.getCharacterCount();
+    string = t.string.substring( startIndex, endIndex );
+
+    int startingRun = t.charIndices[startIndex][0];
+    int nRuns = 1 + t.charIndices[endIndex - 1][0] - startingRun;
+    runIndices = new int[ nRuns ][2];
+
+    runs = new GlyphVector[ nRuns ];
+    for( int i = 0; i < nRuns; i++ )
+      {
+	GlyphVector run = t.runs[ i + startingRun ];
+	// Copy only the relevant parts of the first and last runs.
+	int beginGlyphIndex = (i > 0) ? 0 : t.charIndices[startIndex][1];
+	int numEntries = ( i < nRuns - 1) ? run.getNumGlyphs() : 
+	  1 + t.charIndices[endIndex - 1][1] - beginGlyphIndex;
+	
+	int[] codes = run.getGlyphCodes(beginGlyphIndex, numEntries, null);
+	runs[ i ] = font.createGlyphVector( frc, codes );
+	runIndices[ i ][0] = t.runIndices[i + startingRun][0] - startIndex;
+	runIndices[ i ][1] = t.runIndices[i + startingRun][1] - startIndex;
+      }
+    runIndices[ nRuns - 1 ][1] = endIndex - 1;
+
+    setCharIndices();
+    determineWhiteSpace();
+  }
+
+  private void setCharIndices()
+  {
+    charIndices = new int[ getCharacterCount() ][2];
+    int i = 0;
+    int currentChar = 0;
+    for(int run = 0; run < runs.length; run++)
+      {
+	currentChar = -1;
+	for( int gi = 0; gi < runs[ run ].getNumGlyphs(); gi++)
+	  {
+	    if( runs[ run ].getGlyphCharIndex( gi ) != currentChar )
+	      {
+		charIndices[ i ][0] = run;
+		charIndices[ i ][1] = gi;
+		currentChar = runs[ run ].getGlyphCharIndex( gi );
+		i++;
+	      }
+	  }
+      }
+  }
+
+  private static String getText(AttributedCharacterIterator iter)
+  {
+    StringBuffer sb = new StringBuffer();
+    int idx = iter.getIndex();
+    for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) 
+      sb.append(c);
+    iter.setIndex( idx );
+    return sb.toString();
+  }
+
+  private static Font getFont(AttributedCharacterIterator iter)
+  {
+    Font f = (Font)iter.getAttribute(TextAttribute.FONT);
+    if( f == null )
+      {
+	int size;
+	Float i = (Float)iter.getAttribute(TextAttribute.SIZE);
+	if( i != null )
+	  size = (int)i.floatValue();
+	else
+	  size = 14;
+	f = new Font("Dialog", Font.PLAIN, size );
+      }
+    return f;
   }
 
   /**
@@ -177,10 +273,14 @@
 	  gotDirection = true;
 	  break;
 	}
+    determineWhiteSpace();
+  }
 
+  private void determineWhiteSpace()
+  {
     // Determine if there's whitespace in the thing.
     // Ignore trailing chars.
-    i = string.length() - 1; 
+    int i = string.length() - 1; 
     hasWhitespace = false;
     while( i >= 0 && Character.isWhitespace( string.charAt(i) ) )
       i--;
@@ -249,56 +349,42 @@
 
   public Shape getBlackBoxBounds (int firstEndpoint, int secondEndpoint)
   {
-    if( firstEndpoint < 0 || secondEndpoint > getCharacterCount() )
+    if( secondEndpoint - firstEndpoint <= 0 )
+      return new Rectangle2D.Float(); // Hmm? 
+
+    if( firstEndpoint < 0 || secondEndpoint > getCharacterCount())
       return new Rectangle2D.Float();
 
     GeneralPath gp = new GeneralPath();
-    int i = 0; // run index
+    
+    int ri = charIndices[ firstEndpoint ][0];
+    int gi = charIndices[ firstEndpoint ][1];
+
     double advance = 0;
 
-    // go to first run
-    while( runIndices[i + 1][1] < firstEndpoint ) 
-      {
+    for( int i = 0; i < ri; i++ )
 	advance += runs[i].getLogicalBounds().getWidth();
-	i++;
-      }
 
-    int j = 0; // index into the run.
-    if( runIndices[i][1] - runIndices[i][0] > 1 )
+    for( int i = ri; i <= charIndices[ secondEndpoint - 1 ][0]; i++ )
       {
-	while( runs[i].getGlyphCharIndex( j + 1 ) <
-	       (firstEndpoint - runIndices[i][0] ) )j++;
-      }
-
-    gp.append(runs[i].getGlyphVisualBounds( j ), false);
-    boolean keepGoing = true;;
+	int dg;
+	if( i == charIndices[ secondEndpoint - 1 ][0] )
+	  dg = charIndices[ secondEndpoint - 1][1];
+	else
+	  dg = runs[i].getNumGlyphs() - 1;
 
-    do
-      {
-	while( j < runs[i].getNumGlyphs() && 
-	       runs[i].getGlyphCharIndex( j ) + runIndices[i][0] < 
-	       secondEndpoint )
+	for( int j = 0; j <= dg; j++ )
 	  {
 	    Rectangle2D r2 = (runs[i].getGlyphVisualBounds( j )).
 	      getBounds2D();
 	    Point2D p = runs[i].getGlyphPosition( j );
-	    r2.setRect( advance + p.getX(), r2.getY(), 
+	    r2.setRect( advance + r2.getX(), r2.getY(), 
 			r2.getWidth(), r2.getHeight() );
 	    gp.append(r2, false);
-	    j++;
 	  }
 
-	if( j >= runs[i].getNumGlyphs() )
-	  {
 	    advance += runs[i].getLogicalBounds().getWidth();
-	    i++; 
-	    j = 0;
-	  }
-	else
-	  keepGoing = false;
       }
-    while( keepGoing );
-
     return gp;
   }
 
@@ -382,55 +468,42 @@
   public Shape getLogicalHighlightShape (int firstEndpoint, int secondEndpoint,
                                          Rectangle2D bounds)
   {
-    if( firstEndpoint < 0 || secondEndpoint > getCharacterCount() )
+    if( secondEndpoint - firstEndpoint <= 0 )
+      return new Rectangle2D.Float(); // Hmm? 
+
+    if( firstEndpoint < 0 || secondEndpoint > getCharacterCount())
       return new Rectangle2D.Float();
 
-    int i = 0; // run index
+    Rectangle2D r = null;
+    int ri = charIndices[ firstEndpoint ][0];
+    int gi = charIndices[ firstEndpoint ][1];
+
     double advance = 0;
 
-    // go to first run
-    if( i > 0 )
-      while( runIndices[i + 1][1] < firstEndpoint ) 
-	{
+    for( int i = 0; i < ri; i++ )
 	  advance += runs[i].getLogicalBounds().getWidth();
-	  i++;
-	}
 
-    int j = 0; // index into the run.
-    if( runIndices[i][1] - runIndices[i][0] > 1 )
+    for( int i = ri; i <= charIndices[ secondEndpoint - 1 ][0]; i++ )
       {
-	while( runs[i].getGlyphCharIndex( j + 1 ) <
-	       (firstEndpoint - runIndices[i][0] ) )j++;
-      }
-
-    Rectangle2D r = (runs[i].getGlyphLogicalBounds( j )).getBounds2D();
-    boolean keepGoing = true;;
+	int dg; // last index in this run to use.
+	if( i == charIndices[ secondEndpoint - 1 ][0] )
+	  dg = charIndices[ secondEndpoint - 1][1];
+	else
+	  dg = runs[i].getNumGlyphs() - 1;
 
-    do
+	for(; gi <= dg; gi++ )
       {
-	while( j < runs[i].getNumGlyphs() && 
-	       runs[i].getGlyphCharIndex( j ) + runIndices[i][0] < 
-	       secondEndpoint )
-	  {
-	    Rectangle2D r2 = (runs[i].getGlyphLogicalBounds( j )).
+	    Rectangle2D r2 = (runs[i].getGlyphLogicalBounds( gi )).
 	      getBounds2D();
-	    Point2D p = runs[i].getGlyphPosition( j );
-	    r2.setRect( advance + p.getX(), r2.getY(), 
-			r2.getWidth(), r2.getHeight() );
-	    r = r.createUnion( r2 );
-	    j++;
+	    if( r == null )
+	      r = r2;
+	    else
+	      r = r.createUnion(r2);
 	  }
+	gi = 0; // reset glyph index into run for next run.
 
-	if( j >= runs[i].getNumGlyphs() )
-	  {
 	    advance += runs[i].getLogicalBounds().getWidth();
-	    i++; 
-	    j = 0;
-	  }
-	else
-	  keepGoing = false;
       }
-    while( keepGoing );
 
     return r;
   }

Index: java/awt/font/TextMeasurer.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/font/TextMeasurer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- java/awt/font/TextMeasurer.java	22 Mar 2006 19:15:24 -0000	1.3
+++ java/awt/font/TextMeasurer.java	18 Jun 2006 00:54:47 -0000	1.4
@@ -38,67 +38,156 @@
 
 package java.awt.font;
 
-import gnu.classpath.NotImplementedException;
-
 import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+import java.awt.Shape;
 
 /**
- * @author Michael Koch
+ * TextMeasurer is a small utility class for measuring the length of laid-out
+ * text objects. 
+ *
+ * @author Sven de Marothy
  * @since 1.3
  */
 public final class TextMeasurer implements Cloneable
 {
-  private AttributedCharacterIterator ci;
+  private AttributedCharacterIterator text;
   private FontRenderContext frc;
+  private TextLayout totalLayout;
+  private int numChars;
   
+  /**
+   * Creates a TextMeasurer from a given text in the form of an
+   * <code>AttributedCharacterIterator</code> and a 
+   * <code>FontRenderContext</code>.
+   */  
   public TextMeasurer (AttributedCharacterIterator text, FontRenderContext frc)
   {
-    this.ci = text;
+    this.text = text;
     this.frc = frc;
+    totalLayout = new TextLayout( text, frc );
+    numChars = totalLayout.getCharacterCount();
   }
 
+  /**
+   * Clones the TextMeasurer object
+   */
   protected Object clone ()
   {
-    try
-      {
-        return super.clone ();
-      }
-    catch (CloneNotSupportedException e)
-      {
-        // This may never occur
-        throw new InternalError ();
-      }
+    return new TextMeasurer( text, frc );
   }
 
+  /**
+   * Update the text if a character is deleted at the position deletePos
+   * @param newParagraph - the updated paragraph.
+   * @param deletePos - the deletion position
+   */
   public void deleteChar (AttributedCharacterIterator newParagraph,
                           int deletePos)
-    throws NotImplementedException
   {
-    throw new Error ("not implemented");
+    totalLayout = new TextLayout(newParagraph, frc);
+    if( deletePos < 0 || deletePos > totalLayout.getCharacterCount() )
+      throw new NullPointerException("Invalid deletePos:"+deletePos);
+    numChars = totalLayout.getCharacterCount();
+    text = newParagraph;
   }
 
-  public float getAdvanceBetween (int start, int limit)
-    throws NotImplementedException
+  /**
+   * Update the text if a character is inserted at the position insertPos
+   * @param newParagraph - the updated paragraph.
+   * @param insertPos - the insertion position
+   */
+  public void insertChar (AttributedCharacterIterator newParagraph,
+                          int insertPos)
   {
-    throw new Error ("not implemented");
+    totalLayout = new TextLayout(newParagraph, frc);
+    if( insertPos < 0 || insertPos > totalLayout.getCharacterCount() )
+      throw new NullPointerException("Invalid insertPos:"+insertPos);
+    numChars = totalLayout.getCharacterCount();
+    text = newParagraph;
   }
 
-  public TextLayout getLayout (int start, int limit)
-    throws NotImplementedException
+  /***
+   * Returns the total advance between two positions in the paragraph.
+   * Characters from start to limit-1 (inclusive) are included in this count.
+   *
+   * @param start - the starting character index.
+   * @param limit - the limiting index.
+   */
+  public float getAdvanceBetween (int start, int limit)
   {
-    throw new Error ("not implemented");
+    Shape s = totalLayout.getLogicalHighlightShape( start, limit );
+    return (float)s.getBounds2D().getWidth();
   }
 
+  /**
+   * Returns a <code>TextLayout</code> object corresponding to the characters
+   * from text to limit.
+   * @param start - the starting character index.
+   * @param limit - the limiting index.
+   */
+  public TextLayout getLayout (int start, int limit)
+  {
+//     AttributedCharacterIterator aci = (new AttributedString( text, 
+// 							     start, limit
+// 							     ) ).getIterator();
+//     return new TextLayout( aci, frc );
+    return new TextLayout( totalLayout, start, limit );
+  }
+
+  /**
+   * Returns the line-break index from a given starting index and a maximum
+   * advance. The index returned is the first character outside the given
+   * advance (or the limit of the string, if all remaining characters fit.)
+   *
+   * @param start - the starting index.
+   * @param maxAdvance - the maximum advance allowed.
+   * @return the index of the first character beyond maxAdvance, or the 
+   * index of the last character + 1.
+   */
   public int getLineBreakIndex (int start, float maxAdvance)
-    throws NotImplementedException
   {
-    throw new Error ("not implemented");
-  }
+    if( start < 0 )
+      throw new IllegalArgumentException("Start parameter must be > 0.");
 
-  public void insertChar (AttributedCharacterIterator newParagraph,
-                          int insertPos)
-    throws NotImplementedException
+    double remainingLength = getAdvanceBetween( start, numChars );
+    
+    int guessOffset = (int)( ( (double)maxAdvance / (double)remainingLength)
+			     * ( (double)numChars - (double)start ) );
+    guessOffset += start;
+    if( guessOffset > numChars )
+      guessOffset = numChars;
+    
+    double guessLength = getAdvanceBetween( start, guessOffset );
+    boolean makeSmaller = ( guessLength > maxAdvance );
+    int inc = makeSmaller ? -1 : 1;
+    boolean keepGoing = true;
+
+    do
   {
-    throw new Error ("not implemented");
+	guessOffset = guessOffset + inc;
+	if( guessOffset <= start || guessOffset > numChars )
+	  {
+	    keepGoing = false;
+	  }
+	else
+	  {
+	    guessLength = getAdvanceBetween( start, guessOffset );
+	    if( makeSmaller && ( guessLength <= maxAdvance) )	  
+	      keepGoing = false;
+	    if( !makeSmaller && ( guessLength >= maxAdvance) )
+	      keepGoing = false;
+	  }
+      }
+    while( keepGoing );
+
+    // Return first index that doesn't fit.
+    if( !makeSmaller )
+      guessOffset--;
+
+    if( guessOffset > numChars )
+      return numChars;
+
+    return guessOffset;
   }
 }

Index: java/text/AttributedString.java
===================================================================
RCS file: /sources/classpath/classpath/java/text/AttributedString.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- java/text/AttributedString.java	24 Oct 2005 10:04:22 -0000	1.15
+++ java/text/AttributedString.java	18 Jun 2006 00:54:47 -0000	1.16
@@ -221,16 +221,13 @@
             // If the attribute run starts before the beginning index, we
             // need to junk it if it is an Annotation.
             Object attrib_obj = aci.getAttribute(attrib);
-            if (rs < begin)
+	    rs -= begin;
+            if (rs < 0)
               {
                 if (attrib_obj instanceof Annotation)
                    continue;
 
-                rs = begin;
-              }
-            else
-              {
-                rs -= begin;
+                rs = 0;
               }
 
             // Create a map object.  Yes this will only contain one attribute
@@ -243,7 +240,7 @@
 
         c = aci.next();
       }
-    while(c != CharacterIterator.DONE);
+    while( aci.getIndex() < end );
 
     attribs = new AttributeRange[accum.size()];
     attribs = (AttributeRange[]) accum.toArray(attribs);



From MAILER-DAEMON Sat Jun 17 22:22:24 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Frmvf-0004Ha-Rg
	for mharc-commit-classpath@gnu.org; Sat, 17 Jun 2006 22:22:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Frmve-0004FK-Ec
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 22:22:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Frmvd-0004CK-3u
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 22:22:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Frmvc-0004C3-Qk
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 22:22:20 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Frn5b-0001QT-AE
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 22:32:39 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Frmvb-0006C8-00
	for <commit-classpath@gnu.org>; Sat, 17 Jun 2006 22:22:19 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1Frmva-0006C5-0b
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 02:22:19 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Frmva-0006C5-0b@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Sun, 18 Jun 2006 02:22:18 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/GridBagLayout.java...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jun 2006 02:22:23 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/18 02:22:17

Modified files:
	.              : ChangeLog 
	java/awt       : GridBagLayout.java 
	java/awt/font  : TextMeasurer.java 

Log message:
	2006-06-18  Sven de Marothy  <sven@physto.se>
	
		* java/awt/GridBagLayout.java (AdjustForGravity): Implement.
		* java/awt/font/TextMeasurer.java: Fix copyright date, 
		remove commented-out code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7862&r2=1.7863
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/GridBagLayout.java?cvsroot=classpath&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/TextMeasurer.java?cvsroot=classpath&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7862
retrieving revision 1.7863
diff -u -b -r1.7862 -r1.7863
--- ChangeLog	18 Jun 2006 00:54:46 -0000	1.7862
+++ ChangeLog	18 Jun 2006 02:22:16 -0000	1.7863
@@ -1,5 +1,11 @@
 2006-06-18  Sven de Marothy  <sven@physto.se>
 
+	* java/awt/GridBagLayout.java (AdjustForGravity): Implement.
+	* java/awt/font/TextMeasurer.java: Fix copyright date, 
+	remove commented-out code.
+
+2006-06-18  Sven de Marothy  <sven@physto.se>
+
 	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
 	(FreetypeGlyphVector, clone): Implement cloning.
 	(getGlyphLogicalBounds): Bounds should be offset to the glyph position.

Index: java/awt/GridBagLayout.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/GridBagLayout.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- java/awt/GridBagLayout.java	22 Mar 2006 19:15:24 -0000	1.28
+++ java/awt/GridBagLayout.java	18 Jun 2006 02:22:17 -0000	1.29
@@ -324,11 +324,17 @@
     /**
      * Obsolete.
      */
-    protected void AdjustForGravity (GridBagConstraints gbc, Rectangle rect)
-      throws NotImplementedException
+  protected void AdjustForGravity (GridBagConstraints constraints, 
+				   Rectangle rect)
     {
-      // FIXME
-      throw new Error ("Not implemented");
+    Insets insets = constraints.insets;
+    if (insets != null)
+      {
+	rect.x += insets.left;
+	rect.y += insets.top;
+	rect.width -= insets.left + insets.right;
+	rect.height -= insets.top + insets.bottom;
+      }
     }
 
     /**
@@ -353,10 +359,9 @@
       // layoutInfo.  So we wait until after this for loop to set
       // layoutInfo.
       Component lastComp = null;
-      int cellx = 0;
-      int celly = 0;
-      int cellw = 0;
-      int cellh = 0;
+
+      Rectangle cell = new Rectangle();
+
       for (int i = 0; i < components.length; i++)
       {
         Component component = components[i];
@@ -370,29 +375,23 @@
         
         if (lastComp != null
             && constraints.gridheight == GridBagConstraints.REMAINDER)
-          celly += cellh;
+          cell.y += cell.height;
         else
-          celly = sumIntArray(info.rowHeights, constraints.gridy);
+          cell.y = sumIntArray(info.rowHeights, constraints.gridy);
         
         if (lastComp != null
             && constraints.gridwidth == GridBagConstraints.REMAINDER)
-          cellx += cellw;
+          cell.x += cell.width;
         else
-          cellx = sumIntArray(info.colWidths, constraints.gridx);
+          cell.x = sumIntArray(info.colWidths, constraints.gridx);
 
-        cellw = sumIntArray(info.colWidths, constraints.gridx
-                                            + constraints.gridwidth) - cellx;
-        cellh = sumIntArray(info.rowHeights, constraints.gridy
-                                             + constraints.gridheight) - celly;
+        cell.width = sumIntArray(info.colWidths, constraints.gridx
+                                            + constraints.gridwidth) - cell.x;
+        cell.height = sumIntArray(info.rowHeights, constraints.gridy
+                                             + constraints.gridheight) - cell.y;
         
-        Insets insets = constraints.insets;
-        if (insets != null)
-          {
-            cellx += insets.left;
-            celly += insets.top;
-            cellw -= insets.left + insets.right;
-            cellh -= insets.top + insets.bottom;
-          }
+        // Adjust for insets.
+ 	AdjustForGravity( constraints, cell );
 
         // Note: Documentation says that padding is added on both sides, but
         // visual inspection shows that the Sun implementation only adds it
@@ -403,14 +402,14 @@
         switch (constraints.fill)
           {
           case GridBagConstraints.HORIZONTAL:
-            dim.width = cellw;
+            dim.width = cell.width;
             break;
           case GridBagConstraints.VERTICAL:
-            dim.height = cellh;
+            dim.height = cell.height;
             break;
           case GridBagConstraints.BOTH:
-            dim.width = cellw;
-            dim.height = cellh;
+            dim.width = cell.width;
+            dim.height = cell.height;
             break;
           }
 
@@ -420,40 +419,40 @@
         switch (constraints.anchor)
           {
           case GridBagConstraints.NORTH:
-            x = cellx + (cellw - dim.width) / 2;
-            y = celly;
+            x = cell.x + (cell.width - dim.width) / 2;
+            y = cell.y;
             break;
           case GridBagConstraints.SOUTH:
-            x = cellx + (cellw - dim.width) / 2;
-            y = celly + cellh - dim.height;
+            x = cell.x + (cell.width - dim.width) / 2;
+            y = cell.y + cell.height - dim.height;
             break;
           case GridBagConstraints.WEST:
-            x = cellx;
-            y = celly + (cellh - dim.height) / 2;
+            x = cell.x;
+            y = cell.y + (cell.height - dim.height) / 2;
             break;
           case GridBagConstraints.EAST:
-            x = cellx + cellw - dim.width;
-            y = celly + (cellh - dim.height) / 2;
+            x = cell.x + cell.width - dim.width;
+            y = cell.y + (cell.height - dim.height) / 2;
             break;
           case GridBagConstraints.NORTHEAST:
-            x = cellx + cellw - dim.width;
-            y = celly;
+            x = cell.x + cell.width - dim.width;
+            y = cell.y;
             break;
           case GridBagConstraints.NORTHWEST:
-            x = cellx;
-            y = celly;
+            x = cell.x;
+            y = cell.y;
             break;
           case GridBagConstraints.SOUTHEAST:
-            x = cellx + cellw - dim.width;
-            y = celly + cellh - dim.height;
+            x = cell.x + cell.width - dim.width;
+            y = cell.y + cell.height - dim.height;
             break;
           case GridBagConstraints.SOUTHWEST:
-            x = cellx;
-            y = celly + cellh - dim.height;
+            x = cell.x;
+            y = cell.y + cell.height - dim.height;
             break;
           default:
-            x = cellx + (cellw - dim.width) / 2;
-            y = celly + (cellh - dim.height) / 2;
+            x = cell.x + (cell.width - dim.width) / 2;
+            y = cell.y + (cell.height - dim.height) / 2;
             break;
           }
         component.setBounds(info.pos_x + x, info.pos_y + y, dim.width,

Index: java/awt/font/TextMeasurer.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/font/TextMeasurer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- java/awt/font/TextMeasurer.java	18 Jun 2006 00:54:47 -0000	1.4
+++ java/awt/font/TextMeasurer.java	18 Jun 2006 02:22:17 -0000	1.5
@@ -1,5 +1,5 @@
 /* TextMeasurer.java
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -128,10 +128,6 @@
    */
   public TextLayout getLayout (int start, int limit)
   {
-//     AttributedCharacterIterator aci = (new AttributedString( text, 
-// 							     start, limit
-// 							     ) ).getIterator();
-//     return new TextLayout( aci, frc );
     return new TextLayout( totalLayout, start, limit );
   }
 



From MAILER-DAEMON Sat Jun 17 22:44:07 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrnGh-0002G0-FU
	for mharc-commit-classpath@gnu.org; Sat, 17 Jun 2006 22:44:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrnGf-0002Du-7F
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 22:44:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrnGd-0002BZ-1s
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 22:44:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrnGc-0002BR-P7
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 22:44:02 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrnQb-0002g4-4a
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 22:54:21 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrnGX-0007ei-00
	for <commit-classpath@gnu.org>; Sat, 17 Jun 2006 22:43:57 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FrnGW-0007ef-Go
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 02:43:57 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrnGW-0007ef-Go@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sun, 18 Jun 2006 02:43:56 +0000
Subject: [commit-cp] classpath/gnu javax/net/ssl/providerKeyPool.jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jun 2006 02:44:05 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/18 02:43:56

Modified files:
	gnu/javax/net/ssl/provider: KeyPool.java 
	gnu/java/security/key/rsa: RSAKeyPairGenerator.java 
	.              : ChangeLog 
	gnu/javax/crypto/key/dh: RFC2631.java 
	gnu/javax/crypto/key/srp6: SRPKeyPairGenerator.java 
	                           SRPAlgorithm.java 
	gnu/java/security/key/dss: FIPS186.java 
Removed files:
	gnu/java/security/util: Prime2.java 

Log message:
	2006-06-18  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/java/security/util/Prime2.java: Removed.
		* gnu/java/security/key/dss/FIPS186.java: Remove unused imports.
		(generateParameters): Use isProbablePrime() in BigInteger instead of Prime2.
		* gnu/java/security/key/rsa/RSAKeyPairGenerator.java: Remove unused imports.
		(generate): Use isProbablePrime() in BigInteger instead of Prime2.
		* gnu/javax/crypto/key/dh/RFC2631.java: Remove unused imports.
		(generateParameters): Use isProbablePrime() in BigInteger instead of Prime2.
		* gnu/javax/crypto/key/srp6/SRPAlgorithm.java: Remove unused imports.
		(checkParams): Use isProbablePrime() in BigInteger instead of Prime2.
		* gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java: Remove unused imports.
		(generateParameters): Use isProbablePrime() in BigInteger instead of Prime2.
		* gnu/javax/net/ssl/provider/KeyPool.java: Remove unused imports.
		(generateRSAKeyPair): Use isProbablePrime() in BigInteger instead of Prime2.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/KeyPool.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7863&r2=1.7864
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/dh/RFC2631.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/Prime2.java?cvsroot=classpath&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/srp6/SRPAlgorithm.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/FIPS186.java?cvsroot=classpath&r1=1.3&r2=1.4

Patches:
Index: javax/net/ssl/provider/KeyPool.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/KeyPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- javax/net/ssl/provider/KeyPool.java	26 Jan 2006 02:25:11 -0000	1.1
+++ javax/net/ssl/provider/KeyPool.java	18 Jun 2006 02:43:55 -0000	1.2
@@ -41,15 +41,6 @@
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.security.SecureRandom;
-import java.security.Security;
-import java.util.LinkedList;
-import javax.crypto.spec.DHParameterSpec;
-
-import gnu.java.security.hash.HashFactory;
-import gnu.java.security.hash.IMessageDigest;
-import gnu.java.security.prng.IRandom;
-import gnu.java.security.prng.LimitReachedException;
-import gnu.java.security.util.Prime2;
 
 final class KeyPool
 {
@@ -92,7 +83,7 @@
         nextBytes(kb);
         p = new BigInteger(1, kb).setBit(0);
         if (p.compareTo(lower) >= 0 && p.compareTo(upper) <= 0 &&
-            Prime2.isProbablePrime(p) && p.gcd(E).equals(ONE))
+            p.isProbablePrime(80) && p.gcd(E).equals(ONE))
           break;
       }
 
@@ -101,7 +92,7 @@
         nextBytes(kb);
         q = new BigInteger(1, kb).setBit(0);
         n = q.multiply(p);
-        if (n.bitLength() == 512 && Prime2.isProbablePrime(q) &&
+        if (n.bitLength() == 512 && q.isProbablePrime(80) &&
             q.gcd(E).equals(ONE))
           break;
       }

Index: java/security/key/rsa/RSAKeyPairGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- java/security/key/rsa/RSAKeyPairGenerator.java	11 Jun 2006 12:14:43 -0000	1.5
+++ java/security/key/rsa/RSAKeyPairGenerator.java	18 Jun 2006 02:43:55 -0000	1.6
@@ -42,7 +42,6 @@
 import gnu.java.security.Registry;
 import gnu.java.security.key.IKeyPairGenerator;
 import gnu.java.security.util.PRNG;
-import gnu.java.security.util.Prime2;
 
 import java.math.BigInteger;
 import java.security.KeyPair;
@@ -210,7 +209,7 @@
         nextRandomBytes(kb);
         p = new BigInteger(1, kb).setBit(0);
         if (p.compareTo(lower) >= 0 && p.compareTo(upper) <= 0
-            && Prime2.isProbablePrime(p) && p.gcd(e).equals(ONE))
+            && p.isProbablePrime(80) && p.gcd(e).equals(ONE))
           {
             break step1;
           }
@@ -223,7 +222,7 @@
         nextRandomBytes(kb);
         q = new BigInteger(1, kb).setBit(0);
         n = p.multiply(q);
-        if (n.bitLength() == L && Prime2.isProbablePrime(q)
+        if (n.bitLength() == L && q.isProbablePrime(80)
             && q.gcd(e).equals(ONE))
           {
             break step2;


Index: javax/crypto/key/dh/RFC2631.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/key/dh/RFC2631.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- javax/crypto/key/dh/RFC2631.java	3 Feb 2006 19:29:01 -0000	1.2
+++ javax/crypto/key/dh/RFC2631.java	18 Jun 2006 02:43:56 -0000	1.3
@@ -40,7 +40,6 @@
 
 import gnu.java.security.hash.Sha160;
 import gnu.java.security.util.PRNG;
-import gnu.java.security.util.Prime2;
 
 import java.math.BigInteger;
 import java.security.SecureRandom;
@@ -157,7 +156,7 @@
             q = U.setBit(m - 1).setBit(0);
             // 6. Use a robust primality algorithm to test whether q is prime.
             // 7. If q is not prime then go to 4.
-            if (Prime2.isProbablePrime(q))
+            if (q.isProbablePrime(80))
               {
                 break step4;
               }
@@ -190,7 +189,7 @@
             // 16. If p > 2^(L-1) use a robust primality test to test whether p is
             //     prime. Else go to 18.
             //17. If p is prime output p, q, seed, counter and stop.
-            if (Prime2.isProbablePrime(p))
+            if (p.isProbablePrime(80))
               {
                 break algorithm;
               }

Index: javax/crypto/key/srp6/SRPKeyPairGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- javax/crypto/key/srp6/SRPKeyPairGenerator.java	11 Jun 2006 12:14:44 -0000	1.3
+++ javax/crypto/key/srp6/SRPKeyPairGenerator.java	18 Jun 2006 02:43:56 -0000	1.4
@@ -42,7 +42,6 @@
 import gnu.java.security.Registry;
 import gnu.java.security.key.IKeyPairGenerator;
 import gnu.java.security.util.PRNG;
-import gnu.java.security.util.Prime2;
 
 import java.math.BigInteger;
 import java.security.KeyPair;
@@ -244,10 +243,10 @@
             q = new BigInteger(1, qBytes);
             q = q.setBit(0).setBit(l - 2).clearBit(l - 1);
           }
-        while (!Prime2.isProbablePrime(q));
+        while (! q.isProbablePrime(80));
         p = q.multiply(TWO).add(ONE);
       }
-    while (p.bitLength() != l || !Prime2.isProbablePrime(p));
+    while (p.bitLength() != l || ! p.isProbablePrime(80));
 
     // compute g. from FIPS-186, Appendix 4: e == 2
     BigInteger p_minus_1 = p.subtract(ONE);

Index: javax/crypto/key/srp6/SRPAlgorithm.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/key/srp6/SRPAlgorithm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- javax/crypto/key/srp6/SRPAlgorithm.java	26 Jan 2006 02:25:09 -0000	1.1
+++ javax/crypto/key/srp6/SRPAlgorithm.java	18 Jun 2006 02:43:56 -0000	1.2
@@ -38,7 +38,6 @@
 
 package gnu.javax.crypto.key.srp6;
 
-import gnu.java.security.util.Prime2;
 import gnu.javax.crypto.sasl.srp.SRPRegistry;
 
 import java.math.BigInteger;
@@ -151,13 +150,13 @@
                                                + SRPRegistry.MINIMUM_MODULUS_BITLENGTH);
       }
     // 2. N should be a prime
-    if (!Prime2.passEulerCriterion(N))
+    if (! N.isProbablePrime(80))
       {
         throw new IllegalArgumentException("N should be prime but isn't");
       }
     // 3. N should be of the form 2*q + 1, where q is prime
     final BigInteger q = N.subtract(ONE).divide(TWO);
-    if (!Prime2.passEulerCriterion(q))
+    if (! q.isProbablePrime(80))
       {
         throw new IllegalArgumentException("(N-1)/2 should be prime but isn't");
       }

Index: java/security/key/dss/FIPS186.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/dss/FIPS186.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- java/security/key/dss/FIPS186.java	26 Mar 2006 22:57:46 -0000	1.3
+++ java/security/key/dss/FIPS186.java	18 Jun 2006 02:43:56 -0000	1.4
@@ -40,7 +40,6 @@
 
 import gnu.java.security.hash.Sha160;
 import gnu.java.security.util.PRNG;
-import gnu.java.security.util.Prime2;
 
 import java.math.BigInteger;
 import java.security.SecureRandom;
@@ -183,7 +182,7 @@
             // probability of a non-prime number passing the test is at
             // most 1/2**80.
             // 5. If q is not prime, go to step 1.
-            if (Prime2.isProbablePrime(q))
+            if (q.isProbablePrime(80))
               {
                 break step1;
               }
@@ -228,7 +227,7 @@
               {
                 // 11. Perform a robust primality test on p.
                 // 12. If p passes the test performed in step 11, go to step 15.
-                if (Prime2.isProbablePrime(p))
+                if (p.isProbablePrime(80))
                   {
                     break algorithm;
                   }

Index: java/security/util/Prime2.java
===================================================================
RCS file: java/security/util/Prime2.java
diff -N java/security/util/Prime2.java
--- java/security/util/Prime2.java	11 Jun 2006 12:14:44 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,396 +0,0 @@
-/* Prime2.java -- 
-   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
-
-This file is a 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 of the License, 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; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
-USA
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version.  */
-
-
-package gnu.java.security.util;
-
-import gnu.classpath.Configuration;
-
-import java.lang.ref.WeakReference;
-import java.math.BigInteger;
-import java.util.Map;
-import java.util.WeakHashMap;
-import java.util.logging.Logger;
-
-/**
- * <p>A collection of prime number related utilities used in this library.</p>
- */
-public class Prime2
-{
-  private static final Logger log = Logger.getLogger(Prime2.class.getName());
-  private static final int DEFAULT_CERTAINTY = 20; // XXX is this a good value?
-
-  private static final BigInteger ZERO = BigInteger.ZERO;
-
-  private static final BigInteger ONE = BigInteger.ONE;
-
-  private static final BigInteger TWO = BigInteger.valueOf(2L);
-
-  /**
-   * The first SMALL_PRIME primes: Algorithm P, section 1.3.2, The Art of
-   * Computer Programming, Donald E. Knuth.
-   */
-  private static final int SMALL_PRIME_COUNT = 1000;
-
-  private static final BigInteger[] SMALL_PRIME = new BigInteger[SMALL_PRIME_COUNT];
-  static
-    {
-      long time = -System.currentTimeMillis();
-      SMALL_PRIME[0] = TWO;
-      int N = 3;
-      int J = 0;
-      int prime;
-      P2: while (true)
-        {
-          SMALL_PRIME[++J] = BigInteger.valueOf(N);
-          if (J >= 999)
-            {
-              break P2;
-            }
-          P4: while (true)
-            {
-              N += 2;
-              P6: for (int K = 1; true; K++)
-                {
-                  prime = SMALL_PRIME[K].intValue();
-                  if ((N % prime) == 0)
-                    {
-                      continue P4;
-                    }
-                  else if ((N / prime) <= prime)
-                    {
-                      continue P2;
-                    }
-                }
-            }
-        }
-      time += System.currentTimeMillis();
-      if (Configuration.DEBUG)
-        {
-          StringBuffer sb;
-          for (int i = 0; i < (SMALL_PRIME_COUNT / 10); i++)
-            {
-              sb = new StringBuffer();
-              for (int j = 0; j < 10; j++)
-                {
-                  sb.append(String.valueOf(SMALL_PRIME[i * 10 + j])).append(" ");
-                }
-              log.fine(sb.toString());
-            }
-        }
-      if (Configuration.DEBUG)
-        {
-          log.fine("Generating first " + String.valueOf(SMALL_PRIME_COUNT)
-                   + " primes took: " + String.valueOf(time) + " ms.");
-        }
-    }
-
-  private static final Map knownPrimes = new WeakHashMap();
-
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
-  /** Trivial constructor to enforce Singleton pattern. */
-  private Prime2()
-  {
-    super();
-  }
-
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  /**
-   * <p>Trial division for the first 1000 small primes.</p>
-   *
-   * <p>Returns <code>true</code> if at least one small prime, among the first
-   * 1000 ones, was found to divide the designated number. Retuens <code>false</code>
-   * otherwise.</p>
-   *
-   * @param w the number to test.
-   * @return <code>true</code> if at least one small prime was found to divide
-   * the designated number.
-   */
-  public static boolean hasSmallPrimeDivisor(BigInteger w)
-  {
-    BigInteger prime;
-    for (int i = 0; i < SMALL_PRIME_COUNT; i++)
-      {
-        prime = SMALL_PRIME[i];
-        if (w.mod(prime).equals(ZERO))
-          {
-            if (Configuration.DEBUG)
-              log.fine(prime.toString(16) + " | " + w.toString(16) + "...");
-            return true;
-          }
-      }
-    if (Configuration.DEBUG)
-      log.fine(w.toString(16) + " has no small prime divisors...");
-    return false;
-  }
-
-  /**
-   * <p>Java port of Colin Plumb primality test (Euler Criterion)
-   * implementation for a base of 2 --from bnlib-1.1 release, function
-   * primeTest() in prime.c. this is his comments.</p>
-   *
-   * <p>"Now, check that bn is prime. If it passes to the base 2, it's prime
-   * beyond all reasonable doubt, and everything else is just gravy, but it
-   * gives people warm fuzzies to do it.</p>
-   *
-   * <p>This starts with verifying Euler's criterion for a base of 2. This is
-   * the fastest pseudoprimality test that I know of, saving a modular squaring
-   * over a Fermat test, as well as being stronger. 7/8 of the time, it's as
-   * strong as a strong pseudoprimality test, too. (The exception being when
-   * <code>bn == 1 mod 8</code> and <code>2</code> is a quartic residue, i.e.
-   * <code>bn</code> is of the form <code>a^2 + (8*b)^2</code>.) The precise
-   * series of tricks used here is not documented anywhere, so here's an
-   * explanation. Euler's criterion states that if <code>p</code> is prime
-   * then <code>a^((p-1)/2)</code> is congruent to <code>Jacobi(a,p)</code>,
-   * modulo <code>p</code>. <code>Jacobi(a, p)</code> is a function which is
-   * <code>+1</code> if a is a square modulo <code>p</code>, and <code>-1</code>
-   * if it is not. For <code>a = 2</code>, this is particularly simple. It's
-   * <code>+1</code> if <code>p == +/-1 (mod 8)</code>, and <code>-1</code> if
-   * <code>m == +/-3 (mod 8)</code>. If <code>p == 3 (mod 4)</code>, then all
-   * a strong test does is compute <code>2^((p-1)/2)</code>. and see if it's
-   * <code>+1</code> or <code>-1</code>. (Euler's criterion says <i>which</i>
-   * it should be.) If <code>p == 5 (mod 8)</code>, then <code>2^((p-1)/2)</code>
-   * is <code>-1</code>, so the initial step in a strong test, looking at
-   * <code>2^((p-1)/4)</code>, is wasted --you're not going to find a
-   * <code>+/-1</code> before then if it <b>is</b> prime, and it shouldn't
-   * have either of those values if it isn't. So don't bother.</p>
-   *
-   * <p>The remaining case is <code>p == 1 (mod 8)</code>. In this case, we
-   * expect <code>2^((p-1)/2) == 1 (mod p)</code>, so we expect that the
-   * square root of this, <code>2^((p-1)/4)</code>, will be <code>+/-1 (mod p)
-   * </code>. Evaluating this saves us a modular squaring 1/4 of the time. If
-   * it's <code>-1</code>, a strong pseudoprimality test would call <code>p</code>
-   * prime as well. Only if the result is <code>+1</code>, indicating that
-   * <code>2</code> is not only a quadratic residue, but a quartic one as well,
-   * does a strong pseudoprimality test verify more things than this test does.
-   * Good enough.</p>
-   *
-   * <p>We could back that down another step, looking at <code>2^((p-1)/8)</code>
-   * if there was a cheap way to determine if <code>2</code> were expected to
-   * be a quartic residue or not. Dirichlet proved that <code>2</code> is a
-   * quadratic residue iff <code>p</code> is of the form <code>a^2 + (8*b^2)</code>.
-   * All primes <code>== 1 (mod 4)</code> can be expressed as <code>a^2 +
-   * (2*b)^2</code>, but I see no cheap way to evaluate this condition."</p>
-   *
-   * @param bn the number to test.
-   * @return <code>true</code> iff the designated number passes Euler criterion
-   * as implemented by Colin Plumb in his <i>bnlib</i> version 1.1.
-   */
-  public static boolean passEulerCriterion(final BigInteger bn)
-  {
-    BigInteger bn_minus_one = bn.subtract(ONE);
-    BigInteger e = bn_minus_one;
-    // l is the 3 least-significant bits of e
-    int l = e.and(BigInteger.valueOf(7L)).intValue();
-    int j = 1; // Where to start in prime array for strong prime tests
-    BigInteger a;
-    int k;
-
-    if (l != 0)
-      {
-        e = e.shiftRight(1);
-        a = TWO.modPow(e, bn);
-        if (l == 6) // bn == 7 mod 8, expect +1
-          {
-            if (a.bitLength() != 1)
-              {
-                debugBI("Fails Euler criterion #1", bn);
-                return false; // Not prime
-              }
-            k = 1;
-          }
-        else // bn == 3 or 5 mod 8, expect -1 == bn-1
-          {
-            a = a.add(ONE);
-            if (a.compareTo(bn) != 0)
-              {
-                debugBI("Fails Euler criterion #2", bn);
-                return false; // Not prime
-              }
-            k = 1;
-            if ((l & 4) != 0) // bn == 5 mod 8, make odd for strong tests
-              {
-                e = e.shiftRight(1);
-                k = 2;
-              }
-          }
-      }
-    else // bn == 1 mod 8, expect 2^((bn-1)/4) == +/-1 mod bn
-      {
-        e = e.shiftRight(2);
-        a = TWO.modPow(e, bn);
-        if (a.bitLength() == 1)
-          j = 0; // Re-do strong prime test to base 2
-        else
-          {
-            a = a.add(ONE);
-            if (a.compareTo(bn) != 0)
-              {
-                debugBI("Fails Euler criterion #3", bn);
-                return false; // Not prime
-              }
-          }
-        // bnMakeOdd(n) = d * 2^s. Replaces n with d and returns s.
-        k = e.getLowestSetBit();
-        e = e.shiftRight(k);
-        k += 2;
-      }
-    // It's prime!  Now go on to confirmation tests
-
-    // Now, e = (bn-1)/2^k is odd.  k >= 1, and has a given value with
-    // probability 2^-k, so its expected value is 2.  j = 1 in the usual case
-    // when the previous test was as good as a strong prime test, but 1/8 of
-    // the time, j = 0 because the strong prime test to the base 2 needs to
-    // be re-done.
-    for (int i = j; i < 7; i++) // try only the first 7 primes
-      {
-        a = SMALL_PRIME[i];
-        a = a.modPow(e, bn);
-        if (a.bitLength() == 1)
-          continue; // Passed this test
-
-        l = k;
-        while (true)
-          {
-//            a = a.add(ONE);
-//            if (a.compareTo(w) == 0) { // Was result bn-1?
-            if (a.compareTo(bn_minus_one) == 0) // Was result bn-1?
-              break; // Prime
-
-            if (--l == 0) // Reached end, not -1? luck?
-              {
-                debugBI("Fails Euler criterion #4", bn);
-                return false; // Failed, not prime
-              }
-            // This portion is executed, on average, once
-//            a = a.subtract(ONE); // Put a back where it was
-            a = a.modPow(TWO, bn);
-            if (a.bitLength() == 1)
-              {
-                debugBI("Fails Euler criterion #5", bn);
-                return false; // Failed, not prime
-              }
-          }
-        // It worked (to the base primes[i])
-      }
-    debugBI("Passes Euler criterion", bn);
-    return true;
-  }
-
-  public static boolean isProbablePrime(BigInteger w)
-  {
-    return isProbablePrime(w, DEFAULT_CERTAINTY);
-  }
-
-  /**
-   * Wrapper around {@link BigInteger#isProbablePrime(int)} with few pre-checks.
-   *
-   * @param w the integer to test.
-   * @param certainty the certainty with which to compute the test.
-   */
-  public static boolean isProbablePrime(BigInteger w, int certainty)
-  {
-    // Nonnumbers are not prime.
-    if (w == null)
-        return false;
-
-    // eliminate trivial cases when w == 0 or 1
-    if (w.equals(ZERO) || w.equals(ONE))
-        return false;
-
-    // Test if w is a known small prime.
-    for (int i = 0; i < SMALL_PRIME_COUNT; i++)
-        if (w.equals(SMALL_PRIME[i]))
-          {
-            if (Configuration.DEBUG)
-              log.fine(w.toString(16) + " is a small prime");
-            return true;
-          }
-
-    // Check if it's already a known prime
-    WeakReference obj = (WeakReference) knownPrimes.get(w);
-    if (obj != null && w.equals(obj.get()))
-      {
-        if (Configuration.DEBUG)
-          log.fine("found in known primes");
-        return true;
-      }
-
-    // trial division with first 1000 primes
-    if (hasSmallPrimeDivisor(w))
-      {
-        if (Configuration.DEBUG)
-          log.fine(w.toString(16) + " has a small prime divisor. Rejected...");
-        return false;
-      }
-
-//     Euler's criterion.
-//           if (passEulerCriterion(w)) {
-//              if (DEBUG && debuglevel > 4) {
-//                 debug(w.toString(16)+" passes Euler's criterion...");
-//              }
-//           } else {
-//              if (DEBUG && debuglevel > 4) {
-//                 debug(w.toString(16)+" fails Euler's criterion. Rejected...");
-//              }
-//              return false;
-//           }
-//
-//    if (DEBUG && debuglevel > 4)
-//      {
-//        debug(w.toString(16) + " is probable prime. Accepted...");
-//      }
-
-    boolean result = w.isProbablePrime(certainty);
-    if (result && certainty > 0) // store it in the known primes weak hash-map
-      knownPrimes.put(w, new WeakReference(w));
-
-    return result;
-  }
-
-  // helper methods -----------------------------------------------------------
-
-  private static final void debugBI(String msg, BigInteger bn)
-  {
-    if (Configuration.DEBUG)
-      log.fine("*** " + msg + ": 0x" + bn.toString(16));
-  }
-}



From MAILER-DAEMON Sat Jun 17 23:45:34 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FroEA-0000RS-8g
	for mharc-commit-classpath@gnu.org; Sat, 17 Jun 2006 23:45:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FroE8-0000Os-Oc
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 23:45:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FroE7-0000NB-Mt
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 23:45:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FroE7-0000Mu-J8
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 23:45:31 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FroO6-0006E6-SZ
	for commit-classpath@gnu.org; Sat, 17 Jun 2006 23:55:50 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FroE6-0000xZ-00
	for <commit-classpath@gnu.org>; Sat, 17 Jun 2006 23:45:30 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FroE5-0000xW-Nu
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 03:45:30 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FroE5-0000xW-Nu@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Sun, 18 Jun 2006 03:45:29 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/event/KeyEvent.jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jun 2006 03:45:33 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/18 03:45:29

Modified files:
	.              : ChangeLog 
	java/awt/event : KeyEvent.java 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_GtkWindowPeer.c 

Log message:
	2006-06-18  Sven de Marothy  <sven@physto.se>
	
		* java/awt/event/KeyEvent.java:
		(VK_WINDOWS, VK_CONTEXT_MENU, VK_BEGIN): Add new keysym fields.
		*  natve/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
		Implement WINDOWS, ALT_GR and CONTEXT_MENU keysyms.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7864&r2=1.7865
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/event/KeyEvent.java?cvsroot=classpath&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c?cvsroot=classpath&r1=1.66&r2=1.67

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7864
retrieving revision 1.7865
diff -u -b -r1.7864 -r1.7865
--- ChangeLog	18 Jun 2006 02:43:55 -0000	1.7864
+++ ChangeLog	18 Jun 2006 03:45:27 -0000	1.7865
@@ -1,3 +1,10 @@
+2006-06-18  Sven de Marothy  <sven@physto.se>
+
+	* java/awt/event/KeyEvent.java:
+	(VK_WINDOWS, VK_CONTEXT_MENU, VK_BEGIN): Add new keysym fields.
+	*  natve/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
+	Implement WINDOWS, ALT_GR and CONTEXT_MENU keysyms.
+
 2006-06-18  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	* gnu/java/security/util/Prime2.java: Removed.

Index: java/awt/event/KeyEvent.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/event/KeyEvent.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- java/awt/event/KeyEvent.java	12 Sep 2005 03:46:42 -0000	1.14
+++ java/awt/event/KeyEvent.java	18 Jun 2006 03:45:28 -0000	1.15
@@ -993,6 +993,27 @@
   public static final int VK_ALT_GRAPH = 65406;
 
   /**
+   * The 'begin' key VK_BEGIN
+   *
+   * @since 1.5
+   */
+  public static final int VK_BEGIN = 65368;
+
+  /**
+   * The context-menu key VK_CONTEXT_MENU
+   *
+   * @since 1.5
+   */
+  public static final int VK_CONTEXT_MENU = 525;
+
+  /**
+   * The 'Windows' key VK_WINDOWS
+   *
+   * @since 1.5
+   */
+  public static final int VK_WINDOWS = 524;
+
+  /**
    * The virtual key VK_UNDEFINED. This is used for key typed events, which
    * do not have a virtual key.
    */

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file: /sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	8 Apr 2006 22:58:56 -0000	1.66
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	18 Jun 2006 03:45:28 -0000	1.67
@@ -246,6 +246,10 @@
 #define VK_COMPOSE 65312
 #define VK_ALT_GRAPH 65406
 #define VK_UNDEFINED 0
+#define VK_BEGIN 65368
+#define VK_CONTEXT_MENU 525
+#define VK_WINDOWS 524
+
 
 #define AWT_KEY_CHAR_UNDEFINED 0
 
@@ -721,14 +725,28 @@
       return VK_CUT;
       return VK_COPY;
       return VK_PASTE;
+      */
+    case GDK_Undo:
       return VK_UNDO;
+    case GDK_Redo:
       return VK_AGAIN;
+      /*
       return VK_FIND;
       return VK_PROPS;
       return VK_STOP;
       return VK_COMPOSE;
+      */
+    case GDK_ISO_Level3_Shift:
       return VK_ALT_GRAPH;
+      /*
+	case VK_BEGIN:
       */
+    case GDK_Menu:
+      return VK_CONTEXT_MENU;
+    case GDK_Super_L:
+    case GDK_Super_R:
+      return VK_WINDOWS;
+
     default:
       return VK_UNDEFINED;
     }
@@ -2115,14 +2133,27 @@
     case VK_CUT:
     case VK_COPY:
     case VK_PASTE:
+      */
     case VK_UNDO:
+      return GDK_Undo;
     case VK_AGAIN:
+      return GDK_Redo;
+      /*
     case VK_FIND:
     case VK_PROPS:
     case VK_STOP:
     case VK_COMPOSE:
+      */
     case VK_ALT_GRAPH:
+      return GDK_ISO_Level3_Shift;
+      /*
+	case VK_BEGIN:
       */
+    case VK_CONTEXT_MENU:
+      return GDK_Menu;
+    case VK_WINDOWS:
+      return GDK_Super_R;
+
     default:
       return GDK_VoidSymbol;
     }



From MAILER-DAEMON Sun Jun 18 02:59:34 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrrFu-00046U-Cs
	for mharc-commit-classpath@gnu.org; Sun, 18 Jun 2006 02:59:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrrFs-00045N-5x
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 02:59:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrrFq-00043B-6S
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 02:59:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrrFq-00042u-2A
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 02:59:30 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrrPr-0001Uz-6L
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 03:09:51 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrrFn-0001gh-00
	for <commit-classpath@gnu.org>; Sun, 18 Jun 2006 02:59:27 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FrrFm-0001ge-Dp
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 06:59:27 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrrFm-0001ge-Dp@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sun, 18 Jun 2006 06:59:26 +0000
Subject: [commit-cp] classpath/gnu/java/security/hash Whirlpool.java...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jun 2006 06:59:32 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/18 06:59:26

Modified files:
	gnu/java/security/hash: Whirlpool.java RipeMD128.java 
	                        Sha384.java Tiger.java MD4.java MD5.java 
	                        Sha256.java Sha512.java Haval.java 
	                        Sha160.java IMessageDigest.java 
	                        BaseHash.java MD2.java RipeMD160.java 
	                        HashFactory.java 
	.              : ChangeLog 

Log message:
	2006-06-18  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/java/security/hash/Whirlpool.java: Source formatting.
		* gnu/java/security/hash/Tiger.java: Likewise.
		* gnu/java/security/hash/Sha512.java: Likewise.
		* gnu/java/security/hash/Sha384.java: Likewise.
		* gnu/java/security/hash/Sha256.java: Likewise.
		* gnu/java/security/hash/Sha160.java: Likewise.
		* gnu/java/security/hash/RipeMD160.java: Likewise.
		* gnu/java/security/hash/RipeMD128.java: Likewise.
		* gnu/java/security/hash/MD5.java: Likewise.
		* gnu/java/security/hash/MD4.java: Likewise.
		* gnu/java/security/hash/MD2.java: Likewise.
		* gnu/java/security/hash/IMessageDigest.java: Likewise.
		* gnu/java/security/hash/Haval.java: Likewise.
		* gnu/java/security/hash/HashFactory.java: Likewise.
		* gnu/java/security/hash/BaseHash.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Whirlpool.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/RipeMD128.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Sha384.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Tiger.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/MD4.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/MD5.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Sha256.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Sha512.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Haval.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Sha160.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/IMessageDigest.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/BaseHash.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/MD2.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/RipeMD160.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/HashFactory.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7865&r2=1.7866

Patches:















Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7865
retrieving revision 1.7866
diff -u -b -r1.7865 -r1.7866
--- ChangeLog	18 Jun 2006 03:45:27 -0000	1.7865
+++ ChangeLog	18 Jun 2006 06:59:24 -0000	1.7866
@@ -1,3 +1,21 @@
+2006-06-18  Raif S. Naffah  <raif@swiftdsl.com.au>
+
+	* gnu/java/security/hash/Whirlpool.java: Source formatting.
+	* gnu/java/security/hash/Tiger.java: Likewise.
+	* gnu/java/security/hash/Sha512.java: Likewise.
+	* gnu/java/security/hash/Sha384.java: Likewise.
+	* gnu/java/security/hash/Sha256.java: Likewise.
+	* gnu/java/security/hash/Sha160.java: Likewise.
+	* gnu/java/security/hash/RipeMD160.java: Likewise.
+	* gnu/java/security/hash/RipeMD128.java: Likewise.
+	* gnu/java/security/hash/MD5.java: Likewise.
+	* gnu/java/security/hash/MD4.java: Likewise.
+	* gnu/java/security/hash/MD2.java: Likewise.
+	* gnu/java/security/hash/IMessageDigest.java: Likewise.
+	* gnu/java/security/hash/Haval.java: Likewise.
+	* gnu/java/security/hash/HashFactory.java: Likewise.
+	* gnu/java/security/hash/BaseHash.java: Likewise.
+
 2006-06-18  Sven de Marothy  <sven@physto.se>
 
 	* java/awt/event/KeyEvent.java:



From MAILER-DAEMON Sun Jun 18 05:16:50 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FrtOk-0000IX-AU
	for mharc-commit-classpath@gnu.org; Sun, 18 Jun 2006 05:16:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FrtOi-0000GX-2J
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 05:16:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FrtOh-0000Fm-LG
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 05:16:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FrtOh-0000FX-2Q
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 05:16:47 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FrtYj-0000r8-HX
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 05:27:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FrtOg-0005Uf-00
	for <commit-classpath@gnu.org>; Sun, 18 Jun 2006 05:16:46 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FrtOe-0005Uc-RG
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 09:16:46 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FrtOe-0005Uc-RG@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Sun, 18 Jun 2006 09:16:44 +0000
Subject: [commit-cp] classpath includeMakefile.am native/jni/gconf-p...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jun 2006 09:16:48 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/18 09:16:44

Modified files:
	include        : Makefile.am 
	native/jni/gconf-peer: GConfNativePeer.c 
	.              : ChangeLog 

Log message:
	       * include/Makefile.am: gnu_java_util_prefs_gconf_%.h should depend
	       on gnu/java/util/prefs/gconf/%.class.
	       * Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class: Fix
	       chache typo, should be cache.
	       (Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1keys):
	       Declare tmp early.
	       (Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1nodes):
	       Likewise.
	       (Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1remove_1dir):
	       Don't return a value for void function.
	       (Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1add_1dir)
	        Likewise.
	       (Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1dir_1exists):
	       Mark clazz as unused.  Return JNI_FALSE, not NULL for jboolean
	       function.
	       (Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class):
	       Mark clazz ad unused.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/include/Makefile.am?cvsroot=classpath&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gconf-peer/GConfNativePeer.c?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7866&r2=1.7867

Patches:
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- include/Makefile.am	17 Jun 2006 15:53:36 -0000	1.65
+++ include/Makefile.am	18 Jun 2006 09:16:43 -0000	1.66
@@ -176,7 +176,7 @@
 $(top_srcdir)/include/gnu_javax_sound_midi_dssi_%.h: $(top_builddir)/$(CLASSDIR)/gnu/javax/sound/midi/dssi/%.class
 	$(JAVAH) -o $@ gnu.javax.sound.midi.dssi.$*
 
-$(top_srcdir)/include/gnu_java_util_prefs_gconf_%.h: $(top_builddir)/$(CLASSDIR)/java/util/prefs/gconf/%.class
+$(top_srcdir)/include/gnu_java_util_prefs_gconf_%.h: $(top_builddir)/$(CLASSDIR)/gnu/java/util/prefs/gconf/%.class
 	$(JAVAH) -o $@ gnu.java.util.prefs.gconf.$*
 
 $(top_srcdir)/include/gnu_java_net_VMPlainDatagramSocketImpl.h: $(top_srcdir)/vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java

Index: native/jni/gconf-peer/GConfNativePeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gconf-peer/GConfNativePeer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- native/jni/gconf-peer/GConfNativePeer.c	17 Jun 2006 15:53:37 -0000	1.1
+++ native/jni/gconf-peer/GConfNativePeer.c	18 Jun 2006 09:16:43 -0000	1.2
@@ -111,7 +111,7 @@
 	(JNIEnv *env, jclass clazz)
 {
 	if (reference_count == 0) {
-		Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1chache
+		Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1cache
 				(env, clazz);
 		return;
 	}
@@ -160,6 +160,7 @@
 	const char 	*dir	 = NULL;
 	GError 		*err 	 = NULL;
 	GSList 		*entries = NULL;
+	GSList          *tmp;
 	
 	/* java.util.ArrayList */
 	jobject jlist = NULL;
@@ -190,7 +191,7 @@
 		return NULL;
 	}
 
-	GSList* tmp = entries;
+	tmp = entries;
 	while (tmp != NULL) {
 		const char *_val = gconf_entry_get_key(tmp->data);		
 		_val = strrchr (_val, '/');	++_val;
@@ -219,6 +220,7 @@
 	const char 	*dir	 = NULL;
 	GError 		*err 	 = NULL;
 	GSList 		*entries = NULL;
+	GSList		*tmp;
 	
 	/* java.util.ArrayList */
 	jobject jlist = NULL;
@@ -248,7 +250,7 @@
 		return NULL;
 	}
 
-	GSList* tmp = entries;
+	tmp = entries;
 	while (tmp != NULL) {
 		const char *_val = tmp->data;
 		_val = strrchr (_val, '/');	++_val;
@@ -378,9 +380,8 @@
     const char *dir = NULL;
     
     dir = JCL_jstring_to_cstring (env, node);
-	if (dir == NULL) {
-		return NULL;
-	}
+    if (dir == NULL)
+      return;
 	
 	gconf_client_remove_dir (client, dir, NULL);
 	
@@ -399,9 +400,8 @@
     const char *dir	= NULL;
 
     dir = JCL_jstring_to_cstring (env, node);
-	if (dir == NULL) {
-		return NULL;
-	}
+    if (dir == NULL)
+      return;
 	
 	/* ignore errors */
 	gconf_client_add_dir (client, dir, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
@@ -416,15 +416,14 @@
  */
 JNIEXPORT jboolean JNICALL
 Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1dir_1exists
-    (JNIEnv *env, jclass clazz, jstring node)
+    (JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring node)
 { 
     const char *dir	  = NULL;
 	jboolean    value = JNI_FALSE;
 	
     dir = JCL_jstring_to_cstring (env, node);
-	if (dir == NULL) {
-		return NULL;
-	}
+    if (dir == NULL)
+      return value;
 	
     /* we ignore errors here */
     value = gconf_client_dir_exists (client, dir, NULL);
@@ -441,7 +440,7 @@
  */
 JNIEXPORT void
 JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class
-	(JNIEnv *env, jclass clazz)
+	(JNIEnv *env, jclass clazz __attribute__ ((unused)))
 {
 	if (reference_count == 0) {
 		/* last reference, free all resources and return */

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7866
retrieving revision 1.7867
diff -u -b -r1.7866 -r1.7867
--- ChangeLog	18 Jun 2006 06:59:24 -0000	1.7866
+++ ChangeLog	18 Jun 2006 09:16:43 -0000	1.7867
@@ -1,3 +1,23 @@
+2006-06-19  Mark Wielaard  <mark@klomp.org>
+
+	* include/Makefile.am: gnu_java_util_prefs_gconf_%.h should depend
+	on gnu/java/util/prefs/gconf/%.class.
+	* Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class: Fix
+	chache typo, should be cache.
+	(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1keys):
+	Declare tmp early.
+	(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1nodes):
+	Likewise.
+	(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1remove_1dir):
+	Don't return a value for void function.
+	(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1add_1dir)
+	Likewise.
+	(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1dir_1exists):
+	Mark clazz as unused.  Return JNI_FALSE, not NULL for jboolean
+	function.
+	(Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class):
+	Mark clazz ad unused.
+
 2006-06-18  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	* gnu/java/security/hash/Whirlpool.java: Source formatting.



From MAILER-DAEMON Sun Jun 18 14:33:17 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fs25F-0006yz-58
	for mharc-commit-classpath@gnu.org; Sun, 18 Jun 2006 14:33:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fs25C-0006uc-4Y
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:33:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fs25A-0006rE-JZ
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:33:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fs25A-0006r2-6v
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:33:12 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fs2FI-0008PL-5T
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:43:40 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fs259-00041M-00
	for <commit-classpath@gnu.org>; Sun, 18 Jun 2006 14:33:11 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fs258-000412-P9
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 18:33:11 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fs258-000412-P9@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Sun, 18 Jun 2006 18:33:10 +0000
Subject: [commit-cp] classpath ChangeLog native/jni/gconf-peer/Makef...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jun 2006 18:33:14 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/18 18:33:10

Modified files:
	.              : ChangeLog 
	native/jni/gconf-peer: Makefile.am 

Log message:
	2006-06-18  Jim Huang  <jserv@kaffe.org>
	
		PR classpath/28076:
		* native/jni/gconf-peer/Makefile.am (libgconfpeer_la_LIBADD):
		Fixed typo.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7867&r2=1.7868
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gconf-peer/Makefile.am?cvsroot=classpath&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7867
retrieving revision 1.7868
diff -u -b -r1.7867 -r1.7868
--- ChangeLog	18 Jun 2006 09:16:43 -0000	1.7867
+++ ChangeLog	18 Jun 2006 18:33:09 -0000	1.7868
@@ -1,3 +1,9 @@
+2006-06-18  Jim Huang  <jserv@kaffe.org>
+
+	PR classpath/28076:
+	* native/jni/gconf-peer/Makefile.am (libgconfpeer_la_LIBADD):
+	Fixed typo.
+
 2006-06-19  Mark Wielaard  <mark@klomp.org>
 
 	* include/Makefile.am: gnu_java_util_prefs_gconf_%.h should depend

Index: native/jni/gconf-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gconf-peer/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- native/jni/gconf-peer/Makefile.am	17 Jun 2006 15:53:37 -0000	1.1
+++ native/jni/gconf-peer/Makefile.am	18 Jun 2006 18:33:10 -0000	1.2
@@ -2,7 +2,7 @@
 
 libgconfpeer_la_SOURCES = GConfNativePeer.c
 
-libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
+libgconfpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
                        $(top_builddir)/native/jni/classpath/jcl.lo
 
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GCONF_LIBS@ 



From MAILER-DAEMON Sun Jun 18 14:45:25 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fs2Gz-0005Rn-7F
	for mharc-commit-classpath@gnu.org; Sun, 18 Jun 2006 14:45:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fs2Gy-0005Ri-GB
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:45:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fs2Gw-0005RW-9h
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:45:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fs2Gw-0005RT-4M
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:45:22 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fs2R4-0000ew-4f
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:55:50 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fs2Gv-0004Yx-00
	for <commit-classpath@gnu.org>; Sun, 18 Jun 2006 14:45:21 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fs2Gt-0004Yt-NW
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 18:45:21 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fs2Gt-0004Yt-NW@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Sun, 18 Jun 2006 18:45:19 +0000
Subject: [commit-cp] classpath ChangeLog tools/gnu/classpath/tools/g...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jun 2006 18:45:24 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/18 18:45:19

Modified files:
	.              : ChangeLog 
	tools/gnu/classpath/tools/getopt: Parser.java 

Log message:
		* tools/gnu/classpath/tools/getopt/Parser.java (handleLongOption):
		Also handle short options.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7868&r2=1.7869
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/getopt/Parser.java?cvsroot=classpath&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7868
retrieving revision 1.7869
diff -u -b -r1.7868 -r1.7869
--- ChangeLog	18 Jun 2006 18:33:09 -0000	1.7868
+++ ChangeLog	18 Jun 2006 18:45:19 -0000	1.7869
@@ -1,3 +1,8 @@
+2006-06-18  Tom Tromey  <tromey@redhat.com>
+
+	* tools/gnu/classpath/tools/getopt/Parser.java (handleLongOption):
+	Also handle short options.
+
 2006-06-18  Jim Huang  <jserv@kaffe.org>
 
 	PR classpath/28076:

Index: tools/gnu/classpath/tools/getopt/Parser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/getopt/Parser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tools/gnu/classpath/tools/getopt/Parser.java	15 May 2006 15:56:42 -0000	1.7
+++ tools/gnu/classpath/tools/getopt/Parser.java	18 Jun 2006 18:45:19 -0000	1.8
@@ -316,6 +316,9 @@
     int eq = option.indexOf('=');
     if (eq != - 1)
       justName = option.substring(0, eq);
+    char shortName = 0;
+    if (justName.length() == 1)
+      shortName = justName.charAt(0);
     Option found = null;
     for (int i = options.size() - 1; i >= 0; --i)
       {
@@ -325,6 +328,11 @@
             found = opt;
             break;
           }
+        if (shortName != 0 && opt.getShortName() == shortName)
+          {
+            found = opt;
+            break;
+          }
       }
     if (found == null)
       {



From MAILER-DAEMON Sun Jun 18 14:53:47 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fs2P5-0001W5-8r
	for mharc-commit-classpath@gnu.org; Sun, 18 Jun 2006 14:53:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fs2P3-0001Rv-8x
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:53:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fs2P2-0001Q0-H4
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:53:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fs2P2-0001Pj-BY
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:53:44 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fs2ZA-0001Pv-FH
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 15:04:12 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fs2P1-0004ea-00
	for <commit-classpath@gnu.org>; Sun, 18 Jun 2006 14:53:43 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fs2P0-0004eX-Uy
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 18:53:43 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fs2P0-0004eX-Uy@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Sun, 18 Jun 2006 18:53:42 +0000
Subject: [commit-cp] classpath ChangeLog native/jni/gconf-peer/.cvsi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jun 2006 18:53:45 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/18 18:53:42

Modified files:
	.              : ChangeLog 
Added files:
	native/jni/gconf-peer: .cvsignore 

Log message:
		* native/jni/gconf-peer/.cvsignore: New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gconf-peer/.cvsignore?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7869&r2=1.7870

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7869
retrieving revision 1.7870
diff -u -b -r1.7869 -r1.7870
--- ChangeLog	18 Jun 2006 18:45:19 -0000	1.7869
+++ ChangeLog	18 Jun 2006 18:53:42 -0000	1.7870
@@ -1,5 +1,9 @@
 2006-06-18  Tom Tromey  <tromey@redhat.com>
 
+	* native/jni/gconf-peer/.cvsignore: New file.
+
+2006-06-18  Tom Tromey  <tromey@redhat.com>
+
 	* tools/gnu/classpath/tools/getopt/Parser.java (handleLongOption):
 	Also handle short options.
 

Index: native/jni/gconf-peer/.cvsignore
===================================================================
RCS file: native/jni/gconf-peer/.cvsignore
diff -N native/jni/gconf-peer/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/gconf-peer/.cvsignore	18 Jun 2006 18:53:42 -0000	1.1
@@ -0,0 +1,6 @@
+.deps
+.libs
+*.lo
+*.la
+Makefile
+Makefile.in



From MAILER-DAEMON Sun Jun 18 14:56:55 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fs2S7-0007oX-6H
	for mharc-commit-classpath@gnu.org; Sun, 18 Jun 2006 14:56:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fs2S5-0007lH-L7
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:56:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fs2S4-0007iy-Fn
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:56:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fs2S4-0007io-BD
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 14:56:52 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fs2cC-0001Yg-9x
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 15:07:20 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fs2Ry-0004hI-00
	for <commit-classpath@gnu.org>; Sun, 18 Jun 2006 14:56:46 -0400
Received: from fitzsim by savannah.gnu.org with local (Exim 4.50)
	id 1Fs2Rw-0004hF-Le
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 18:56:46 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fs2Rw-0004hF-Le@savannah.gnu.org>
From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Sun, 18 Jun 2006 18:56:44 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/GridBagConstraints...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jun 2006 18:56:54 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Thomas Fitzsimmons <fitzsim>	06/06/18 18:56:44

Modified files:
	.              : ChangeLog 
	java/awt       : GridBagConstraints.java GridBagLayout.java 

Log message:
	2006-06-18  Thomas Fitzsimmons  <fitzsim@redhat.com>
	
		* java/awt/GridBagLayout.java (AdjustForGravity): Implement.
		* java/awt/GridBagConstraints.java: Indent.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7870&r2=1.7871
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/GridBagConstraints.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/GridBagLayout.java?cvsroot=classpath&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7870
retrieving revision 1.7871
diff -u -b -r1.7870 -r1.7871
--- ChangeLog	18 Jun 2006 18:53:42 -0000	1.7870
+++ ChangeLog	18 Jun 2006 18:56:44 -0000	1.7871
@@ -1,3 +1,8 @@
+2006-06-18  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* java/awt/GridBagLayout.java (AdjustForGravity): Implement.
+	* java/awt/GridBagConstraints.java: Indent.
+
 2006-06-18  Tom Tromey  <tromey@redhat.com>
 
 	* native/jni/gconf-peer/.cvsignore: New file.

Index: java/awt/GridBagConstraints.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/GridBagConstraints.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- java/awt/GridBagConstraints.java	2 Jul 2005 20:32:25 -0000	1.7
+++ java/awt/GridBagConstraints.java	18 Jun 2006 18:56:44 -0000	1.8
@@ -48,62 +48,99 @@
 {
   static final long serialVersionUID = -1000070633030801713L;
 
-  /** Fill in both directions.  */
-  public static final int BOTH = 1;
-  /** Don't fill.  */
+  // Fill values.
+  /**
+   * Don't fill.
+   */
   public static final int NONE = 0;
-  /** Fill horizontally.  */
+
+  /**
+   * Fill in both directions.
+   */
+  public static final int BOTH = 1;
+
+  /**
+   * Fill horizontally.
+   */
   public static final int HORIZONTAL = 2;
-  /** Fill vertically.  */
+
+  /**
+   * Fill vertically.
+   */
   public static final int VERTICAL = 3;
 
-  /** Position in the center.  */
+  // Anchor values.
+  /**
+   * Position in the center.
+   */
   public static final int CENTER = 10;
-  /** Position to the east.  */
-  public static final int EAST = 13;
-  /** Position to the north.  */
+
+  /**
+   * Position to the north.
+   */
   public static final int NORTH = 11;
-  /** Position to the northeast.  */
+
+  /**
+   * Position to the northeast.
+   */
   public static final int NORTHEAST = 12;
-  /** Position to the northwest.  */
-  public static final int NORTHWEST = 18;
-  /** Position to the south.  */
-  public static final int SOUTH = 15;
-  /** Position to the southeast.  */
+
+  /**
+   * Position to the east.
+   */
+  public static final int EAST = 13;
+
+  /**
+   * Position to the southeast.
+   */
   public static final int SOUTHEAST = 14;
-  /** Position to the southwest.  */
+
+  /**
+   * Position to the south.
+   */
+  public static final int SOUTH = 15;
+
+  /**
+   * Position to the southwest.
+   */
   public static final int SOUTHWEST = 16;
-  /** Position to the west.  */
+
+  /**
+   * Position to the west.
+   */
   public static final int WEST = 17;
 
-  /** Occupy all remaining cells except last cell.  */
+  /**
+   * Position to the northwest.
+   */
+  public static final int NORTHWEST = 18;
+
+  // gridx and gridy values.
+  /**
+   * Occupy all remaining cells except last cell.
+   */
   public static final int RELATIVE = -1;
-  /** Occupy all remaining cells.  */
-  public static final int REMAINDER = 0;
 
   /**
-   * Position to where the first text line would end. Equals to NORTHEAST for
-   * horizontal left-to-right orientations.
+   * Occupy all remaining cells.
    */
-  public static final int FIRST_LINE_END = 24;
+  public static final int REMAINDER = 0;
 
   /**
-   * Position to where the first text line would start. Equals to NORTHWEST for
-   * horizontal left-to-right orientations.
+   * Position to where a page starts. Equals NORTH for horizontal orientations.
    */
-  public static final int FIRST_LINE_START = 23;
+  public static final int PAGE_START = 19;
 
   /**
-   * Position to where the last text line would end. Equals to SOUTHEAST for
-   * horizontal left-to-right orientations.
+   * Position to where a page ends. Equals SOUTH for horizontal orientations.
    */
-  public static final int LAST_LINE_END = 26;
+  public static final int PAGE_END = 20;
 
   /**
-   * Position to where the last text line would start. Equals to SOUTHWEST for
-   * horizontal left-to-right orientations.
+   * Position to where a text line would start. Equals to WEST for
+   * left-to-right orientations.
    */
-  public static final int LAST_LINE_START = 25;
+  public static final int LINE_START = 21;
 
   /**
    * Position to where a text line would end. Equals to EAST for
@@ -112,20 +149,28 @@
   public static final int LINE_END = 22;
 
   /**
-   * Position to where a text line would start. Equals to WEST for
-   * left-to-right orientations.
+   * Position to where the first text line would start. Equals to NORTHWEST for
+   * horizontal left-to-right orientations.
    */
-  public static final int LINE_START = 21;
+  public static final int FIRST_LINE_START = 23;
 
   /**
-   * Position to where a page ends. Equals SOUTH for horizontal orientations.
+   * Position to where the first text line would end. Equals to NORTHEAST for
+   * horizontal left-to-right orientations.
    */
-  public static final int PAGE_END = 20;
+  public static final int FIRST_LINE_END = 24;
 
   /**
-   * Position to where a page starts. Equals NORTH for horizontal orientations.
+   * Position to where the last text line would start. Equals to SOUTHWEST for
+   * horizontal left-to-right orientations.
    */
-  public static final int PAGE_START = 19;
+  public static final int LAST_LINE_START = 25;
+
+  /**
+   * Position to where the last text line would end. Equals to SOUTHEAST for
+   * horizontal left-to-right orientations.
+   */
+  public static final int LAST_LINE_END = 26;
 
   public int anchor;
   public int fill;
@@ -139,7 +184,9 @@
   public double weightx;
   public double weighty;
 
-  /** Create a copy of this object.  */
+  /**
+   * Create a copy of this object.
+   */
   public Object clone ()
   {
     try
@@ -155,8 +202,10 @@
       }
   }
 
-  /** Create a new GridBagConstraints object with the default
-   * parameters.  */
+  /**
+   * Create a new GridBagConstraints object with the default
+   * parameters.
+   */
   public GridBagConstraints ()
   {
     this.anchor = CENTER;
@@ -172,8 +221,10 @@
     this.weighty = 0;
   }
 
-  /** Create a new GridBagConstraints object with the indicated
-   * parameters.  */
+  /**
+   * Create a new GridBagConstraints object with the indicated
+   * parameters.
+   */
   public GridBagConstraints (int gridx, int gridy,
 			     int gridwidth, int gridheight,
 			     double weightx, double weighty,

Index: java/awt/GridBagLayout.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/GridBagLayout.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- java/awt/GridBagLayout.java	18 Jun 2006 02:22:17 -0000	1.29
+++ java/awt/GridBagLayout.java	18 Jun 2006 18:56:44 -0000	1.30
@@ -38,8 +38,6 @@
 
 package java.awt;
 
-import gnu.classpath.NotImplementedException;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -322,19 +320,127 @@
     }
 
   /**
-   * Obsolete.
+     * Move and resize a rectangle according to a set of grid bag
+     * constraints.  The x, y, width and height fields of the
+     * rectangle argument are adjusted to the new values.
+     *
+     * @param constraints position and size constraints
+     * @param r rectangle to be moved and resized
    */
   protected void AdjustForGravity (GridBagConstraints constraints, 
-				   Rectangle rect)
+                                     Rectangle r)
   {
-    Insets insets = constraints.insets;
-    if (insets != null)
+      Rectangle result = new Rectangle (0, 0, 0, 0);
+
+      // Calculate width and height.
+
+      // Adjust width and height for fill value.
+      switch (constraints.fill)
       {
-	rect.x += insets.left;
-	rect.y += insets.top;
-	rect.width -= insets.left + insets.right;
-	rect.height -= insets.top + insets.bottom;
+        case GridBagConstraints.NONE:
+          result.width = 0;
+          result.height = 0;
+          break;
+        case GridBagConstraints.BOTH:
+          result.width = r.width;
+          result.height = r.height;
+          break;
+        case GridBagConstraints.HORIZONTAL:
+          result.width = r.width;
+          result.height = 0;
+          break;
+        case GridBagConstraints.VERTICAL:
+          result.width = 0;
+          result.height = r.height;
+          break;
       }
+
+      // Adjust width and height for insets, and clamp to minimum
+      // values of ipadx and ipady.
+      result.width = Math.max(result.width
+                              - constraints.insets.left
+                              - constraints.insets.right,
+                              constraints.ipadx);
+      result.height = Math.max(result.height
+                               - constraints.insets.top
+                               - constraints.insets.bottom,
+                               constraints.ipady);
+
+      // Calculate x and y.
+
+      // Do not account for the internal padding when setting the
+      // result rectangle's x and y co-ordinates.
+      int rect_width = r.width - constraints.ipadx;
+      int rect_height = r.height - constraints.ipady;
+
+      int half_width = (rect_width + constraints.insets.left
+                        - constraints.insets.right) / 2;
+      int half_height = (rect_height + constraints.insets.top
+                         - constraints.insets.bottom) / 2;
+
+      // Adjust x and y for anchor value.
+      switch (constraints.anchor)
+        {
+        case GridBagConstraints.CENTER:
+          result.x = r.x + half_width;
+          result.y = r.y + half_height;
+          break;
+        case GridBagConstraints.NORTH:
+          result.x = r.x + half_width;
+          result.y = r.y + constraints.insets.top;
+          break;
+        case GridBagConstraints.NORTHEAST:
+          result.x = r.x + rect_width - constraints.insets.right;
+          result.y = r.y + constraints.insets.top;
+          break;
+        case GridBagConstraints.EAST:
+          result.x = r.x + rect_width - constraints.insets.right;
+          result.y = r.y + half_height;
+          break;
+        case GridBagConstraints.SOUTHEAST:
+          result.x = r.x + rect_width - constraints.insets.right;
+          result.y = r.y + rect_height - constraints.insets.bottom;
+          break;
+        case GridBagConstraints.SOUTH:
+          result.x = r.x + half_width;
+          result.y = r.y + rect_height - constraints.insets.bottom;
+          break;
+        case GridBagConstraints.SOUTHWEST:
+          result.x = r.x + constraints.insets.left;
+          result.y = r.y + rect_height - constraints.insets.bottom;
+          break;
+        case GridBagConstraints.WEST:
+          result.x = r.x + constraints.insets.left;
+          result.y = r.y + half_height;
+          break;
+        case GridBagConstraints.NORTHWEST:
+          result.x = r.x + constraints.insets.left;
+          result.y = r.y + constraints.insets.top;
+          break;
+        }
+
+       // Adjust x and y for fill, clamping values to the external
+       // padding boundaries where necessary.
+       switch (constraints.fill)
+         {
+         case GridBagConstraints.NONE:
+           break;
+         case GridBagConstraints.BOTH:
+           result.x = r.x + constraints.insets.left;
+           result.y = r.y + constraints.insets.top;
+           break;
+         case GridBagConstraints.HORIZONTAL:
+           result.x = r.x + constraints.insets.left;
+           break;
+         case GridBagConstraints.VERTICAL:
+           result.y = r.y + constraints.insets.top;
+           break;
+         }
+
+      r.x = result.x;
+      r.y = result.y;
+      r.width = result.width;
+      r.height = result.height;
   }
 
     /**
@@ -1081,10 +1187,18 @@
     }
 
     /**
+     * Move and resize a rectangle according to a set of grid bag
+     * constraints.  The x, y, width and height fields of the
+     * rectangle argument are adjusted to the new values.
+     *
+     * @param constraints position and size constraints
+     * @param r rectangle to be moved and resized
+     *
      * @since 1.4
      */
-    protected void adjustForGravity (GridBagConstraints gbc, Rectangle rect)
+    protected void adjustForGravity (GridBagConstraints constraints,
+                                     Rectangle r)
     {
-      AdjustForGravity (gbc, rect);
+      AdjustForGravity (constraints, r);
     }
 }



From MAILER-DAEMON Sun Jun 18 16:58:03 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fs4LL-0006mR-Ck
	for mharc-commit-classpath@gnu.org; Sun, 18 Jun 2006 16:58:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fs4LJ-0006mJ-QB
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 16:58:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fs4LI-0006m6-FG
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 16:58:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fs4LI-0006m3-9i
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 16:58:00 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fs4VR-000131-Dm
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 17:08:29 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fs4L3-00019R-00
	for <commit-classpath@gnu.org>; Sun, 18 Jun 2006 16:57:45 -0400
Received: from audriusa by savannah.gnu.org with local (Exim 4.50)
	id 1Fs4L2-00019O-Bn
	for commit-classpath@gnu.org; Sun, 18 Jun 2006 20:57:45 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fs4L2-00019O-Bn@savannah.gnu.org>
From: Audrius Meskauskas <audriusa@bluewin.ch>
Date: Sun, 18 Jun 2006 20:57:44 +0000
Subject: [commit-cp] classpath/java/rmi/server UID.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jun 2006 20:58:02 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Audrius Meskauskas <audriusa>	06/06/18 20:57:44

Modified files:
	java/rmi/server: UID.java 
	.              : ChangeLog 

Log message:
	2006-06-18  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
	
		PR 28035
		* java/rmi/server/UID.java (constructor): First increment
		uidCounter, and then use the value.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/rmi/server/UID.java?cvsroot=classpath&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7871&r2=1.7872

Patches:

Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7871
retrieving revision 1.7872
diff -u -b -r1.7871 -r1.7872
--- ChangeLog	18 Jun 2006 18:56:44 -0000	1.7871
+++ ChangeLog	18 Jun 2006 20:57:43 -0000	1.7872
@@ -1,3 +1,9 @@
+2006-06-18  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
+	PR 28035
+	* java/rmi/server/UID.java (constructor): First increment
+	uidCounter, and then use the value.
+
 2006-06-18  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* java/awt/GridBagLayout.java (AdjustForGravity): Implement.



From MAILER-DAEMON Mon Jun 19 05:43:24 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FsGI0-00031l-6w
	for mharc-commit-classpath@gnu.org; Mon, 19 Jun 2006 05:43:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FsGHy-000304-PI
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 05:43:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FsGHx-0002xz-8F
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 05:43:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FsGHx-0002xr-1V
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 05:43:21 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FsGSD-0002ls-LT
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 05:53:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FsGHu-0001xS-00
	for <commit-classpath@gnu.org>; Mon, 19 Jun 2006 05:43:18 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FsGHt-0001xP-Cv
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 09:43:18 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FsGHt-0001xP-Cv@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Mon, 19 Jun 2006 09:43:17 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/IconUIReso...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jun 2006 09:43:23 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/19 09:43:17

Modified files:
	.              : ChangeLog 
	javax/swing/plaf: IconUIResource.java 

Log message:
	2006-06-19  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/plaf/IconUIResource.java
		(IconUIResource): Throw IllegalArgumentException for null icon.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7872&r2=1.7873
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/IconUIResource.java?cvsroot=classpath&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7872
retrieving revision 1.7873
diff -u -b -r1.7872 -r1.7873
--- ChangeLog	18 Jun 2006 20:57:43 -0000	1.7872
+++ ChangeLog	19 Jun 2006 09:43:16 -0000	1.7873
@@ -1,3 +1,8 @@
+2006-06-19  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/plaf/IconUIResource.java
+	(IconUIResource): Throw IllegalArgumentException for null icon.
+
 2006-06-18  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	PR 28035

Index: javax/swing/plaf/IconUIResource.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/IconUIResource.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- javax/swing/plaf/IconUIResource.java	19 Oct 2005 14:20:10 -0000	1.8
+++ javax/swing/plaf/IconUIResource.java	19 Jun 2006 09:43:17 -0000	1.9
@@ -1,5 +1,5 @@
 /* IconUIResource.java --
-   Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2006,  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -63,7 +63,8 @@
 
 
   /**
-   * The icon that is wrapped by this <code>IconUIResource</code>.
+   * The icon that is wrapped by this <code>IconUIResource</code> (never 
+   * <code>null</code>).
    */
   private Icon delegate;
 
@@ -73,10 +74,12 @@
    * icon. All messages are forwarded to the delegate icon.
    *
    * @param delegate the icon that is wrapped by this
-   *        <code>IconUIResource</code>.
+   *        <code>IconUIResource</code> (<code>null</code> not permitted).
    */
   public IconUIResource(Icon delegate)
   {
+    if (delegate == null)
+      throw new IllegalArgumentException("Null 'delegate' argument.");
     this.delegate = delegate;
   }
 



From MAILER-DAEMON Mon Jun 19 05:54:13 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FsGST-0000bL-19
	for mharc-commit-classpath@gnu.org; Mon, 19 Jun 2006 05:54:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FsGSQ-0000Zn-SW
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 05:54:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FsGSP-0000Xb-2j
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 05:54:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FsGSO-0000XY-SJ
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 05:54:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FsGcf-0003pA-Nc
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 06:04:45 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FsGSL-000271-00
	for <commit-classpath@gnu.org>; Mon, 19 Jun 2006 05:54:05 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FsGSJ-00026v-UG
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 09:54:04 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FsGSJ-00026v-UG@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Mon, 19 Jun 2006 09:54:03 +0000
Subject: [commit-cp] classpath/javax/swing RepaintManager.java Chang...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jun 2006 09:54:11 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/19 09:54:03

Modified files:
	javax/swing    : RepaintManager.java 
	.              : ChangeLog 

Log message:
	2006-06-19  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/RepaintManager.java
		(addInvalidComponent): Only add component that are displayable,
		that have displayable parents and that have a validateRoot.
		Also, don't validate components that have a CellRendererPane
		ancestor.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/RepaintManager.java?cvsroot=classpath&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7873&r2=1.7874

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7873
retrieving revision 1.7874
diff -u -b -r1.7873 -r1.7874
--- ChangeLog	19 Jun 2006 09:43:16 -0000	1.7873
+++ ChangeLog	19 Jun 2006 09:54:03 -0000	1.7874
@@ -1,3 +1,11 @@
+2006-06-19  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/RepaintManager.java
+	(addInvalidComponent): Only add component that are displayable,
+	that have displayable parents and that have a validateRoot.
+	Also, don't validate components that have a CellRendererPane
+	ancestor.
+
 2006-06-19  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/plaf/IconUIResource.java



From MAILER-DAEMON Mon Jun 19 06:14:10 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FsGlm-0006XV-Ao
	for mharc-commit-classpath@gnu.org; Mon, 19 Jun 2006 06:14:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FsGll-0006WT-HX
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 06:14:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FsGlj-0006T0-V5
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 06:14:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FsGlj-0006Sp-Rt
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 06:14:07 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FsGw1-0005aH-2q
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 06:24:45 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FsGlU-0002Jo-00
	for <commit-classpath@gnu.org>; Mon, 19 Jun 2006 06:13:52 -0400
Received: from audriusa by savannah.gnu.org with local (Exim 4.50)
	id 1FsGlT-0002Jk-69
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 10:13:52 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FsGlT-0002Jk-69@savannah.gnu.org>
From: Audrius Meskauskas <audriusa@bluewin.ch>
Date: Mon, 19 Jun 2006 10:13:51 +0000
Subject: [commit-cp] classpath/java/rmi/server UID.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jun 2006 10:14:09 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Audrius Meskauskas <audriusa>	06/06/19 10:13:50

Modified files:
	java/rmi/server: UID.java 
	.              : ChangeLog 

Log message:
	2006-06-19  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
	
		PR 28035
		* java/rmi/server/UID.java (constructor): Synchronized
		the whole constructor on the UID class.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/rmi/server/UID.java?cvsroot=classpath&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7874&r2=1.7875

Patches:

Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7874
retrieving revision 1.7875
diff -u -b -r1.7874 -r1.7875
--- ChangeLog	19 Jun 2006 09:54:03 -0000	1.7874
+++ ChangeLog	19 Jun 2006 10:13:50 -0000	1.7875
@@ -1,3 +1,9 @@
+2006-06-19  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
+	PR 28035
+	* java/rmi/server/UID.java (constructor): Synchronized
+	the whole constructor on the UID class.
+
 2006-06-19  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/RepaintManager.java



From MAILER-DAEMON Mon Jun 19 07:51:52 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FsIIK-00083R-Fz
	for mharc-commit-classpath@gnu.org; Mon, 19 Jun 2006 07:51:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FsIII-00082h-Fz
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 07:51:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FsIIG-00081F-AR
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 07:51:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FsIIG-000812-17
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 07:51:48 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FsISX-0006jf-RJ
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 08:02:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FsIIE-0006Q1-00
	for <commit-classpath@gnu.org>; Mon, 19 Jun 2006 07:51:46 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FsIID-0006Pw-Jl
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 11:51:46 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FsIID-0006Pw-Jl@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Mon, 19 Jun 2006 11:51:45 +0000
Subject: [commit-cp] classpath native/jni/gtk-peergnu_java_awt_peer_...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jun 2006 11:51:51 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/19 11:51:45

Modified files:
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_ComponentGraphics.c 
	include        : gnu_java_awt_peer_gtk_ComponentGraphics.h 
	gnu/java/awt/peer/gtk: ComponentGraphics.java 
	.              : ChangeLog 

Log message:
	2006-06-19  Roman Kennke  <kennke@aicas.com>
	
		* gnu/java/awt/peer/gtk/ComponentGraphics.java
		(drawImage): Clip volatile image correctly.
		(drawVolatileImage): Added arguments for clipping.
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
		(drawVolatileImage): Added arguments for clipping. Clip image
		correctly.
		* include/gnu_java_awt_peer_gtk_ComponentGraphics.h: Regenerated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c?cvsroot=classpath&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java?cvsroot=classpath&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7875&r2=1.7876

Patches:
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	10 Jun 2006 10:33:17 -0000	1.16
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c	19 Jun 2006 11:51:43 -0000	1.17
@@ -279,12 +279,13 @@
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile
 (JNIEnv *env, jobject obj __attribute__ ((unused)), jobject peer, 
- jlong img, jint x, jint y, jint w, jint h)
+ jlong img, jint x, jint y, jint w, jint h, jint cx, jint cy, jint cw, jint ch)
 {
   GdkPixmap *pixmap;
   GtkWidget *widget = NULL;
   void *ptr = NULL;
   GdkGC *gc;
+  GdkRectangle clip;
 
   gdk_threads_enter();
   ptr = NSA_GET_PTR (env, peer);
@@ -296,6 +297,13 @@
   pixmap = JLONG_TO_PTR(GdkPixmap, img);
  
   gc = gdk_gc_new(widget->window);
+
+  clip.x = cx;
+  clip.y = cy;
+  clip.width = cw;
+  clip.height = ch;
+  gdk_gc_set_clip_rectangle(gc, &clip);
+
   gdk_draw_drawable(widget->window,
 		    gc,
 		    pixmap,

Index: include/gnu_java_awt_peer_gtk_ComponentGraphics.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- include/gnu_java_awt_peer_gtk_ComponentGraphics.h	10 Jun 2006 14:16:10 -0000	1.7
+++ include/gnu_java_awt_peer_gtk_ComponentGraphics.h	19 Jun 2006 11:51:43 -0000	1.8
@@ -17,7 +17,7 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing (JNIEnv *env, jobject);
 JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender (JNIEnv *env, jclass);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative (JNIEnv *env, jobject, jobject, jint, jint, jint, jint, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile (JNIEnv *env, jobject, jobject, jlong, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile (JNIEnv *env, jobject, jobject, jlong, jint, jint, jint, jint, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }

Index: gnu/java/awt/peer/gtk/ComponentGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gnu/java/awt/peer/gtk/ComponentGraphics.java	14 Jun 2006 17:23:07 -0000	1.17
+++ gnu/java/awt/peer/gtk/ComponentGraphics.java	19 Jun 2006 11:51:43 -0000	1.18
@@ -39,7 +39,6 @@
 package gnu.java.awt.peer.gtk;
 
 import java.awt.Color;
-import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.GraphicsConfiguration;
@@ -47,15 +46,12 @@
 import java.awt.Rectangle;
 import java.awt.Shape;
 import java.awt.Toolkit;
-import java.awt.Point;
-import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.ImageObserver;
 import java.awt.image.ImageProducer;
-import java.awt.image.ImagingOpException;
 import java.awt.image.RenderedImage;
 
 /**
@@ -170,7 +166,8 @@
 
   private native void drawVolatile(GtkComponentPeer component,
 				   long vimg, int x, int y, 
-				   int width, int height);
+				   int width, int height, int cx, int cy,
+                                   int cw, int ch);
 
   /**
    * Returns a Graphics2D object for a component, either an instance of this 
@@ -286,18 +283,21 @@
       {
         GtkVolatileImage vimg = (GtkVolatileImage) img;
 	int type = transform.getType();
-	if (type == AffineTransform.TYPE_IDENTITY)
-	  {
-	    drawVolatile(component, vimg.nativePointer,
-			 x, y, vimg.width, vimg.height);
-	    return true;
-	  }
-	  else if (type == AffineTransform.TYPE_TRANSLATION)
-	  {
+        if ((type == AffineTransform.TYPE_IDENTITY
+             || type == AffineTransform.TYPE_TRANSLATION)
+             && (clip == null || clip instanceof Rectangle2D))
+          {
+            Rectangle2D r = (Rectangle2D) clip;
+            if (r == null)
+              r = getRealBounds();
 	    x += transform.getTranslateX();
 	    y += transform.getTranslateY();
 	    drawVolatile(component, vimg.nativePointer,
-			 x, y, vimg.width, vimg.height);
+                         x, y, vimg.width, vimg.height,
+                         (int) (r.getX() + transform.getTranslateX()),
+                         (int) (r.getY() + transform.getTranslateY()),
+                         (int) r.getWidth(),
+                         (int) r.getHeight());
 	    return true;
 	  }
 	else
@@ -323,22 +323,26 @@
     // If it is a GtkVolatileImage with an "easy" transform then
     // draw directly. Always pass a BufferedImage to super to avoid
     // deadlock (see Note in CairoGraphics.drawImage()).
-    if (img instanceof GtkVolatileImage)
+    if (img instanceof GtkVolatileImage
+        && (clip == null || clip instanceof Rectangle2D))
       {
         GtkVolatileImage vimg = (GtkVolatileImage) img;
 	int type = transform.getType();
-	if (type == AffineTransform.TYPE_IDENTITY)
-	  {
-	    drawVolatile(component, vimg.nativePointer,
-			 x, y, width, height);
-	    return true;
-	  }
-	  else if (type == AffineTransform.TYPE_TRANSLATION)
-	  {
+        if ((type == AffineTransform.TYPE_IDENTITY
+             || type == AffineTransform.TYPE_TRANSLATION)
+             && (clip == null || clip instanceof Rectangle2D))
+          {
+            Rectangle2D r = (Rectangle2D) clip;
+            if (r == null)
+              r = getRealBounds();
 	    x += transform.getTranslateX();
 	    y += transform.getTranslateY();
 	    drawVolatile(component, vimg.nativePointer,
-			 x, y, width, height);
+                         x, y, width, height,
+                         (int) (r.getX() + transform.getTranslateX()),
+                         (int) (r.getY() + transform.getTranslateY()),
+                         (int) r.getWidth(),
+                         (int) r.getHeight());
 	    return true;
 	  }
 	else

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7875
retrieving revision 1.7876
diff -u -b -r1.7875 -r1.7876
--- ChangeLog	19 Jun 2006 10:13:50 -0000	1.7875
+++ ChangeLog	19 Jun 2006 11:51:43 -0000	1.7876
@@ -1,3 +1,13 @@
+2006-06-19  Roman Kennke  <kennke@aicas.com>
+
+	* gnu/java/awt/peer/gtk/ComponentGraphics.java
+	(drawImage): Clip volatile image correctly.
+	(drawVolatileImage): Added arguments for clipping.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
+	(drawVolatileImage): Added arguments for clipping. Clip image
+	correctly.
+	* include/gnu_java_awt_peer_gtk_ComponentGraphics.h: Regenerated.
+
 2006-06-19  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	PR 28035



From MAILER-DAEMON Mon Jun 19 08:22:59 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FsImR-0006pG-2H
	for mharc-commit-classpath@gnu.org; Mon, 19 Jun 2006 08:22:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FsImO-0006k6-FV
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 08:22:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FsImJ-0006ad-Rh
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 08:22:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FsImJ-0006aI-Bq
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 08:22:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FsIwb-0002Cq-Qh
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 08:33:29 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FsImD-0007Ne-00
	for <commit-classpath@gnu.org>; Mon, 19 Jun 2006 08:22:45 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FsImB-0007Na-Fl
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 12:22:44 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FsImB-0007Na-Fl@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Mon, 19 Jun 2006 12:22:43 +0000
Subject: [commit-cp] classpath ChangeLog NEWS
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jun 2006 12:22:57 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/19 12:22:43

Modified files:
	.              : ChangeLog NEWS 

Log message:
	2006-06-19  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* NEWS: Updated (delayed) for security tools and tools.texinfo.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7876&r2=1.7877
http://cvs.savannah.gnu.org/viewcvs/classpath/NEWS?cvsroot=classpath&r1=1.150&r2=1.151

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7876
retrieving revision 1.7877
diff -u -b -r1.7876 -r1.7877
--- ChangeLog	19 Jun 2006 11:51:43 -0000	1.7876
+++ ChangeLog	19 Jun 2006 12:22:41 -0000	1.7877
@@ -1,3 +1,7 @@
+2006-06-19  Raif S. Naffah  <raif@swiftdsl.com.au>
+
+	* NEWS: Updated (delayed) for security tools and tools.texinfo.
+
 2006-06-19  Roman Kennke  <kennke@aicas.com>
 
 	* gnu/java/awt/peer/gtk/ComponentGraphics.java

Index: NEWS
===================================================================
RCS file: /cvsroot/classpath/classpath/NEWS,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -b -r1.150 -r1.151
--- NEWS	16 Jun 2006 18:28:45 -0000	1.150
+++ NEWS	19 Jun 2006 12:22:42 -0000	1.151
@@ -13,11 +13,19 @@
   build the GTK peers.
 * A Mozilla plugin, 'gcjwebplugin', is now included.  It introduces a
   dependency on the Mozilla plugin support headers and libraries.
+* A tools.texinfo document has been created and now includes documentation
+  about:
+  * appletviewer
+  * gcjwebplugin
+  * jarsigner
+  * keytool
 * Several new tools are now included:
   * appletviewer
   * jar
   * native2ascii
   * serialver
+  * keytool
+  * jarsigner
   A new configure option --enable-tool-wrappers causes wrapper
   binaries to be built for VMs that support the JNI Invocation API.
 



From MAILER-DAEMON Mon Jun 19 08:43:55 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FsJ6h-0002SG-6d
	for mharc-commit-classpath@gnu.org; Mon, 19 Jun 2006 08:43:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FsJ6f-0002PY-5d
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 08:43:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FsJ6e-0002NM-2a
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 08:43:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FsJ6d-0002NC-U9
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 08:43:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FsJGw-0003xD-9g
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 08:54:30 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FsJ6d-0000oR-00
	for <commit-classpath@gnu.org>; Mon, 19 Jun 2006 08:43:51 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FsJ6b-0000oI-Uf
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 12:43:50 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FsJ6b-0000oI-Uf@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Mon, 19 Jun 2006 12:43:49 +0000
Subject: [commit-cp] classpath/gnu/java/security/jce sigRSAPSSRawSig...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jun 2006 12:43:53 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/19 12:43:49

Modified files:
	gnu/java/security/jce/sig: RSAPSSRawSignatureSpi.java 
	                           DSSRawSignatureSpi.java 
	                           DSSParameters.java 
	                           SignatureAdapter.java 
	                           KeyPairGeneratorAdapter.java 
	                           EncodedKeyFactory.java 
	                           DSSKeyFactory.java RSAKeyFactory.java 
	                           RSAKeyPairGeneratorSpi.java 
	                           DSSKeyPairGeneratorSpi.java 
	gnu/java/security/jce/hash: HavalSpi.java Sha160Spi.java 
	                            Sha512Spi.java WhirlpoolSpi.java 
	                            MD4Spi.java RipeMD128Spi.java 
	                            RipeMD160Spi.java TigerSpi.java 
	                            Sha384Spi.java Sha256Spi.java 
	                            MD5Spi.java MD2Spi.java 
	                            MessageDigestAdapter.java 
	gnu/java/security/jce/prng: MD2RandomSpi.java 
	                            Sha384RandomSpi.java 
	                            MD4RandomSpi.java 
	                            RipeMD160RandomSpi.java 
	                            TigerRandomSpi.java 
	                            SecureRandomAdapter.java 
	                            Sha512RandomSpi.java 
	                            HavalRandomSpi.java 
	                            Sha256RandomSpi.java 
	                            Sha160RandomSpi.java 
	                            WhirlpoolRandomSpi.java 
	                            RipeMD128RandomSpi.java 
	                            MD5RandomSpi.java 
	.              : ChangeLog 

Log message:
	2006-06-19  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/java/security/jce/hash/HavalSpi.java: Source formatting.
		* gnu/java/security/jce/hash/MD2Spi.java: Likewise.
		* gnu/java/security/jce/hash/MD4Spi.java: Likewise.
		* gnu/java/security/jce/hash/MD5Spi.java: Likewise.
		* gnu/java/security/jce/hash/MessageDigestAdapter.java: Likewise.
		* gnu/java/security/jce/hash/RipeMD128Spi.java: Likewise.
		* gnu/java/security/jce/hash/RipeMD160Spi.java: Likewise.
		* gnu/java/security/jce/hash/Sha160Spi.java: Likewise.
		* gnu/java/security/jce/hash/Sha256Spi.java: Likewise.
		* gnu/java/security/jce/hash/Sha384Spi.java: Likewise.
		* gnu/java/security/jce/hash/Sha512Spi.java: Likewise.
		* gnu/java/security/jce/hash/TigerSpi.java: Likewise.
		* gnu/java/security/jce/hash/WhirlpoolSpi.java: Likewise.
		* gnu/java/security/jce/prng/HavalRandomSpi.java: Likewise.
		* gnu/java/security/jce/prng/MD2RandomSpi.java: Likewise.
		* gnu/java/security/jce/prng/MD4RandomSpi.java: Likewise.
		* gnu/java/security/jce/prng/MD5RandomSpi.java: Likewise.
		* gnu/java/security/jce/prng/RipeMD128RandomSpi.java: Likewise.
		* gnu/java/security/jce/prng/RipeMD160RandomSpi.java: Likewise.
		* gnu/java/security/jce/prng/SecureRandomAdapter.java: Likewise.
		* gnu/java/security/jce/prng/Sha160RandomSpi.java: Likewise.
		* gnu/java/security/jce/prng/Sha256RandomSpi.java: Likewise.
		* gnu/java/security/jce/prng/Sha384RandomSpi.java: Likewise.
		* gnu/java/security/jce/prng/Sha512RandomSpi.java: Likewise.
		* gnu/java/security/jce/prng/TigerRandomSpi.java: Likewise.
		* gnu/java/security/jce/prng/WhirlpoolRandomSpi.java: Likewise.
		* gnu/java/security/jce/sig/DSSKeyFactory.java: Likewise.
		* gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java: Likewise.
		* gnu/java/security/jce/sig/DSSParameters.java: Likewise.
		* gnu/java/security/jce/sig/DSSRawSignatureSpi.java: Likewise.
		* gnu/java/security/jce/sig/EncodedKeyFactory.java: Likewise.
		* gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java: Likewise.
		* gnu/java/security/jce/sig/RSAKeyFactory.java: Likewise.
		* gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java: Likewise.
		* gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java: Likewise.
		* gnu/java/security/jce/sig/SignatureAdapter.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/DSSRawSignatureSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/DSSParameters.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/SignatureAdapter.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/EncodedKeyFactory.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/DSSKeyFactory.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/RSAKeyFactory.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/HavalSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/Sha160Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/Sha512Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/WhirlpoolSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/MD4Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/RipeMD128Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/RipeMD160Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/TigerSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/Sha384Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/Sha256Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/MD5Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/MD2Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/MessageDigestAdapter.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/MD2RandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/Sha384RandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/MD4RandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/RipeMD160RandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/TigerRandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/SecureRandomAdapter.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/Sha512RandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/HavalRandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/Sha256RandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/Sha160RandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/RipeMD128RandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/MD5RandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7877&r2=1.7878

Patches:




































Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7877
retrieving revision 1.7878
diff -u -b -r1.7877 -r1.7878
--- ChangeLog	19 Jun 2006 12:22:41 -0000	1.7877
+++ ChangeLog	19 Jun 2006 12:43:48 -0000	1.7878
@@ -1,5 +1,44 @@
 2006-06-19  Raif S. Naffah  <raif@swiftdsl.com.au>
 
+	* gnu/java/security/jce/hash/HavalSpi.java: Source formatting.
+	* gnu/java/security/jce/hash/MD2Spi.java: Likewise.
+	* gnu/java/security/jce/hash/MD4Spi.java: Likewise.
+	* gnu/java/security/jce/hash/MD5Spi.java: Likewise.
+	* gnu/java/security/jce/hash/MessageDigestAdapter.java: Likewise.
+	* gnu/java/security/jce/hash/RipeMD128Spi.java: Likewise.
+	* gnu/java/security/jce/hash/RipeMD160Spi.java: Likewise.
+	* gnu/java/security/jce/hash/Sha160Spi.java: Likewise.
+	* gnu/java/security/jce/hash/Sha256Spi.java: Likewise.
+	* gnu/java/security/jce/hash/Sha384Spi.java: Likewise.
+	* gnu/java/security/jce/hash/Sha512Spi.java: Likewise.
+	* gnu/java/security/jce/hash/TigerSpi.java: Likewise.
+	* gnu/java/security/jce/hash/WhirlpoolSpi.java: Likewise.
+	* gnu/java/security/jce/prng/HavalRandomSpi.java: Likewise.
+	* gnu/java/security/jce/prng/MD2RandomSpi.java: Likewise.
+	* gnu/java/security/jce/prng/MD4RandomSpi.java: Likewise.
+	* gnu/java/security/jce/prng/MD5RandomSpi.java: Likewise.
+	* gnu/java/security/jce/prng/RipeMD128RandomSpi.java: Likewise.
+	* gnu/java/security/jce/prng/RipeMD160RandomSpi.java: Likewise.
+	* gnu/java/security/jce/prng/SecureRandomAdapter.java: Likewise.
+	* gnu/java/security/jce/prng/Sha160RandomSpi.java: Likewise.
+	* gnu/java/security/jce/prng/Sha256RandomSpi.java: Likewise.
+	* gnu/java/security/jce/prng/Sha384RandomSpi.java: Likewise.
+	* gnu/java/security/jce/prng/Sha512RandomSpi.java: Likewise.
+	* gnu/java/security/jce/prng/TigerRandomSpi.java: Likewise.
+	* gnu/java/security/jce/prng/WhirlpoolRandomSpi.java: Likewise.
+	* gnu/java/security/jce/sig/DSSKeyFactory.java: Likewise.
+	* gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java: Likewise.
+	* gnu/java/security/jce/sig/DSSParameters.java: Likewise.
+	* gnu/java/security/jce/sig/DSSRawSignatureSpi.java: Likewise.
+	* gnu/java/security/jce/sig/EncodedKeyFactory.java: Likewise.
+	* gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java: Likewise.
+	* gnu/java/security/jce/sig/RSAKeyFactory.java: Likewise.
+	* gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java: Likewise.
+	* gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java: Likewise.
+	* gnu/java/security/jce/sig/SignatureAdapter.java: Likewise.
+
+2006-06-19  Raif S. Naffah  <raif@swiftdsl.com.au>
+
 	* NEWS: Updated (delayed) for security tools and tools.texinfo.
 
 2006-06-19  Roman Kennke  <kennke@aicas.com>



From MAILER-DAEMON Mon Jun 19 16:28:33 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FsQML-0006t5-ER
	for mharc-commit-classpath@gnu.org; Mon, 19 Jun 2006 16:28:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FsQMJ-0006qp-NI
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 16:28:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FsQMI-0006ot-LQ
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 16:28:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FsQMI-0006oZ-Di
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 16:28:30 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FsQWf-0006WH-Fe
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 16:39:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FsQMC-0000FD-00
	for <commit-classpath@gnu.org>; Mon, 19 Jun 2006 16:28:24 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FsQMB-0000FA-3C
	for commit-classpath@gnu.org; Mon, 19 Jun 2006 20:28:24 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FsQMB-0000FA-3C@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Mon, 19 Jun 2006 20:28:23 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Cairo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jun 2006 20:28:32 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/19 20:28:22

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 

Log message:
	2006-06-19  Lillian Angel  <langel@redhat.com>
	
	        * gnu/java/awt/peer/gtk/CairoGraphics2D.java
	        (drawImage): Should always use getRGB to get the pixels.
	        getData returns an incorrect array of pixels.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7878&r2=1.7879
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7878
retrieving revision 1.7879
diff -u -b -r1.7878 -r1.7879
--- ChangeLog	19 Jun 2006 12:43:48 -0000	1.7878
+++ ChangeLog	19 Jun 2006 20:28:22 -0000	1.7879
@@ -1,3 +1,9 @@
+2006-06-19  Lillian Angel  <langel@redhat.com>
+
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
+	(drawImage): Should always use getRGB to get the pixels.
+	getData returns an incorrect array of pixels.
+
 2006-06-19  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	* gnu/java/security/jce/hash/HavalSpi.java: Source formatting.

Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java	16 Jun 2006 10:27:29 -0000	1.25
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java	19 Jun 2006 20:28:22 -0000	1.26
@@ -1201,6 +1201,7 @@
     // Note - this can get us in trouble when the gdk lock is re-acquired.
     // for example by VolatileImage. See ComponentGraphics for how we work
     // around this.
+    
     if( !(img instanceof BufferedImage) )
       {
 	ImageProducer source = img.getSource();
@@ -1217,6 +1218,7 @@
 
     // If this BufferedImage has a BufferedImageGraphics object, 
     // use the cached CairoSurface that BIG is drawing onto
+    
     if( BufferedImageGraphics.bufferedImages.get( b ) != null )
       db = (DataBuffer)BufferedImageGraphics.bufferedImages.get( b );
     else
@@ -1247,24 +1249,7 @@
 	setPaint( oldPaint );
       }
 
-    int[] pixels;
-
-    // Shortcut for easy color models.
-    if( b.getColorModel().equals(rgb32) )
-      {
-	pixels = ((DataBufferInt)db).getData();
-	for(int i = 0; i < pixels.length; i++)
-	  pixels[i] |= 0xFF000000;
-      }
-    else if( b.getColorModel().equals(argb32) )
-      {
-	pixels = ((DataBufferInt)db).getData();
-      }
-    else
-      {
-	pixels = b.getRGB(0, 0, width, height,
-			  null, 0, width);
-      }
+    int[] pixels = b.getRGB(0, 0, width, height, null, 0, width);
 
     drawPixels(nativePointer, pixels, width, height, width, i2u, alpha);
 



From MAILER-DAEMON Tue Jun 20 07:36:36 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FseX6-0006tw-3G
	for mharc-commit-classpath@gnu.org; Tue, 20 Jun 2006 07:36:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FseX4-0006r9-2S
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 07:36:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FseX2-0006oj-Fd
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 07:36:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FseX2-0006od-8x
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 07:36:32 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FsehY-0007r9-31
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 07:47:24 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FseWw-0006DO-00
	for <commit-classpath@gnu.org>; Tue, 20 Jun 2006 07:36:26 -0400
Received: from gbenson by savannah.gnu.org with local (Exim 4.50)
	id 1FseWu-0006DB-81
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 11:36:25 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FseWu-0006DB-81@savannah.gnu.org>
From: Gary Benson <gbenson@redhat.com>
Date: Tue, 20 Jun 2006 11:36:24 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/Toolkit.java gnu/j...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jun 2006 11:36:34 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Gary Benson <gbenson>	06/06/20 11:36:23

Modified files:
	.              : ChangeLog 
	java/awt       : Toolkit.java 
	gnu/java/awt/peer/gtk: GtkToolkit.java 
	gnu/java/awt/peer/qt: QtToolkit.java 

Log message:
	2006-06-20  Gary Benson  <gbenson@redhat.com>
	
		* java/awt/Toolkit.java: Add security check.
		* gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise.
		* gnu/java/awt/peer/qt/QtToolkit.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7880&r2=1.7881
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Toolkit.java?cvsroot=classpath&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java?cvsroot=classpath&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/qt/QtToolkit.java?cvsroot=classpath&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7880
retrieving revision 1.7881
diff -u -b -r1.7880 -r1.7881
--- ChangeLog	20 Jun 2006 11:24:41 -0000	1.7880
+++ ChangeLog	20 Jun 2006 11:36:22 -0000	1.7881
@@ -1,3 +1,9 @@
+2006-06-20  Gary Benson  <gbenson@redhat.com>
+
+	* java/awt/Toolkit.java: Add security check.
+	* gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise.
+	* gnu/java/awt/peer/qt/QtToolkit.java: Likewise.
+
 2006-06-20  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	* gnu/java/security/key/dss/DSSKey.java: Source formatting.

Index: java/awt/Toolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Toolkit.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- java/awt/Toolkit.java	15 May 2006 16:11:48 -0000	1.41
+++ java/awt/Toolkit.java	20 Jun 2006 11:36:23 -0000	1.42
@@ -695,6 +695,14 @@
   public PrintJob getPrintJob(Frame frame, String title,
                               JobAttributes jobAttr, PageAttributes pageAttr)
   {
+    // FIXME: it is possible this check may be removed
+    // if this method, when written, always delegates to
+    // getPrintJob(Frame, String, Properties).
+    SecurityManager sm;
+    sm = System.getSecurityManager();
+    if (sm != null)
+      sm.checkPrintJobAccess();
+
     return null;
   }
 

Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- gnu/java/awt/peer/gtk/GtkToolkit.java	5 Jun 2006 13:47:04 -0000	1.87
+++ gnu/java/awt/peer/gtk/GtkToolkit.java	20 Jun 2006 11:36:23 -0000	1.88
@@ -310,6 +310,11 @@
 
   public PrintJob getPrintJob (Frame frame, String jobtitle, Properties props) 
   {
+    SecurityManager sm;
+    sm = System.getSecurityManager();
+    if (sm != null)
+      sm.checkPrintJobAccess();
+
     return null;
   }
 

Index: gnu/java/awt/peer/qt/QtToolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtToolkit.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnu/java/awt/peer/qt/QtToolkit.java	7 Jun 2006 22:00:01 -0000	1.6
+++ gnu/java/awt/peer/qt/QtToolkit.java	20 Jun 2006 11:36:23 -0000	1.7
@@ -402,6 +402,11 @@
 			      String jobtitle,
 			      Properties props)
   {
+    SecurityManager sm;
+    sm = System.getSecurityManager();
+    if (sm != null)
+      sm.checkPrintJobAccess();
+    
     throw new RuntimeException("Not implemented");
   }
 



From MAILER-DAEMON Tue Jun 20 08:59:18 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fsfp8-000450-EP
	for mharc-commit-classpath@gnu.org; Tue, 20 Jun 2006 08:59:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FseLl-0002MN-Vs
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 07:24:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FseLh-0002Ka-4e
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 07:24:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FseLg-0002KU-Rs
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 07:24:48 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FseWB-0000QX-3X
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 07:35:40 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FseLc-0005DX-00
	for <commit-classpath@gnu.org>; Tue, 20 Jun 2006 07:24:44 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FseLb-0005DR-E3
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 11:24:44 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FseLb-0005DR-E3@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Tue, 20 Jun 2006 11:24:43 +0000
X-Mailman-Approved-At: Tue, 20 Jun 2006 08:59:17 -0400
Subject: [commit-cp] classpath/gnu/java/security/key rsaRSAKeyPairPK...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jun 2006 11:24:54 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/20 11:24:43

Modified files:
	gnu/java/security/key/rsa: RSAKeyPairPKCS8Codec.java 
	                           RSAKeyPairGenerator.java 
	                           GnuRSAKey.java 
	                           RSAKeyPairRawCodec.java 
	                           GnuRSAPrivateKey.java 
	                           RSAKeyPairX509Codec.java 
	                           GnuRSAPublicKey.java 
	.              : ChangeLog 
	gnu/java/security/key: KeyPairCodecFactory.java 
	                       KeyPairGeneratorFactory.java 
	                       IKeyPairGenerator.java IKeyPairCodec.java 
	gnu/java/security/key/dss: DSSKeyPairRawCodec.java 
	                           DSSPublicKey.java DSSKey.java 
	                           DSSKeyPairGenerator.java 
	                           DSSPrivateKey.java 
	                           DSSKeyPairX509Codec.java 
	                           DSSKeyPairPKCS8Codec.java 
	                           FIPS186.java 

Log message:
	2006-06-20  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/java/security/key/dss/DSSKey.java: Source formatting.
		* gnu/java/security/key/dss/DSSKeyPairGenerator.java: Likewise.
		* gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java: Likewise.
		* gnu/java/security/key/dss/DSSKeyPairRawCodec.java: Likewise.
		* gnu/java/security/key/dss/DSSKeyPairX509Codec.java: Likewise.
		* gnu/java/security/key/dss/DSSPrivateKey.java: Likewise.
		* gnu/java/security/key/dss/DSSPublicKey.java: Likewise.
		* gnu/java/security/key/dss/FIPS186.java: Likewise.
		* gnu/java/security/key/rsa/GnuRSAKey.java: Likewise.
		* gnu/java/security/key/rsa/GnuRSAPrivateKey.java: Likewise.
		* gnu/java/security/key/rsa/GnuRSAPublicKey.java: Likewise.
		* gnu/java/security/key/rsa/RSAKeyPairGenerator.java: Likewise.
		* gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java: Likewise.
		* gnu/java/security/key/rsa/RSAKeyPairRawCodec.java: Likewise.
		* gnu/java/security/key/rsa/RSAKeyPairX509Codec.java: Likewise.
		* gnu/java/security/key/IKeyPairCodec.java: Likewise.
		* gnu/java/security/key/IKeyPairGenerator.java: Likewise.
		* gnu/java/security/key/KeyPairCodecFactory.java: Likewise.
		* gnu/java/security/key/KeyPairGeneratorFactory.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/GnuRSAKey.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/GnuRSAPublicKey.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7879&r2=1.7880
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/KeyPairCodecFactory.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/KeyPairGeneratorFactory.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/IKeyPairGenerator.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/IKeyPairCodec.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKeyPairRawCodec.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSPublicKey.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKey.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSPrivateKey.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKeyPairX509Codec.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/FIPS186.java?cvsroot=classpath&r1=1.4&r2=1.5

Patches:
Index: rsa/RSAKeyPairPKCS8Codec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- rsa/RSAKeyPairPKCS8Codec.java	11 Jun 2006 12:14:43 -0000	1.5
+++ rsa/RSAKeyPairPKCS8Codec.java	20 Jun 2006 11:24:41 -0000	1.6
@@ -85,7 +85,6 @@
   /**
    * Returns the PKCS#8 ASN.1 <i>PrivateKeyInfo</i> representation of an RSA
    * private key. The ASN.1 specification is as follows:
-   * 
    * <pre>
    *   PrivateKeyInfo ::= SEQUENCE {
    *     version              INTEGER, -- MUST be 0
@@ -98,10 +97,9 @@
    *     parameters  ANY DEFINED BY algorithm OPTIONAL
    *   }
    * </pre>
-   * 
-   * <p>The <i>privateKey</i> field, which is an OCTET STRING, contains the
-   * DER-encoded form of the RSA private key defined as:</p>
-   * 
+   * <p>
+   * The <i>privateKey</i> field, which is an OCTET STRING, contains the
+   * DER-encoded form of the RSA private key defined as:
    * <pre>
    *   RSAPrivateKey ::= SEQUENCE {
    *     version                 INTEGER, -- MUST be 0
@@ -125,7 +123,6 @@
   {
     if (Configuration.DEBUG)
       log.entering(this.getClass().getName(), "encodePrivateKey()", key);
-
     if (! (key instanceof GnuRSAPrivateKey))
       throw new InvalidParameterException("Wrong key type");
 
@@ -217,7 +214,6 @@
   {
     if (Configuration.DEBUG)
       log.entering(this.getClass().getName(), "decodePrivateKey()", input);
-
     if (input == null)
       throw new InvalidParameterException("Input bytes MUST NOT be null");
 
@@ -287,9 +283,8 @@
         y.initCause(x);
         throw y;
       }
-
-    PrivateKey result = new GnuRSAPrivateKey(Registry.PKCS8_ENCODING_ID, n, e,
-                                             d, p, q, dP, dQ, qInv);
+    PrivateKey result = new GnuRSAPrivateKey(Registry.PKCS8_ENCODING_ID,
+                                             n, e, d, p, q, dP, dQ, qInv);
     if (Configuration.DEBUG)
       log.exiting(this.getClass().getName(), "decodePrivateKey()", result);
     return result;

Index: rsa/RSAKeyPairGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- rsa/RSAKeyPairGenerator.java	18 Jun 2006 02:43:55 -0000	1.6
+++ rsa/RSAKeyPairGenerator.java	20 Jun 2006 11:24:41 -0000	1.7
@@ -53,25 +53,23 @@
 import java.util.logging.Logger;
 
 /**
- * <p>A key-pair generator for asymetric keys to use in conjunction with the RSA
- * scheme.</p>
- *
- * <p>Reference:</p>
+ * A key-pair generator for asymetric keys to use in conjunction with the RSA
+ * scheme.
+ * <p>
+ * Reference:
  * <ol>
- *    <li><a href="http://www.cosic.esat.kuleuven.ac.be/nessie/workshop/submissions/rsa-pss.zip">
- *    RSA-PSS Signature Scheme with Appendix</a>, part B. Primitive
- *    specification and supporting documentation. Jakob Jonsson and Burt Kaliski.
- *    </li>
+ * <li><a
+ * href="http://www.cosic.esat.kuleuven.ac.be/nessie/workshop/submissions/rsa-pss.zip">
+ * RSA-PSS Signature Scheme with Appendix</a>, part B. Primitive specification
+ * and supporting documentation. Jakob Jonsson and Burt Kaliski. </li>
  *    <li><a href="http://www.cacr.math.uwaterloo.ca/hac/">Handbook of Applied
  *    Cryptography</a>, Alfred J. Menezes, Paul C. van Oorschot and Scott A.
  *    Vanstone. Section 11.3 RSA and related signature schemes.</li>
  * </ol>
  */
-public class RSAKeyPairGenerator implements IKeyPairGenerator
+public class RSAKeyPairGenerator
+    implements IKeyPairGenerator
 {
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
   private static final Logger log = Logger.getLogger(RSAKeyPairGenerator.class.getName());
 
   /** The BigInteger constant 1. */
@@ -90,8 +88,8 @@
   public static final String SOURCE_OF_RANDOMNESS = "gnu.crypto.rsa.prng";
 
   /**
-   * Property name of an optional {@link RSAKeyGenParameterSpec} instance to
-   * use for this generator's <code>n</code>, and <code>e</code> values. The
+   * Property name of an optional {@link RSAKeyGenParameterSpec} instance to use
+   * for this generator's <code>n</code>, and <code>e</code> values. The
    * default is to generate <code>n</code> and use a fixed value for
    * <code>e</.code> (Fermat's F4 number).
    */
@@ -128,27 +126,19 @@
   /** Preferred encoding format of generated keys. */
   private int preferredFormat;
 
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   // implicit 0-arguments constructor
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // gnu.crypto.key.IKeyPairGenerator interface implementation ---------------
-
   public String name()
   {
     return Registry.RSA_KPG;
   }
 
   /**
-   * <p>Configures this instance.</p>
+   * Configures this instance.
    *
    * @param attributes the map of name/value pairs to use.
-   * @exception IllegalArgumentException if the designated MODULUS_LENGTH
-   * value is less than 1024.
+   * @exception IllegalArgumentException if the designated MODULUS_LENGTH value
+   *              is less than 1024.
    */
   public void setup(Map attributes)
   {
@@ -156,10 +146,8 @@
       log.entering(this.getClass().getName(), "setup", attributes);
     // do we have a SecureRandom, or should we use our own?
     rnd = (SecureRandom) attributes.get(SOURCE_OF_RANDOMNESS);
-
     // are we given a set of RSA params or we shall use our own?
     RSAKeyGenParameterSpec params = (RSAKeyGenParameterSpec) attributes.get(RSA_PARAMETERS);
-
     // find out the modulus length
     if (params != null)
       {
@@ -171,11 +159,8 @@
         Integer l = (Integer) attributes.get(MODULUS_LENGTH);
         L = (l == null ? DEFAULT_MODULUS_LENGTH : l.intValue());
       }
-
     if (L < 1024)
-      {
         throw new IllegalArgumentException(MODULUS_LENGTH);
-      }
 
     // what is the preferred encoding format
     Integer formatID = (Integer) attributes.get(PREFERRED_ENCODING_FORMAT);
@@ -186,8 +171,10 @@
   }
 
   /**
-   * <p>The algorithm used here is described in <i>nessie-pss-B.pdf</i>
-   * document which is part of the RSA-PSS submission to NESSIE.</p>
+   * <p>
+   * The algorithm used here is described in <i>nessie-pss-B.pdf</i> document
+   * which is part of the RSA-PSS submission to NESSIE.
+   * </p>
    *
    * @return an RSA keypair.
    */
@@ -195,9 +182,7 @@
   {
     if (Configuration.DEBUG)
       log.entering(this.getClass().getName(), "generate");
-
     BigInteger p, q, n, d;
-
     // 1. Generate a prime p in the interval [2**(M-1), 2**M - 1], where
     // M = CEILING(L/2), and such that GCD(p, e) = 1
     int M = (L + 1) / 2;
@@ -210,11 +195,8 @@
         p = new BigInteger(1, kb).setBit(0);
         if (p.compareTo(lower) >= 0 && p.compareTo(upper) <= 0
             && p.isProbablePrime(80) && p.gcd(e).equals(ONE))
-          {
             break step1;
           }
-      }
-
     // 2. Generate a prime q such that the product of p and q is an L-bit
     // number, and such that GCD(q, e) = 1
     step2: while (true)
@@ -222,46 +204,34 @@
         nextRandomBytes(kb);
         q = new BigInteger(1, kb).setBit(0);
         n = p.multiply(q);
-        if (n.bitLength() == L && q.isProbablePrime(80)
-            && q.gcd(e).equals(ONE))
-          {
+        if (n.bitLength() == L && q.isProbablePrime(80) && q.gcd(e).equals(ONE))
             break step2;
-          }
-
         // TODO: test for p != q
       }
-
     // TODO: ensure p < q
-
     // 3. Put n = pq. The public key is (n, e).
     // 4. Compute the parameters necessary for the private key K (see
     // Section 2.2).
     BigInteger phi = p.subtract(ONE).multiply(q.subtract(ONE));
     d = e.modInverse(phi);
-
     // 5. Output the public key and the private key.
     PublicKey pubK = new GnuRSAPublicKey(preferredFormat, n, e);
     PrivateKey secK = new GnuRSAPrivateKey(preferredFormat, p, q, e, d);
-
     KeyPair result = new KeyPair(pubK, secK);
     if (Configuration.DEBUG)
       log.exiting(this.getClass().getName(), "generate", result);
     return result;
   }
 
-  // helper methods ----------------------------------------------------------
-
   /**
-   * <p>Fills the designated byte array with random data.</p>
+   * Fills the designated byte array with random data.
    *
    * @param buffer the byte array to fill with random data.
    */
   private void nextRandomBytes(byte[] buffer)
   {
     if (rnd != null)
-      {
         rnd.nextBytes(buffer);
-      }
     else
       getDefaultPRNG().nextBytes(buffer);
   }

Index: rsa/GnuRSAKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/rsa/GnuRSAKey.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- rsa/GnuRSAKey.java	29 Apr 2006 06:53:06 -0000	1.5
+++ rsa/GnuRSAKey.java	20 Jun 2006 11:24:41 -0000	1.6
@@ -47,14 +47,11 @@
 import java.security.interfaces.RSAKey;
 
 /**
- * <p>A base asbtract class for both public and private RSA keys.</p>
+ * A base asbtract class for both public and private RSA keys.
  */
-public abstract class GnuRSAKey implements Key, RSAKey
+public abstract class GnuRSAKey
+    implements Key, RSAKey
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
   /** The public modulus of an RSA key pair. */
   private final BigInteger n;
 
@@ -62,17 +59,14 @@
   private final BigInteger e;
 
   /**
-   * Identifier of the default encoding format to use when externalizing the
-   * key material.
+   * Identifier of the default encoding format to use when externalizing the key
+   * material.
    */
   protected final int defaultFormat;
 
   /** String representation of this key. Cached for speed. */
   private transient String str;
 
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   /**
    * Trivial protected constructor.
    * 
@@ -91,21 +85,11 @@
     this.e = e;
   }
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
-
-  // java.security.interfaces.RSAKey interface implementation ----------------
-
   public BigInteger getModulus()
   {
     return getN();
   }
 
-  // java.security.Key interface implementation ------------------------------
-
   public String getAlgorithm()
   {
     return Registry.RSA_KPG;
@@ -122,10 +106,8 @@
     return FormatUtil.getEncodingShortName(defaultFormat);
   }
 
-  // Other instance methods --------------------------------------------------
-
   /**
-   * <p>Returns the modulus <code>n</code>.</p>
+   * Returns the modulus <code>n</code>.
    *
    * @return the modulus <code>n</code>.
    */
@@ -135,7 +117,7 @@
   }
 
   /**
-   * <p>Returns the public exponent <code>e</code>.</p>
+   * Returns the public exponent <code>e</code>.
    *
    * @return the public exponent <code>e</code>.
    */
@@ -145,7 +127,7 @@
   }
 
   /**
-   * <p>Same as {@link #getPublicExponent()}.</p>
+   * Same as {@link #getPublicExponent()}.
    *
    * @return the public exponent <code>e</code>.
    */
@@ -155,23 +137,21 @@
   }
 
   /**
-   * <p>Returns <code>true</code> if the designated object is an instance of
-   * {@link RSAKey} and has the same RSA parameter values as this one.</p>
+   * Returns <code>true</code> if the designated object is an instance of
+   * {@link RSAKey} and has the same RSA parameter values as this one.
    *
    * @param obj the other non-null RSA key to compare to.
-   * @return <code>true</code> if the designated object is of the same type and
-   * value as this one.
+   * @return <code>true</code> if the designated object is of the same type
+   *         and value as this one.
    */
   public boolean equals(final Object obj)
   {
     if (obj == null)
-      {
         return false;
-      }
-    if (!(obj instanceof RSAKey))
-      {
+
+    if (! (obj instanceof RSAKey))
         return false;
-      }
+
     final RSAKey that = (RSAKey) obj;
     return n.equals(that.getModulus());
   }
@@ -181,7 +161,7 @@
     if (str == null)
       {
         String ls = SystemProperties.getProperty("line.separator");
-        str = new StringBuilder().append(ls)
+        str = new StringBuilder(ls)
             .append("defaultFormat=").append(defaultFormat).append(",").append(ls)
             .append("n=0x").append(n.toString(16)).append(",").append(ls)
             .append("e=0x").append(e.toString(16))
@@ -190,7 +170,5 @@
     return str;
   }
 
-  // abstract methods to be implemented by subclasses ------------------------
-
   public abstract byte[] getEncoded(int format);
 }

Index: rsa/RSAKeyPairRawCodec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- rsa/RSAKeyPairRawCodec.java	26 Jan 2006 02:25:11 -0000	1.1
+++ rsa/RSAKeyPairRawCodec.java	20 Jun 2006 11:24:41 -0000	1.2
@@ -47,54 +47,41 @@
 import java.security.PublicKey;
 
 /**
- * <p>An object that implements the {@link IKeyPairCodec} interface for the
- * <i>Raw</i> format to use with RSA keypairs.</p>
+ * An object that implements the {@link IKeyPairCodec} interface for the <i>Raw</i>
+ * format to use with RSA keypairs.
  *
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
-public class RSAKeyPairRawCodec implements IKeyPairCodec
+public class RSAKeyPairRawCodec
+    implements IKeyPairCodec
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   // implicit 0-arguments constructor
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
-
-  // gnu.crypto.key.IKeyPairCodec interface implementation -------------------
-
   public int getFormatID()
   {
     return RAW_FORMAT;
   }
 
   /**
-   * <p>Returns the encoded form of the designated RSA public key according to
-   * the <i>Raw</i> format supported by this library.</p>
-   *
-   * <p>The <i>Raw</i> format for an RSA public key, in this implementation, is
-   * a byte sequence consisting of the following:</p>
-   *
+   * Returns the encoded form of the designated RSA public key according to the
+   * <i>Raw</i> format supported by this library.
+   * <p>
+   * The <i>Raw</i> format for an RSA public key, in this implementation, is a
+   * byte sequence consisting of the following:
    * <ol>
    *		<li>4-byte magic consisting of the value of the literal
-   *    {@link Registry#MAGIC_RAW_RSA_PUBLIC_KEY},<li>
+   * {@link Registry#MAGIC_RAW_RSA_PUBLIC_KEY},</li>
    *		<li>1-byte version consisting of the constant: 0x01,</li>
    *		<li>4-byte count of following bytes representing the RSA parameter
    *		<code>n</code> (the modulus) in internet order,</li>
    *		<li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the RSA parameter <code>n</code>,</li>
+   * the <code>toByteArray()</code> method on the RSA parameter <code>n</code>,
+   * </li>
    *		<li>4-byte count of following bytes representing the RSA parameter
    *		<code>e</code> (the public exponent) in internet order,</li>
    *		<li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the RSA parameter <code>e</code>.</li>
+   * the <code>toByteArray()</code> method on the RSA parameter <code>e</code>.
+   * </li>
    * </ol>
    *
    * @param key the key to encode.
@@ -104,23 +91,18 @@
    */
   public byte[] encodePublicKey(PublicKey key)
   {
-    if (!(key instanceof GnuRSAPublicKey))
-      {
+    if (! (key instanceof GnuRSAPublicKey))
         throw new IllegalArgumentException("key");
-      }
 
     GnuRSAPublicKey rsaKey = (GnuRSAPublicKey) key;
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
     // magic
     baos.write(Registry.MAGIC_RAW_RSA_PUBLIC_KEY[0]);
     baos.write(Registry.MAGIC_RAW_RSA_PUBLIC_KEY[1]);
     baos.write(Registry.MAGIC_RAW_RSA_PUBLIC_KEY[2]);
     baos.write(Registry.MAGIC_RAW_RSA_PUBLIC_KEY[3]);
-
     // version
     baos.write(0x01);
-
     // n
     byte[] buffer = rsaKey.getModulus().toByteArray();
     int length = buffer.length;
@@ -129,7 +111,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // e
     buffer = rsaKey.getPublicExponent().toByteArray();
     length = buffer.length;
@@ -138,7 +119,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     return baos.toByteArray();
   }
 
@@ -149,68 +129,68 @@
         || k[1] != Registry.MAGIC_RAW_RSA_PUBLIC_KEY[1]
         || k[2] != Registry.MAGIC_RAW_RSA_PUBLIC_KEY[2]
         || k[3] != Registry.MAGIC_RAW_RSA_PUBLIC_KEY[3])
-      {
         throw new IllegalArgumentException("magic");
-      }
 
     // version
     if (k[4] != 0x01)
-      {
         throw new IllegalArgumentException("version");
-      }
-    int i = 5;
 
+    int i = 5;
     int l;
     byte[] buffer;
-
     // n
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger n = new BigInteger(1, buffer);
-
     // e
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger e = new BigInteger(1, buffer);
-
     return new GnuRSAPublicKey(n, e);
   }
 
   /**
-   * <p>Returns the encoded form of the designated RSA private key according to
-   * the <i>Raw</i> format supported by this library.</p>
-   *
-   * <p>The <i>Raw</i> format for an RSA private key, in this implementation,
-   * is a byte sequence consisting of the following:</p>
-   *
+   * Returns the encoded form of the designated RSA private key according to the
+   * <i>Raw</i> format supported by this library.
+   * <p>
+   * The <i>Raw</i> format for an RSA private key, in this implementation, is a
+   * byte sequence consisting of the following:
    * <ol>
    *		<li>4-byte magic consisting of the value of the literal
-   *    {@link Registry#MAGIC_RAW_RSA_PRIVATE_KEY},<li>
+   * {@link Registry#MAGIC_RAW_RSA_PRIVATE_KEY},</li>
    *		<li>1-byte version consisting of the constant: 0x01,</li>
    *		<li>4-byte count of following bytes representing the RSA parameter
-   *		<code>p</code> (the first prime factor of the modulus) in internet
-   *    order,</li>
+   * <code>p</code> (the first prime factor of the modulus) in internet order,
+   * </li>
    *		<li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the RSA parameter <code>p</code>,</li>
+   * the <code>toByteArray()</code> method on the RSA parameter <code>p</code>,
+   * </li>
    *		<li>4-byte count of following bytes representing the RSA parameter
    *		<code>q</code> (the second prime factor of the modulus) in internet
    *    order,</li>
    *		<li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the RSA parameter <code>q</code>,</li>
+   * the <code>toByteArray()</code> method on the RSA parameter <code>q</code>,
+   * </li>
    *		<li>4-byte count of following bytes representing the RSA parameter
    *		<code>e</code> (the public exponent) in internet order,</li>
    *		<li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the RSA parameter <code>e</code>,</li>
+   * the <code>toByteArray()</code> method on the RSA parameter <code>e</code>,
+   * </li>
    *		<li>4-byte count of following bytes representing the RSA parameter
    *		<code>d</code> (the private exponent) in internet order,</li>
    *		<li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the RSA parameter <code>d</code>,</li>
+   * the <code>toByteArray()</code> method on the RSA parameter <code>d</code>,
+   * </li>
    * </ol>
    *
    * @param key the key to encode.
@@ -218,23 +198,18 @@
    */
   public byte[] encodePrivateKey(PrivateKey key)
   {
-    if (!(key instanceof GnuRSAPrivateKey))
-      {
+    if (! (key instanceof GnuRSAPrivateKey))
         throw new IllegalArgumentException("key");
-      }
 
     GnuRSAPrivateKey rsaKey = (GnuRSAPrivateKey) key;
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
     // magic
     baos.write(Registry.MAGIC_RAW_RSA_PRIVATE_KEY[0]);
     baos.write(Registry.MAGIC_RAW_RSA_PRIVATE_KEY[1]);
     baos.write(Registry.MAGIC_RAW_RSA_PRIVATE_KEY[2]);
     baos.write(Registry.MAGIC_RAW_RSA_PRIVATE_KEY[3]);
-
     // version
     baos.write(0x01);
-
     // p
     byte[] buffer = rsaKey.getPrimeP().toByteArray();
     int length = buffer.length;
@@ -243,7 +218,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // q
     buffer = rsaKey.getPrimeQ().toByteArray();
     length = buffer.length;
@@ -252,7 +226,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // e
     buffer = rsaKey.getPublicExponent().toByteArray();
     length = buffer.length;
@@ -261,7 +234,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // d
     buffer = rsaKey.getPrivateExponent().toByteArray();
     length = buffer.length;
@@ -270,7 +242,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     return baos.toByteArray();
   }
 
@@ -281,52 +252,51 @@
         || k[1] != Registry.MAGIC_RAW_RSA_PRIVATE_KEY[1]
         || k[2] != Registry.MAGIC_RAW_RSA_PRIVATE_KEY[2]
         || k[3] != Registry.MAGIC_RAW_RSA_PRIVATE_KEY[3])
-      {
         throw new IllegalArgumentException("magic");
-      }
 
     // version
     if (k[4] != 0x01)
-      {
         throw new IllegalArgumentException("version");
-      }
-    int i = 5;
 
+    int i = 5;
     int l;
     byte[] buffer;
-
     // p
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger p = new BigInteger(1, buffer);
-
     // q
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger q = new BigInteger(1, buffer);
-
     // e
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger e = new BigInteger(1, buffer);
-
     // d
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger d = new BigInteger(1, buffer);
-
     return new GnuRSAPrivateKey(p, q, e, d);
   }
 }

Index: rsa/GnuRSAPrivateKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- rsa/GnuRSAPrivateKey.java	11 Jun 2006 12:14:43 -0000	1.6
+++ rsa/GnuRSAPrivateKey.java	20 Jun 2006 11:24:41 -0000	1.7
@@ -49,18 +49,20 @@
 import java.security.interfaces.RSAPrivateKey;
 
 /**
- * <p>An object that embodies an RSA private key.</p>
- *
- * <p>References:</p>
+ * An object that embodies an RSA private key.
+ * <p>
+ * References:
  * <ol>
- *    <li><a href="http://www.cosic.esat.kuleuven.ac.be/nessie/workshop/submissions/rsa-pss.zip">
+ * <li><a
+ * href="http://www.cosic.esat.kuleuven.ac.be/nessie/workshop/submissions/rsa-pss.zip">
  *    RSA-PSS Signature Scheme with Appendix, part B.</a><br>
  *    Primitive specification and supporting documentation.<br>
  *    Jakob Jonsson and Burt Kaliski.</li>
  * </ol>
  */
-public class GnuRSAPrivateKey extends GnuRSAKey implements PrivateKey,
-    RSAPrivateCrtKey
+public class GnuRSAPrivateKey
+    extends GnuRSAKey
+    implements PrivateKey, RSAPrivateCrtKey
 {
   /** The first prime divisor of the modulus. */
   private final BigInteger p;
@@ -68,8 +70,6 @@
   /** The second prime divisor of the modulus. */
   private final BigInteger q;
 
-  /** The public exponent of an RSA key. */
-  //   private final BigInteger e;
   /** The private exponent of an RSA private key. */
   private final BigInteger d;
 
@@ -85,9 +85,6 @@
   /** String representation of this key. Cached for speed. */
   private transient String str;
 
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   /**
    * Convenience constructor. Calls the constructor with 5 arguments passing
    * {@link Registry#RAW_ENCODING_ID} as the identifier of the preferred
@@ -98,8 +95,7 @@
    * @param e the public exponent.
    * @param d the private exponent.
    */
-  public GnuRSAPrivateKey(BigInteger p, BigInteger q, BigInteger e,
-                          BigInteger d)
+  public GnuRSAPrivateKey(BigInteger p, BigInteger q, BigInteger e, BigInteger d)
   {
     this(Registry.RAW_ENCODING_ID, p, q, e, d);
   }
@@ -118,7 +114,9 @@
   public GnuRSAPrivateKey(int preferredFormat, BigInteger p, BigInteger q,
                           BigInteger e, BigInteger d)
   {
-    this(preferredFormat, p.multiply(q), e, d, p, q, 
+    this(preferredFormat,
+         p.multiply(q),
+         e, d, p, q,
          e.modInverse(p.subtract(BigInteger.ONE)),
          e.modInverse(q.subtract(BigInteger.ONE)),
          q.modInverse(p));
@@ -137,13 +135,14 @@
    * @param p the modulus first prime divisor.
    * @param q the modulus second prime divisor.
    * @param dP the first prime's exponen. A positive integer less than
-   * <code>p</code> and <code>q</code>, satisfying <code>e * dP = 1 (mod p-1)
-   * </code>.
+   *          <code>p</code> and <code>q</code>, satisfying
+   *          <code>e * dP = 1 (mod p-1)</code>.
    * @param dQ the second prime's exponent. A positive integer less than
-   * <code>p</code> and <code>q</code>, satisfying <code>e * dQ = 1 (mod p-1)
-   * </code>.
+   *          <code>p</code> and <code>q</code>, satisfying
+   *          <code>e * dQ = 1 (mod p-1)</code>.
    * @param qInv the Chinese Remainder Theorem coefiicient. A positive integer
-   * less than <code>p</code>, satisfying <code>q * qInv = 1 (mod p)</code>.
+   *          less than <code>p</code>, satisfying
+   *          <code>q * qInv = 1 (mod p)</code>.
    */
   public GnuRSAPrivateKey(int preferredFormat, BigInteger n, BigInteger e,
                           BigInteger d, BigInteger p, BigInteger q,
@@ -152,7 +151,6 @@
     super(preferredFormat == Registry.ASN1_ENCODING_ID ? Registry.PKCS8_ENCODING_ID
                                                        : preferredFormat,
           n, e);
-
     this.d = d;
     this.p = p;
     this.q = q;
@@ -167,9 +165,6 @@
     this.qInv = qInv;
   }
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
   /**
    * A class method that takes the output of the <code>encodePrivateKey()</code>
    * method of an RSA keypair codec object (an instance implementing
@@ -194,14 +189,10 @@
       catch (IllegalArgumentException ignored)
         {
         }
-
     // try PKCS#8 codec
     return (GnuRSAPrivateKey) new RSAKeyPairPKCS8Codec().decodePrivateKey(k);
   }
 
-  // Instance methods
-  // -------------------------------------------------------------------------
-
   public BigInteger getPrimeP()
   {
     return p;
@@ -227,18 +218,14 @@
     return qInv;
   }
 
-  // java.security.interfaces.RSAPrivateKey interface implementation ---------
-
   public BigInteger getPrivateExponent()
   {
     return d;
   }
 
-  // Other instance methods --------------------------------------------------
-
   /**
-   * Returns the encoded form of this private key according to the
-   * designated format.
+   * Returns the encoded form of this private key according to the designated
+   * format.
    *
    * @param format the desired format identifier of the resulting encoding.
    * @return the byte sequence encoding this key according to the designated
@@ -266,8 +253,8 @@
   }
 
   /**
-   * <p>Returns <code>true</code> if the designated object is an instance of
-   * this class and has the same RSA parameter values as this one.</p>
+   * Returns <code>true</code> if the designated object is an instance of this
+   * class and has the same RSA parameter values as this one.
    *
    * @param obj the other non-null RSA key to compare to.
    * @return <code>true</code> if the designated object is of the same type
@@ -276,9 +263,8 @@
   public boolean equals(final Object obj)
   {
     if (obj == null)
-      {
         return false;
-      }
+
     if (obj instanceof RSAPrivateKey)
       {
         final RSAPrivateKey that = (RSAPrivateKey) obj;
@@ -315,7 +301,8 @@
                                                         : "**...*").append(ls)
             .append("qInv=0x").append(Configuration.DEBUG ? qInv.toString(16)
                                                           : "**...*").append(ls)
-            .append(")").toString();
+            .append(")")
+            .toString();
       }
     return str;
   }

Index: rsa/RSAKeyPairX509Codec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- rsa/RSAKeyPairX509Codec.java	11 Jun 2006 12:14:43 -0000	1.6
+++ rsa/RSAKeyPairX509Codec.java	20 Jun 2006 11:24:41 -0000	1.7
@@ -117,7 +117,6 @@
   {
     if (Configuration.DEBUG)
       log.entering(this.getClass().getName(), "encodePublicKey()", key);
-
     if (! (key instanceof GnuRSAPublicKey))
       throw new InvalidParameterException("key");
 
@@ -158,7 +157,7 @@
       }
     catch (IOException x)
       {
-        InvalidParameterException y = new InvalidParameterException();
+        InvalidParameterException y = new InvalidParameterException(x.getMessage());
         y.initCause(x);
         throw y;
       }
@@ -187,7 +186,6 @@
   {
     if (Configuration.DEBUG)
       log.entering(this.getClass().getName(), "decodePublicKey()", input);
-
     if (input == null)
       throw new InvalidParameterException("Input bytes MUST NOT be null");
 
@@ -232,11 +230,10 @@
       }
     catch (IOException x)
       {
-        InvalidParameterException y = new InvalidParameterException();
+        InvalidParameterException y = new InvalidParameterException(x.getMessage());
         y.initCause(x);
         throw y;
       }
-
     PublicKey result = new GnuRSAPublicKey(Registry.X509_ENCODING_ID, n, e);
     if (Configuration.DEBUG)
       log.exiting(this.getClass().getName(), "decodePublicKey()", result);

Index: rsa/GnuRSAPublicKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/rsa/GnuRSAPublicKey.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- rsa/GnuRSAPublicKey.java	29 Apr 2006 06:53:06 -0000	1.4
+++ rsa/GnuRSAPublicKey.java	20 Jun 2006 11:24:41 -0000	1.5
@@ -47,28 +47,24 @@
 import java.security.interfaces.RSAPublicKey;
 
 /**
- * <p>An object that encapsulates an RSA public key.</p>
- *
- * <p>References:</p>
+ * An object that encapsulates an RSA public key.
+ * <p>
+ * References:
  * <ol>
- *    <li><a href="http://www.cosic.esat.kuleuven.ac.be/nessie/workshop/submissions/rsa-pss.zip">
+ * <li><a
+ * href="http://www.cosic.esat.kuleuven.ac.be/nessie/workshop/submissions/rsa-pss.zip">
  *    RSA-PSS Signature Scheme with Appendix, part B.</a><br>
  *    Primitive specification and supporting documentation.<br>
  *    Jakob Jonsson and Burt Kaliski.</li>
  * </ol>
  */
-public class GnuRSAPublicKey extends GnuRSAKey implements PublicKey,
-    RSAPublicKey
+public class GnuRSAPublicKey
+    extends GnuRSAKey
+    implements PublicKey, RSAPublicKey
 {
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
   /** String representation of this key. Cached for speed. */
   private transient String str;
 
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   /**
    * Conveience constructor. Calls the constructor with 3 arguments passing
    * {@link Registry#RAW_ENCODING_ID} as the identifier of the preferred
@@ -98,9 +94,6 @@
           n, e);
   }
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
   /**
    * A class method that takes the output of the <code>encodePublicKey()</code>
    * method of an RSA keypair codec object (an instance implementing
@@ -125,17 +118,13 @@
       catch (IllegalArgumentException ignored)
         {
         }
-
     // try X.509 codec
     return (GnuRSAPublicKey) new RSAKeyPairX509Codec().decodePublicKey(k);
   }
 
-  // Instance methods
-  // -------------------------------------------------------------------------
-
   /**
-   * <p>Returns the encoded form of this public key according to the designated
-   * format.</p>
+   * Returns the encoded form of this public key according to the designated
+   * format.
    *
    * @param format the desired format identifier of the resulting encoding.
    * @return the byte sequence encoding this key according to the designated
@@ -162,23 +151,21 @@
   }
 
   /**
-   * <p>Returns <code>true</code> if the designated object is an instance of
-   * this class and has the same RSA parameter values as this one.</p>
+   * Returns <code>true</code> if the designated object is an instance of this
+   * class and has the same RSA parameter values as this one.
    *
    * @param obj the other non-null RSA key to compare to.
-   * @return <code>true</code> if the designated object is of the same type and
-   * value as this one.
+   * @return <code>true</code> if the designated object is of the same type
+   *         and value as this one.
    */
   public boolean equals(final Object obj)
   {
     if (obj == null)
-      {
         return false;
-      }
-    if (!(obj instanceof RSAPublicKey))
-      {
+
+    if (! (obj instanceof RSAPublicKey))
         return false;
-      }
+
     final RSAPublicKey that = (RSAPublicKey) obj;
     return super.equals(that)
            && getPublicExponent().equals(that.getPublicExponent());
@@ -191,7 +178,8 @@
         String ls = SystemProperties.getProperty("line.separator");
         str = new StringBuilder(this.getClass().getName()).append("(")
             .append(super.toString()).append(",").append(ls)
-            .append(")").toString();
+            .append(")")
+            .toString();
       }
     return str;
   }


Index: KeyPairCodecFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/KeyPairCodecFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- KeyPairCodecFactory.java	19 Feb 2006 01:45:44 -0000	1.3
+++ KeyPairCodecFactory.java	20 Jun 2006 11:24:43 -0000	1.4
@@ -207,10 +207,8 @@
         hs.add(Registry.RSA_KPG + "/" + Registry.PKCS8_ENCODING_SHORT_NAME);
         hs.add(Registry.DH_KPG + "/" + Registry.RAW_ENCODING_SHORT_NAME);
         hs.add(Registry.SRP_KPG + "/" + Registry.RAW_ENCODING_SHORT_NAME);
-
         names = Collections.unmodifiableSet(hs);
       }
-
     return names;
   }
 

Index: KeyPairGeneratorFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/KeyPairGeneratorFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- KeyPairGeneratorFactory.java	3 Apr 2006 11:54:14 -0000	1.3
+++ KeyPairGeneratorFactory.java	20 Jun 2006 11:24:43 -0000	1.4
@@ -48,67 +48,47 @@
 import java.util.Set;
 
 /**
- * <p>A Factory to instantiate asymmetric keypair generators.</p>
+ * A Factory to instantiate asymmetric keypair generators.
  */
 public class KeyPairGeneratorFactory
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   /** Trivial constructor to enforce Singleton pattern. */
   private KeyPairGeneratorFactory()
   {
     super();
   }
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
   /**
-   * <p>Returns an instance of a keypair generator given its name.</p>
+   * Returns an instance of a keypair generator given its name.
    *
    * @param name the case-insensitive key generator name.
-   * @return an instance of the keypair generator, or <code>null</code> if none
-   * found.
+   * @return an instance of the keypair generator, or <code>null</code> if
+   *         none found.
    */
   public static IKeyPairGenerator getInstance(String name)
   {
     if (name == null)
-      {
         return null;
-      }
 
     name = name.trim();
     IKeyPairGenerator result = null;
     if (name.equalsIgnoreCase(Registry.DSA_KPG)
         || name.equalsIgnoreCase(Registry.DSS_KPG))
-      {
         result = new DSSKeyPairGenerator();
-      }
     else if (name.equalsIgnoreCase(Registry.RSA_KPG))
-      {
         result = new RSAKeyPairGenerator();
-      }
     else if (name.equalsIgnoreCase(Registry.DH_KPG))
-      {
-        result = makeInstance ("gnu.javax.crypto.key.dh.GnuDHKeyPairGenerator");
-      }
+      result = makeInstance("gnu.javax.crypto.key.dh.GnuDHKeyPairGenerator");
     else if (name.equalsIgnoreCase(Registry.SRP_KPG))
-      {
-        result = makeInstance ("gnu.javax.crypto.key.srp6.SRPKeyPairGenerator");
-      }
+      result = makeInstance("gnu.javax.crypto.key.srp6.SRPKeyPairGenerator");
 
     return result;
   }
 
   /**
-   * <p>Returns a {@link Set} of keypair generator names supported by this
+   * Returns a {@link Set} of keypair generator names supported by this
    * <i>Factory</i>. Those keypair generators may be used in conjunction with
-   * the digital signature schemes with appendix supported by this library.</p>
+   * the digital signature schemes with appendix supported by this library.
    *
    * @return a {@link Set} of keypair generator names (Strings).
    */
@@ -120,26 +100,21 @@
     hs.add(Registry.RSA_KPG);
     hs.add(Registry.DH_KPG);
     hs.add(Registry.SRP_KPG);
-
     return Collections.unmodifiableSet(hs);
   }
 
-  private static IKeyPairGenerator makeInstance (String clazz)
+  private static IKeyPairGenerator makeInstance(String clazz)
   {
     try
       {
-        Class c = Class.forName (clazz);
-        Constructor ctor = c.getConstructor (new Class[0]);
-        return (IKeyPairGenerator) ctor.newInstance (new Object[0]);
+        Class c = Class.forName(clazz);
+        Constructor ctor = c.getConstructor(new Class[0]);
+        return (IKeyPairGenerator) ctor.newInstance(new Object[0]);
       }
     catch (Exception x)
       {
         throw new IllegalArgumentException(
-            "strong crypto key pair generator not available: " + clazz,
-            x);
+            "strong crypto key pair generator not available: " + clazz, x);
       }
   }
-
-  // Instance methods
-  // -------------------------------------------------------------------------
 }

Index: IKeyPairGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/IKeyPairGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- IKeyPairGenerator.java	26 Mar 2006 22:57:46 -0000	1.2
+++ IKeyPairGenerator.java	20 Jun 2006 11:24:43 -0000	1.3
@@ -42,26 +42,19 @@
 import java.util.Map;
 
 /**
- * The visible methods of every asymmetric keypair generator.<p>
+ * The visible methods of every asymmetric keypair generator.
  */
 public interface IKeyPairGenerator
 {
-
-  // Constants
-  // -------------------------------------------------------------------------
-
-  // Methods
-  // -------------------------------------------------------------------------
-
   /**
-   * Returns the canonical name of this keypair generator.<p>
+   * Returns the canonical name of this keypair generator.
    *
    * @return the canonical name of this instance.
    */
   String name();
 
   /**
-   * [Re]-initialises this instance for use with a given set of attributes.<p>
+   * [Re]-initialises this instance for use with a given set of attributes.
    *
    * @param attributes a map of name/value pairs to use for setting up the
    * instance.

Index: IKeyPairCodec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/IKeyPairCodec.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- IKeyPairCodec.java	26 Mar 2006 22:57:46 -0000	1.3
+++ IKeyPairCodec.java	20 Jun 2006 11:24:43 -0000	1.4
@@ -44,16 +44,13 @@
 import java.security.PublicKey;
 
 /**
- * <p>The visible methods of an object that knows how to encode and decode
+ * The visible methods of an object that knows how to encode and decode
  * cryptographic asymmetric keypairs. Codecs are useful for (a) externalising
  * public and private keys for storage and on-the-wire transmission, as well as
- * (b) re-creating their internal Java representation from external sources.</p>
+ * (b) re-creating their internal Java representation from external sources.
  */
 public interface IKeyPairCodec
 {
-  // Constants
-  // -------------------------------------------------------------------------
-
   /** Constant identifying the <i>Raw</i> encoding format. */
   int RAW_FORMAT = Registry.RAW_ENCODING_ID;
 
@@ -69,19 +66,16 @@
    */
   int ASN1_FORMAT = Registry.ASN1_ENCODING_ID;
 
-  // Method(s)
-  // -------------------------------------------------------------------------
-
   /**
-   * <p>Returns the unique identifier (within this library) of the format used
-   * to externalise public and private keys.</p>
+   * Returns the unique identifier (within this library) of the format used to
+   * externalise public and private keys.
    *
    * @return the identifier of the format, the object supports.
    */
   int getFormatID();
 
   /**
-   * <p>Encodes an instance of a public key for storage or transmission purposes.</p>
+   * Encodes an instance of a public key for storage or transmission purposes.
    *
    * @param key the non-null key to encode.
    * @return a byte sequence representing the encoding of the designated key
@@ -92,7 +86,7 @@
   byte[] encodePublicKey(PublicKey key);
 
   /**
-   * <p>Encodes an instance of a private key for storage or transmission purposes.</p>
+   * Encodes an instance of a private key for storage or transmission purposes.
    *
    * @param key the non-null key to encode.
    * @return a byte sequence representing the encoding of the designated key
@@ -103,28 +97,28 @@
   byte[] encodePrivateKey(PrivateKey key);
 
   /**
-   * <p>Decodes an instance of an external public key into its native Java
-   * representation.</p>
+   * Decodes an instance of an external public key into its native Java
+   * representation.
    *
    * @param input the source of the externalised key to decode.
    * @return a concrete instance of a public key, reconstructed from the
    * designated input.
    * @exception IllegalArgumentException if the designated input does not
-   * contain a known representation of a public key for the format supported by
-   * the concrete codec.
+   *              contain a known representation of a public key for the format
+   *              supported by the concrete codec.
    */
   PublicKey decodePublicKey(byte[] input);
 
   /**
-   * <p>Decodes an instance of an external private key into its native Java
-   * representation.</p>
+   * Decodes an instance of an external private key into its native Java
+   * representation.
    *
    * @param input the source of the externalised key to decode.
    * @return a concrete instance of a private key, reconstructed from the
    * designated input.
    * @exception IllegalArgumentException if the designated input does not
-   * contain a known representation of a private key for the format supported
-   * by the concrete codec.
+   *              contain a known representation of a private key for the format
+   *              supported by the concrete codec.
    */
   PrivateKey decodePrivateKey(byte[] input);
 }

Index: dss/DSSKeyPairRawCodec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/dss/DSSKeyPairRawCodec.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- dss/DSSKeyPairRawCodec.java	26 Mar 2006 22:57:46 -0000	1.2
+++ dss/DSSKeyPairRawCodec.java	20 Jun 2006 11:24:43 -0000	1.3
@@ -47,64 +47,50 @@
 import java.security.PublicKey;
 
 /**
- * <p>An object that implements the {@link IKeyPairCodec} operations for the
- * <i>Raw</i> format to use with DSS keypairs.</p>
+ * An object that implements the {@link IKeyPairCodec} operations for the
+ * <i>Raw</i> format to use with DSS keypairs.
  */
-public class DSSKeyPairRawCodec implements IKeyPairCodec
+public class DSSKeyPairRawCodec
+    implements IKeyPairCodec
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   // implicit 0-arguments constructor
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
-
-  // gnu.crypto.keys.IKeyPairCodec interface implementation ------------------
-
   public int getFormatID()
   {
     return RAW_FORMAT;
   }
 
   /**
-   * <p>Returns the encoded form of the designated DSS (Digital Signature
-   * Standard) public key according to the <i>Raw</i> format supported by
-   * this library.</p>
-   *
-   * <p>The <i>Raw</i> format for a DSA public key, in this implementation, is
-   * a byte sequence consisting of the following:</p>
+   * Returns the encoded form of the designated DSS (Digital Signature Standard)
+   * public key according to the <i>Raw</i> format supported by this library.
+   * <p>
+   * The <i>Raw</i> format for a DSA public key, in this implementation, is a
+   * byte sequence consisting of the following:
    * <ol>
    *    <li>4-byte magic consisting of the value of the literal
-   *    {@link Registry#MAGIC_RAW_DSS_PUBLIC_KEY},<li>
+   * {@link Registry#MAGIC_RAW_DSS_PUBLIC_KEY},
+   * <li>
    *    <li>1-byte version consisting of the constant: 0x01,</li>
    *    <li>4-byte count of following bytes representing the DSA parameter
    *    <code>p</code> in internet order,</li>
    *    <li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the DSA parameter
-   *    <code>p</code>,</li>
+   * the <code>toByteArray()</code> method on the DSA parameter <code>p</code>,
+   * </li>
    *    <li>4-byte count of following bytes representing the DSA parameter
    *    <code>q</code>,</li>
    *    <li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the DSA parameter
-   *    <code>q</code>,</li>
+   * the <code>toByteArray()</code> method on the DSA parameter <code>q</code>,
+   * </li>
    *    <li>4-byte count of following bytes representing the DSA parameter
    *    <code>g</code>,</li>
    *    <li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the DSA parameter
-   *    <code>g</code>,</li>
+   * the <code>toByteArray()</code> method on the DSA parameter <code>g</code>,
+   * </li>
    *    <li>4-byte count of following bytes representing the DSA parameter
    *    <code>y</code>,</li>
    *    <li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the DSA parameter
-   *    <code>y</code>,</li>
+   * the <code>toByteArray()</code> method on the DSA parameter <code>y</code>,
+   * </li>
    * </ol>
    *
    * @param key the key to encode.
@@ -115,23 +101,18 @@
    */
   public byte[] encodePublicKey(PublicKey key)
   {
-    if (!(key instanceof DSSPublicKey))
-      {
+    if (! (key instanceof DSSPublicKey))
         throw new IllegalArgumentException("key");
-      }
 
     DSSPublicKey dssKey = (DSSPublicKey) key;
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
     // magic
     baos.write(Registry.MAGIC_RAW_DSS_PUBLIC_KEY[0]);
     baos.write(Registry.MAGIC_RAW_DSS_PUBLIC_KEY[1]);
     baos.write(Registry.MAGIC_RAW_DSS_PUBLIC_KEY[2]);
     baos.write(Registry.MAGIC_RAW_DSS_PUBLIC_KEY[3]);
-
     // version
     baos.write(0x01);
-
     // p
     byte[] buffer = dssKey.getParams().getP().toByteArray();
     int length = buffer.length;
@@ -140,7 +121,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // q
     buffer = dssKey.getParams().getQ().toByteArray();
     length = buffer.length;
@@ -149,7 +129,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // g
     buffer = dssKey.getParams().getG().toByteArray();
     length = buffer.length;
@@ -158,7 +137,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // y
     buffer = dssKey.getY().toByteArray();
     length = buffer.length;
@@ -167,7 +145,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     return baos.toByteArray();
   }
 
@@ -178,86 +155,85 @@
         || k[1] != Registry.MAGIC_RAW_DSS_PUBLIC_KEY[1]
         || k[2] != Registry.MAGIC_RAW_DSS_PUBLIC_KEY[2]
         || k[3] != Registry.MAGIC_RAW_DSS_PUBLIC_KEY[3])
-      {
         throw new IllegalArgumentException("magic");
-      }
 
     // version
     if (k[4] != 0x01)
-      {
         throw new IllegalArgumentException("version");
-      }
-    int i = 5;
 
+    int i = 5;
     int l;
     byte[] buffer;
-
     // p
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger p = new BigInteger(1, buffer);
-
     // q
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger q = new BigInteger(1, buffer);
-
     // g
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger g = new BigInteger(1, buffer);
-
     // y
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger y = new BigInteger(1, buffer);
-
     return new DSSPublicKey(p, q, g, y);
   }
 
   /**
-   * <p>Returns the encoded form of the designated DSS (Digital Signature
-   * Standard) private key according to the <i>Raw</i> format supported by
-   * this library.</p>
-   *
-   * <p>The <i>Raw</i> format for a DSA private key, in this implementation, is
-   * a byte sequence consisting of the following:</p>
+   * Returns the encoded form of the designated DSS (Digital Signature Standard)
+   * private key according to the <i>Raw</i> format supported by this library.
+   * <p>
+   * The <i>Raw</i> format for a DSA private key, in this implementation, is a
+   * byte sequence consisting of the following:
    * <ol>
    *    <li>4-byte magic consisting of the value of the literal
-   *    {@link Registry#MAGIC_RAW_DSS_PRIVATE_KEY},<li>
+   * {@link Registry#MAGIC_RAW_DSS_PRIVATE_KEY},
+   * <li>
    *    <li>1-byte version consisting of the constant: 0x01,</li>
    *    <li>4-byte count of following bytes representing the DSA parameter
    *    <code>p</code> in internet order,</li>
    *    <li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the DSA parameter
-   *    <code>p</code>,</li>
+   * the <code>toByteArray()</code> method on the DSA parameter <code>p</code>,
+   * </li>
    *    <li>4-byte count of following bytes representing the DSA parameter
    *    <code>q</code>,</li>
    *    <li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the DSA parameter
-   *    <code>q</code>,</li>
+   * the <code>toByteArray()</code> method on the DSA parameter <code>q</code>,
+   * </li>
    *    <li>4-byte count of following bytes representing the DSA parameter
    *    <code>g</code>,</li>
    *    <li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the DSA parameter
-   *    <code>g</code>,</li>
+   * the <code>toByteArray()</code> method on the DSA parameter <code>g</code>,
+   * </li>
    *    <li>4-byte count of following bytes representing the DSA parameter
    *    <code>x</code>,</li>
    *    <li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the DSA parameter
-   *    <code>x</code>,</li>
+   * the <code>toByteArray()</code> method on the DSA parameter <code>x</code>,
+   * </li>
    * </ol>
    *
    * @param key the key to encode.
@@ -267,23 +243,18 @@
    */
   public byte[] encodePrivateKey(PrivateKey key)
   {
-    if (!(key instanceof DSSPrivateKey))
-      {
+    if (! (key instanceof DSSPrivateKey))
         throw new IllegalArgumentException("key");
-      }
 
     DSSPrivateKey dssKey = (DSSPrivateKey) key;
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
     // magic
     baos.write(Registry.MAGIC_RAW_DSS_PRIVATE_KEY[0]);
     baos.write(Registry.MAGIC_RAW_DSS_PRIVATE_KEY[1]);
     baos.write(Registry.MAGIC_RAW_DSS_PRIVATE_KEY[2]);
     baos.write(Registry.MAGIC_RAW_DSS_PRIVATE_KEY[3]);
-
     // version
     baos.write(0x01);
-
     // p
     byte[] buffer = dssKey.getParams().getP().toByteArray();
     int length = buffer.length;
@@ -292,7 +263,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // q
     buffer = dssKey.getParams().getQ().toByteArray();
     length = buffer.length;
@@ -301,7 +271,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // g
     buffer = dssKey.getParams().getG().toByteArray();
     length = buffer.length;
@@ -310,7 +279,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // x
     buffer = dssKey.getX().toByteArray();
     length = buffer.length;
@@ -319,7 +287,6 @@
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     return baos.toByteArray();
   }
 
@@ -330,52 +297,51 @@
         || k[1] != Registry.MAGIC_RAW_DSS_PRIVATE_KEY[1]
         || k[2] != Registry.MAGIC_RAW_DSS_PRIVATE_KEY[2]
         || k[3] != Registry.MAGIC_RAW_DSS_PRIVATE_KEY[3])
-      {
         throw new IllegalArgumentException("magic");
-      }
 
     // version
     if (k[4] != 0x01)
-      {
         throw new IllegalArgumentException("version");
-      }
-    int i = 5;
 
+    int i = 5;
     int l;
     byte[] buffer;
-
     // p
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger p = new BigInteger(1, buffer);
-
     // q
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger q = new BigInteger(1, buffer);
-
     // g
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger g = new BigInteger(1, buffer);
-
     // x
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
         | (k[i++] & 0xFF);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger x = new BigInteger(1, buffer);
-
     return new DSSPrivateKey(p, q, g, x);
   }
 }

Index: dss/DSSPublicKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/dss/DSSPublicKey.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- dss/DSSPublicKey.java	26 Mar 2006 22:57:46 -0000	1.4
+++ dss/DSSPublicKey.java	20 Jun 2006 11:24:43 -0000	1.5
@@ -47,27 +47,23 @@
 import java.security.interfaces.DSAPublicKey;
 
 /**
- * <p>An object that embodies a DSS (Digital Signature Standard) public key.</p>
+ * An object that embodies a DSS (Digital Signature Standard) public key.
  * 
  * @see #getEncoded
  */
-public class DSSPublicKey extends DSSKey implements PublicKey, DSAPublicKey
+public class DSSPublicKey
+    extends DSSKey
+    implements PublicKey, DSAPublicKey
 {
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
   /**
-   * <code>y = g<sup>x</sup> mod p</code> where <code>x</code> is the private
-   * part of the DSA key.
+   * <code>y = g<sup>x</sup> mod p</code> where <code>x</code> is the
+   * private part of the DSA key.
    */
   private final BigInteger y;
 
   /** String representation of this key. Cached for speed. */
   private transient String str;
 
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   /**
    * Conveience constructor. Calls the constructor with 5 arguments passing
    * {@link Registry#RAW_ENCODING_ID} as the identifier of the preferred
@@ -85,8 +81,8 @@
   }
 
   /**
-   * Constructs a new instance of <code>DSSPublicKey</code> given the designated
-   * arguments.
+   * Constructs a new instance of <code>DSSPublicKey</code> given the
+   * designated arguments.
    * 
    * @param preferredFormat the identifier of the preferred encoding format to
    *          use when externalizing this key.
@@ -102,13 +98,9 @@
     super(preferredFormat == Registry.ASN1_ENCODING_ID ? Registry.X509_ENCODING_ID
                                                        : preferredFormat,
           p, q, g);
-
     this.y = y;
   }
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
   /**
    * A class method that takes the output of the <code>encodePublicKey()</code>
    * method of a DSS keypair codec object (an instance implementing
@@ -133,26 +125,18 @@
       catch (IllegalArgumentException ignored)
         {
         }
-
     // try X.509 codec
     return (DSSPublicKey) new DSSKeyPairX509Codec().decodePublicKey(k);
   }
 
-  // Instance methods
-  // -------------------------------------------------------------------------
-
-  // java.security.interfaces.DSAPublicKey interface implementation ----------
-
   public BigInteger getY()
   {
     return y;
   }
 
-  // Other instance methods --------------------------------------------------
-
   /**
-   * <p>Returns the encoded form of this public key according to the designated
-   * format.</p>
+   * Returns the encoded form of this public key according to the designated
+   * format.
    * 
    * @param format the desired format identifier of the resulting encoding.
    * @return the byte sequence encoding this key according to the designated
@@ -179,24 +163,22 @@
   }
 
   /**
-   * <p>Returns <code>true</code> if the designated object is an instance of
+   * Returns <code>true</code> if the designated object is an instance of
    * {@link DSAPublicKey} and has the same DSS (Digital Signature Standard)
-   * parameter values as this one.</p>
+   * parameter values as this one.
    * 
    * @param obj the other non-null DSS key to compare to.
-   * @return <code>true</code> if the designated object is of the same type and
-   * value as this one.
+   * @return <code>true</code> if the designated object is of the same type
+   *         and value as this one.
    */
   public boolean equals(Object obj)
   {
     if (obj == null)
-      {
         return false;
-      }
-    if (!(obj instanceof DSAPublicKey))
-      {
+
+    if (! (obj instanceof DSAPublicKey))
         return false;
-      }
+
     DSAPublicKey that = (DSAPublicKey) obj;
     return super.equals(that) && y.equals(that.getY());
   }
@@ -209,9 +191,9 @@
         str = new StringBuilder(this.getClass().getName()).append("(")
         .append(super.toString()).append(",").append(ls)
         .append("y=0x").append(y.toString(16)).append(ls)
-        .append(")").toString();
+            .append(")")
+            .toString();
       }
-
     return str;
   }
 }

Index: dss/DSSKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/dss/DSSKey.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- dss/DSSKey.java	29 Apr 2006 06:53:06 -0000	1.7
+++ dss/DSSKey.java	20 Jun 2006 11:24:43 -0000	1.8
@@ -49,58 +49,56 @@
 import java.security.spec.DSAParameterSpec;
 
 /**
- * <p>A base asbtract class for both public and private DSS (Digital Signature
+ * A base asbtract class for both public and private DSS (Digital Signature
  * Standard) keys. It encapsulates the three DSS numbers: <code>p</code>,
- * <code>q</code> and <code>g</code>.</p>
- *
- * <p>According to the JDK, cryptographic <i>Keys</i> all have a <i>format</i>.
+ * <code>q</code> and <code>g</code>.
+ * <p>
+ * According to the JDK, cryptographic <i>Keys</i> all have a <i>format</i>.
  * The format used in this implementation is called <i>Raw</i>, and basically
  * consists of the raw byte sequences of algorithm parameters. The exact order
- * of the byte sequences and the implementation details are given in each of
- * the relevant <code>getEncoded()</code> methods of each of the private and
- * public keys.</p>
+ * of the byte sequences and the implementation details are given in each of the
+ * relevant <code>getEncoded()</code> methods of each of the private and
+ * public keys.
  *
  * @see DSSPrivateKey#getEncoded
  * @see DSSPublicKey#getEncoded
  */
-public abstract class DSSKey implements Key, DSAKey
+public abstract class DSSKey
+    implements Key, DSAKey
 {
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
   /**
-   * A prime modulus, where <code>2<sup>L-1</sup> &lt; p &lt; 2<sup>L</sup></code>
-   * for <code>512 &lt;= L &lt;= 1024</code> and <code>L</code> a multiple of
+   * A prime modulus, where
+   * <code>2<sup>L-1</sup> &lt; p &lt; 2<sup>L</sup></code> for
+   * <code>512 &lt;= L &lt;= 1024</code> and <code>L</code> a multiple of
    * <code>64</code>.
    */
   protected final BigInteger p;
 
   /**
-   * A prime divisor of <code>p - 1</code>, where <code>2<sup>159</sup> &lt; q
+   * A prime divisor of <code>p - 1</code>, where
+   * <code>2<sup>159</sup> &lt; q
    * &lt; 2<sup>160</sup></code>.
    */
   protected final BigInteger q;
 
   /**
-   * <code>g = h<sup>(p-1)</sup>/q mod p</code>, where <code>h</code> is any
-   * integer with <code>1 &lt; h &lt; p - 1</code> such that <code>h<sup>
-   * (p-1)</sup>/q mod p > 1</code> (<code>g</code> has order <code>q mod p
+   * <code>g = h<sup>(p-1)</sup>/q mod p</code>, where <code>h</code> is
+   * any integer with <code>1 &lt; h &lt; p - 1</code> such that <code>h<sup>
+   * (p-1)</sup>/q mod p > 1</code> (<code>g</code>
+   * has order <code>q mod p
    * </code>).
    */
   protected final BigInteger g;
 
   /**
-   * Identifier of the default encoding format to use when externalizing the
-   * key material.
+   * Identifier of the default encoding format to use when externalizing the key
+   * material.
    */
   protected final int defaultFormat;
 
   /** String representation of this key. Cached for speed. */
   private transient String str;
 
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   /**
    * Trivial protected constructor.
    * 
@@ -121,21 +119,11 @@
     this.g = g;
   }
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
-
-  // java.security.interfaces.DSAKey interface implementation ----------------
-
   public DSAParams getParams()
   {
     return new DSAParameterSpec(p, q, g);
   }
 
-  // java.security.Key interface implementation ------------------------------
-
   public String getAlgorithm()
   {
     return Registry.DSS_KPG;
@@ -152,27 +140,23 @@
     return FormatUtil.getEncodingShortName(defaultFormat);
   }
 
-  // Other instance methods --------------------------------------------------
-
   /**
-   * <p>Returns <code>true</code> if the designated object is an instance of
+   * Returns <code>true</code> if the designated object is an instance of
    * {@link DSAKey} and has the same DSS (Digital Signature Standard) parameter
-   * values as this one.</p>
+   * values as this one.
    *
    * @param obj the other non-null DSS key to compare to.
-   * @return <code>true</code> if the designated object is of the same type and
-   * value as this one.
+   * @return <code>true</code> if the designated object is of the same type
+   *         and value as this one.
    */
   public boolean equals(Object obj)
   {
     if (obj == null)
-      {
         return false;
-      }
-    if (!(obj instanceof DSAKey))
-      {
+
+    if (! (obj instanceof DSAKey))
         return false;
-      }
+
     DSAKey that = (DSAKey) obj;
     return p.equals(that.getParams().getP())
            && q.equals(that.getParams().getQ())
@@ -184,18 +168,15 @@
     if (str == null)
       {
         String ls = SystemProperties.getProperty("line.separator");
-        str = new StringBuilder().append(ls)
+        str = new StringBuilder(ls)
         .append("defaultFormat=").append(defaultFormat).append(",").append(ls)
         .append("p=0x").append(p.toString(16)).append(",").append(ls)
         .append("q=0x").append(q.toString(16)).append(",").append(ls)
         .append("g=0x").append(g.toString(16))
         .toString();
       }
-
     return str;
   }
 
-  // abstract methods to be implemented by subclasses ------------------------
-
   public abstract byte[] getEncoded(int format);
 }

Index: dss/DSSKeyPairGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- dss/DSSKeyPairGenerator.java	11 Jun 2006 12:14:44 -0000	1.5
+++ dss/DSSKeyPairGenerator.java	20 Jun 2006 11:24:43 -0000	1.6
@@ -54,55 +54,54 @@
 import java.util.logging.Logger;
 
 /**
- * <p>A key-pair generator for asymetric keys to use in conjunction with the DSS
- * (Digital Signature Standard).</p>
- *
- * References:<br>
+ * A key-pair generator for asymetric keys to use in conjunction with the DSS
+ * (Digital Signature Standard).
+ * <p>
+ * References:
+ * <p>
  * <a href="http://www.itl.nist.gov/fipspubs/fip186.htm">Digital Signature
- * Standard (DSS)</a>, Federal Information Processing Standards Publication 186.
- * National Institute of Standards and Technology.
+ * Standard (DSS)</a>, Federal Information Processing Standards Publication
+ * 186. National Institute of Standards and Technology.
  */
-public class DSSKeyPairGenerator implements IKeyPairGenerator
+public class DSSKeyPairGenerator
+    implements IKeyPairGenerator
 {
   private static final Logger log = Logger.getLogger(DSSKeyPairGenerator.class.getName());
+
   /** The BigInteger constant 2. */
-  private static final BigInteger TWO = new BigInteger("2");
+  private static final BigInteger TWO = BigInteger.valueOf(2L);
 
   /** Property name of the length (Integer) of the modulus (p) of a DSS key. */
   public static final String MODULUS_LENGTH = "gnu.crypto.dss.L";
 
   /**
    * Property name of the Boolean indicating wether or not to use default pre-
-   * computed values of <code>p</code>, <code>q</code> and <code>g</code> for
-   * a given modulus length. The ultimate behaviour of this generator with
+   * computed values of <code>p</code>, <code>q</code> and <code>g</code>
+   * for a given modulus length. The ultimate behaviour of this generator with
    * regard to using pre-computed parameter sets will depend on the value of
    * this property and of the following one {@link #STRICT_DEFAULTS}:
-   * 
    * <ol>
-   *   <li>If this property is {@link Boolean#FALSE} then this generator
-   *   will accept being setup for generating parameters for any modulus length
+   * <li>If this property is {@link Boolean#FALSE} then this generator will
+   * accept being setup for generating parameters for any modulus length
    *   provided the modulus length is between <code>512</code> and
    *   <code>1024</code>, and is of the form <code>512 + 64 * n</code>. In
    *   addition, a new paramter set will always be generated; i.e. no pre-
    *   computed values are used.</li>
-   *   
    *   <li>If this property is {@link Boolean#TRUE} and the value of
    *   {@link #STRICT_DEFAULTS} is also {@link Boolean#TRUE} then this generator
-   *   will only accept being setup for generating parameters for modulus
-   *   lengths of <code>512</code>, <code>768</code> and <code>1024</code>. Any
+   * will only accept being setup for generating parameters for modulus lengths
+   * of <code>512</code>, <code>768</code> and <code>1024</code>. Any
    *   other value, of the modulus length, even if between <code>512</code> and
-   *   <code>1024</code>, and of the form <code>512 + 64 * n</code>, will cause
-   *   an {@link IllegalArgumentException} to be thrown. When those modulus
-   *   length (<code>512</code>, <code>768</code>, and <code>1024</code>) are
-   *   specified, the paramter set is always the same.</li>
-   *   
+   * <code>1024</code>, and of the form <code>512 + 64 * n</code>, will
+   * cause an {@link IllegalArgumentException} to be thrown. When those modulus
+   * length (<code>512</code>, <code>768</code>, and <code>1024</code>)
+   * are specified, the paramter set is always the same.</li>
    *   <li>Finally, if this property is {@link Boolean#TRUE} and the value of
-   *   {@link #STRICT_DEFAULTS} is {@link Boolean#FALSE} then this generator
-   *   will behave as in point 1 above, except that it will use pre-computed
-   *   values when possible; i.e. the modulus length is one of <code>512</code>,
+   * {@link #STRICT_DEFAULTS} is {@link Boolean#FALSE} then this generator will
+   * behave as in point 1 above, except that it will use pre-computed values
+   * when possible; i.e. the modulus length is one of <code>512</code>,
    *   <code>768</code>, or <code>1024</code>.</li>
    * </ol>
-   * 
    * The default value of this property is {@link Boolean#TRUE}.
    */
   public static final String USE_DEFAULTS = "gnu.crypto.dss.use.defaults";
@@ -127,8 +126,8 @@
 
   /**
    * Property name of an optional {@link DSAParameterSpec} instance to use for
-   * this generator's <code>p</code>, <code>q</code>, and <code>g</code> values.
-   * The default is to generate these values or use pre-computed ones,
+   * this generator's <code>p</code>, <code>q</code>, and <code>g</code>
+   * values. The default is to generate these values or use pre-computed ones,
    * depending on the value of the <code>USE_DEFAULTS</code> attribute.
    */
   public static final String DSS_PARAMETERS = "gnu.crypto.dss.params";
@@ -147,55 +146,41 @@
   private static final int DEFAULT_ENCODING_FORMAT = Registry.RAW_ENCODING_ID;
 
   /** Initial SHS context. */
-  private static final int[] T_SHS = new int[] { 0x67452301, 0xEFCDAB89,
-                                                0x98BADCFE, 0x10325476,
-                                                0xC3D2E1F0 };
+  private static final int[] T_SHS = new int[] {
+      0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0
+  };
 
   // from jdk1.3.1/docs/guide/security/CryptoSpec.html#AppB
   public static final DSAParameterSpec KEY_PARAMS_512 = new DSAParameterSpec(
                                                                              new BigInteger(
                                                                                             "fca682ce8e12caba26efccf7110e526db078b05edecbcd1eb4a208f3ae1617ae"
-                                                                                                + "01f35b91a47e6df63413c5e12ed0899bcd132acd50d99151bdc43ee737592e17",
-                                                                                            16),
-                                                                             new BigInteger(
-                                                                                            "962eddcc369cba8ebb260ee6b6a126d9346e38c5",
-                                                                                            16),
+        + "01f35b91a47e6df63413c5e12ed0899bcd132acd50d99151bdc43ee737592e17", 16),
+      new BigInteger("962eddcc369cba8ebb260ee6b6a126d9346e38c5", 16),
                                                                              new BigInteger(
                                                                                             "678471b27a9cf44ee91a49c5147db1a9aaf244f05a434d6486931d2d14271b9e"
-                                                                                                + "35030b71fd73da179069b32e2935630e1c2062354d0da20a6c416e50be794ca4",
-                                                                                            16));
-
+        + "35030b71fd73da179069b32e2935630e1c2062354d0da20a6c416e50be794ca4", 16));
   public static final DSAParameterSpec KEY_PARAMS_768 = new DSAParameterSpec(
                                                                              new BigInteger(
                                                                                             "e9e642599d355f37c97ffd3567120b8e25c9cd43e927b3a9670fbec5d8901419"
                                                                                                 + "22d2c3b3ad2480093799869d1e846aab49fab0ad26d2ce6a22219d470bce7d77"
-                                                                                                + "7d4a21fbe9c270b57f607002f3cef8393694cf45ee3688c11a8c56ab127a3daf",
-                                                                                            16),
-                                                                             new BigInteger(
-                                                                                            "9cdbd84c9f1ac2f38d0f80f42ab952e7338bf511",
-                                                                                            16),
+        + "7d4a21fbe9c270b57f607002f3cef8393694cf45ee3688c11a8c56ab127a3daf", 16),
+      new BigInteger("9cdbd84c9f1ac2f38d0f80f42ab952e7338bf511", 16),
                                                                              new BigInteger(
                                                                                             "30470ad5a005fb14ce2d9dcd87e38bc7d1b1c5facbaecbe95f190aa7a31d23c4"
                                                                                                 + "dbbcbe06174544401a5b2c020965d8c2bd2171d3668445771f74ba084d2029d8"
-                                                                                                + "3c1c158547f3a9f1a2715be23d51ae4d3e5a1f6a7064f316933a346d3f529252",
-                                                                                            16));
-
+        + "3c1c158547f3a9f1a2715be23d51ae4d3e5a1f6a7064f316933a346d3f529252", 16));
   public static final DSAParameterSpec KEY_PARAMS_1024 = new DSAParameterSpec(
                                                                               new BigInteger(
                                                                                              "fd7f53811d75122952df4a9c2eece4e7f611b7523cef4400c31e3f80b6512669"
                                                                                                  + "455d402251fb593d8d58fabfc5f5ba30f6cb9b556cd7813b801d346ff26660b7"
                                                                                                  + "6b9950a5a49f9fe8047b1022c24fbba9d7feb7c61bf83b57e7c6a8a6150f04fb"
-                                                                                                 + "83f6d3c51ec3023554135a169132f675f3ae2b61d72aeff22203199dd14801c7",
-                                                                                             16),
-                                                                              new BigInteger(
-                                                                                             "9760508f15230bccb292b982a2eb840bf0581cf5",
-                                                                                             16),
+        + "83f6d3c51ec3023554135a169132f675f3ae2b61d72aeff22203199dd14801c7", 16),
+      new BigInteger("9760508f15230bccb292b982a2eb840bf0581cf5", 16),
                                                                               new BigInteger(
                                                                                              "f7e1a085d69b3ddecbbcab5c36b857b97994afbbfa3aea82f9574c0b3d078267"
                                                                                                  + "5159578ebad4594fe67107108180b449167123e84c281613b7cf09328cc8a6e1"
                                                                                                  + "3c167a8b547c8d28e0a3ae1e2bb3a675916ea37f0bfa213562f1fb627a01243b"
-                                                                                                 + "cca4f1bea8519089a883dfe15ae59f06928b665e807b552564014c3bfecf492a",
-                                                                                             16));
+        + "cca4f1bea8519089a883dfe15ae59f06928b665e807b552564014c3bfecf492a", 16));
 
   private static final BigInteger TWO_POW_160 = TWO.pow(160);
 
@@ -225,30 +210,17 @@
   /** Preferred encoding format of generated keys. */
   private int preferredFormat;
 
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
-  // implicit 0-arguments constructor
-
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
-
-  // gnu.crypto.key.IKeyPairGenerator interface implementation ---------------
-
   public String name()
   {
     return Registry.DSS_KPG;
   }
 
   /**
-   * <p>Configures this instance.</p>
+   * Configures this instance.
    *
    * @param attributes the map of name/value pairs to use.
-   * @exception IllegalArgumentException if the designated MODULUS_LENGTH
-   * value is not greater than 512, less than 1024 and not of the form
+   * @exception IllegalArgumentException if the designated MODULUS_LENGTH value
+   *              is not greater than 512, less than 1024 and not of the form
    * <code>512 + 64j</code>.
    */
   public void setup(Map attributes)
@@ -262,9 +234,7 @@
     // should we use the default pre-computed params?
     Boolean useDefaults = (Boolean) attributes.get(USE_DEFAULTS);
     if (useDefaults == null)
-      {
         useDefaults = Boolean.TRUE;
-      }
 
     Boolean strictDefaults = (Boolean) attributes.get(STRICT_DEFAULTS);
     if (strictDefaults == null)
@@ -316,16 +286,12 @@
         q = null;
         g = null;
       }
-
     // do we have a SecureRandom, or should we use our own?
     rnd = (SecureRandom) attributes.get(SOURCE_OF_RANDOMNESS);
-
     // what is the preferred encoding format
     Integer formatID = (Integer) attributes.get(PREFERRED_ENCODING_FORMAT);
-    preferredFormat = formatID == null
-        ? DEFAULT_ENCODING_FORMAT
+    preferredFormat = formatID == null ? DEFAULT_ENCODING_FORMAT
         : formatID.intValue();
-
     // set the seed-key
     byte[] kb = new byte[20]; // we need 160 bits of randomness
     nextRandomBytes(kb);
@@ -353,66 +319,55 @@
             log.fine("g: " + g.toString(16));
           }
       }
-
     BigInteger x = nextX();
     BigInteger y = g.modPow(x, p);
-
     PublicKey pubK = new DSSPublicKey(preferredFormat, p, q, g, y);
     PrivateKey secK = new DSSPrivateKey(preferredFormat, p, q, g, x);
-
     return new KeyPair(pubK, secK);
   }
 
-  // Other instance methods --------------------------------------------------
-
   /**
-   * <p>This method applies the following algorithm described in 3.1 of
-   * FIPS-186:</p>
-   *
+   * This method applies the following algorithm described in 3.1 of FIPS-186:
    * <ol>
    *    <li>XSEED = optional user input.</li>
    *    <li>XVAL = (XKEY + XSEED) mod 2<sup>b</sup>.</li>
    *    <li>x = G(t, XVAL) mod q.</li>
    *    <li>XKEY = (1 + XKEY + x) mod 2<sup>b</sup>.</li>
    * </ol>
-   *
-   * <p>Where <code>b</code> is the length of a secret b-bit seed-key (XKEY).</p>
-   *
-   * <p>Note that in this implementation, XSEED, the optional user input, is
-   * always zero.</p>
+   * <p>
+   * Where <code>b</code> is the length of a secret b-bit seed-key (XKEY).
+   * <p>
+   * Note that in this implementation, XSEED, the optional user input, is always
+   * zero.
    */
   private synchronized BigInteger nextX()
   {
     byte[] xk = XKEY.toByteArray();
     byte[] in = new byte[64]; // 512-bit block for SHS
     System.arraycopy(xk, 0, in, 0, xk.length);
-
     int[] H = Sha160.G(T_SHS[0], T_SHS[1], T_SHS[2], T_SHS[3], T_SHS[4], in, 0);
     byte[] h = new byte[20];
     for (int i = 0, j = 0; i < 5; i++)
       {
-        h[j++] = (byte) (H[i] >>> 24);
-        h[j++] = (byte) (H[i] >>> 16);
-        h[j++] = (byte) (H[i] >>> 8);
+        h[j++] = (byte)(H[i] >>> 24);
+        h[j++] = (byte)(H[i] >>> 16);
+        h[j++] = (byte)(H[i] >>> 8);
         h[j++] = (byte) H[i];
       }
     BigInteger result = new BigInteger(1, h).mod(q);
     XKEY = XKEY.add(result).add(BigInteger.ONE).mod(TWO_POW_160);
-
     return result;
   }
 
   /**
-   * <p>Fills the designated byte array with random data.</p>
+   * Fills the designated byte array with random data.
    *
    * @param buffer the byte array to fill with random data.
    */
   private void nextRandomBytes(byte[] buffer)
   {
     if (rnd != null)
-      {
         rnd.nextBytes(buffer);
-      }
     else
       getDefaultPRNG().nextBytes(buffer);
   }

Index: dss/DSSPrivateKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/dss/DSSPrivateKey.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- dss/DSSPrivateKey.java	11 Jun 2006 12:14:44 -0000	1.5
+++ dss/DSSPrivateKey.java	20 Jun 2006 11:24:43 -0000	1.6
@@ -48,24 +48,23 @@
 import java.security.interfaces.DSAPrivateKey;
 
 /**
- * <p>An object that embodies a DSS (Digital Signature Standard) private key.</p>
+ * An object that embodies a DSS (Digital Signature Standard) private key.
  *
  * @see #getEncoded
  */
-public class DSSPrivateKey extends DSSKey implements PrivateKey, DSAPrivateKey
+public class DSSPrivateKey
+    extends DSSKey
+    implements PrivateKey, DSAPrivateKey
 {
   /**
-   * <p>A randomly or pseudorandomly generated integer with <code>0 &lt; x &lt;
-   * q</code>.</p>
+   * A randomly or pseudorandomly generated integer with <code>0 &lt; x &lt;
+   * q</code>.
    */
   private final BigInteger x;
 
   /** String representation of this key. Cached for speed. */
   private transient String str;
 
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   /**
    * Convenience constructor. Calls the constructor with 5 arguments passing
    * {@link Registry#RAW_ENCODING_ID} as the identifier of the preferred
@@ -100,13 +99,9 @@
     super(preferredFormat == Registry.ASN1_ENCODING_ID ? Registry.PKCS8_ENCODING_ID
                                                        : preferredFormat,
           p, q, g);
-
     this.x = x;
   }
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
   /**
    * A class method that takes the output of the <code>encodePrivateKey()</code>
    * method of a DSS keypair codec object (an instance implementing
@@ -131,26 +126,18 @@
       catch (IllegalArgumentException ignored)
         {
         }
-
     // try PKCS#8 codec
     return (DSSPrivateKey) new DSSKeyPairPKCS8Codec().decodePrivateKey(k);
   }
 
-  // Instance methods
-  // -------------------------------------------------------------------------
-
-  // java.security.interfaces.DSAPrivateKey interface implementation ---------
-
   public BigInteger getX()
   {
     return x;
   }
 
-  // Other instance methods --------------------------------------------------
-
   /**
-   * <p>Returns the encoded form of this private key according to the
-   * designated format.</p>
+   * Returns the encoded form of this private key according to the designated
+   * format.
    *
    * @param format the desired format identifier of the resulting encoding.
    * @return the byte sequence encoding this key according to the designated
@@ -177,24 +164,22 @@
   }
 
   /**
-   * <p>Returns <code>true</code> if the designated object is an instance of
+   * Returns <code>true</code> if the designated object is an instance of
    * {@link DSAPrivateKey} and has the same DSS (Digital Signature Standard)
-   * parameter values as this one.</p>
+   * parameter values as this one.
    *
    * @param obj the other non-null DSS key to compare to.
-   * @return <code>true</code> if the designated object is of the same type and
-   * value as this one.
+   * @return <code>true</code> if the designated object is of the same type
+   *         and value as this one.
    */
   public boolean equals(Object obj)
   {
     if (obj == null)
-      {
         return false;
-      }
-    if (!(obj instanceof DSAPrivateKey))
-      {
+
+    if (! (obj instanceof DSAPrivateKey))
         return false;
-      }
+
     DSAPrivateKey that = (DSAPrivateKey) obj;
     return super.equals(that) && x.equals(that.getX());
   }
@@ -208,9 +193,9 @@
         .append(super.toString()).append(",").append(ls)
         .append("x=0x").append(Configuration.DEBUG ? x.toString(16)
                                                    : "**...*").append(ls)
-        .append(")").toString();
+            .append(")")
+            .toString();
       }
-
     return str;
   }
 }

Index: dss/DSSKeyPairX509Codec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/dss/DSSKeyPairX509Codec.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- dss/DSSKeyPairX509Codec.java	23 Feb 2006 12:54:46 -0000	1.3
+++ dss/DSSKeyPairX509Codec.java	20 Jun 2006 11:24:43 -0000	1.4
@@ -157,11 +157,10 @@
       }
     catch (IOException x)
       {
-        InvalidParameterException e = new InvalidParameterException();
+        InvalidParameterException e = new InvalidParameterException(x.getMessage());
         e.initCause(x);
         throw e;
       }
-
     return result;
   }
 
@@ -230,11 +229,10 @@
       }
     catch (IOException x)
       {
-        InvalidParameterException e = new InvalidParameterException();
+        InvalidParameterException e = new InvalidParameterException(x.getMessage());
         e.initCause(x);
         throw e;
       }
-
     return new DSSPublicKey(Registry.X509_ENCODING_ID, p, q, g, y);
   }
 

Index: dss/DSSKeyPairPKCS8Codec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- dss/DSSKeyPairPKCS8Codec.java	11 Jun 2006 12:14:44 -0000	1.6
+++ dss/DSSKeyPairPKCS8Codec.java	20 Jun 2006 11:24:43 -0000	1.7
@@ -159,11 +159,10 @@
       }
     catch (IOException e)
       {
-        InvalidParameterException y = new InvalidParameterException();
+        InvalidParameterException y = new InvalidParameterException(e.getMessage());
         y.initCause(e);
         throw y;
       }
-
     return result;
   }
 
@@ -187,7 +186,6 @@
   {
     if (Configuration.DEBUG)
       log.entering(this.getClass().getName(), "decodePrivateKey");
-
     if (input == null)
       throw new InvalidParameterException("Input bytes MUST NOT be null");
 
@@ -240,7 +238,7 @@
       }
     catch (IOException e)
       {
-        InvalidParameterException y = new InvalidParameterException();
+        InvalidParameterException y = new InvalidParameterException(e.getMessage());
         y.initCause(e);
         throw y;
       }

Index: dss/FIPS186.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/key/dss/FIPS186.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- dss/FIPS186.java	18 Jun 2006 02:43:56 -0000	1.4
+++ dss/FIPS186.java	20 Jun 2006 11:24:43 -0000	1.5
@@ -45,20 +45,16 @@
 import java.security.SecureRandom;
 
 /**
- * <p>An implementation of the DSA parameters generation as described in
- * FIPS-186.</p>
- *
- * References:<br>
+ * An implementation of the DSA parameters generation as described in FIPS-186.
+ * <p>
+ * References:
+ * <p>
  * <a href="http://www.itl.nist.gov/fipspubs/fip186.htm">Digital Signature
- * Standard (DSS)</a>, Federal Information Processing Standards Publication 186.
- * National Institute of Standards and Technology.
+ * Standard (DSS)</a>, Federal Information Processing Standards Publication
+ * 186. National Institute of Standards and Technology.
  */
 public class FIPS186
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
   public static final int DSA_PARAMS_SEED = 0;
 
   public static final int DSA_PARAMS_COUNTER = 1;
@@ -72,7 +68,7 @@
   public static final int DSA_PARAMS_G = 5;
 
   /** The BigInteger constant 2. */
-  private static final BigInteger TWO = new BigInteger("2");
+  private static final BigInteger TWO = BigInteger.valueOf(2L);
 
   private static final BigInteger TWO_POW_160 = TWO.pow(160);
 
@@ -88,9 +84,6 @@
   /** Our default source of randomness. */
   private PRNG prng = null;
 
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   public FIPS186(int L, SecureRandom rnd)
   {
     super();
@@ -99,24 +92,18 @@
     this.rnd = rnd;
   }
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
-
   /**
    * This method generates the DSS <code>p</code>, <code>q</code>, and
    * <code>g</code> parameters only when <code>L</code> (the modulus length)
    * is not one of the following: <code>512</code>, <code>768</code> and
-   * <code>1024</code>. For those values of <code>L</code>, this implementation
-   * uses pre-computed values of <code>p</code>, <code>q</code>, and
-   * <code>g</code> given in the document <i>CryptoSpec</i> included in the
-   * security guide documentation of the standard JDK distribution.<p>
-   *
+   * <code>1024</code>. For those values of <code>L</code>, this
+   * implementation uses pre-computed values of <code>p</code>,
+   * <code>q</code>, and <code>g</code> given in the document <i>CryptoSpec</i>
+   * included in the security guide documentation of the standard JDK
+   * distribution.
+   * <p>
    * The DSS requires two primes , <code>p</code> and <code>q</code>,
    * satisfying the following three conditions:
-   *
    * <ul>
    *    <li><code>2<sup>159</sup> &lt; q &lt; 2<sup>160</sup></code></li>
    *    <li><code>2<sup>L-1</sup> &lt; p &lt; 2<sup>L</sup></code> for a
@@ -124,13 +111,12 @@
    *    <code>0 &lt;= j &lt;= 8</code></li>
    *    <li>q divides p - 1.</li>
    * </ul>
-   *
    * The algorithm used to find these primes is as described in FIPS-186,
    * section 2.2: GENERATION OF PRIMES. This prime generation scheme starts by
-   * using the {@link Sha160} and a user supplied <i>SEED</i>
-   * to construct a prime, <code>q</code>, in the range 2<sup>159</sup> &lt; q
-   * &lt; 2<sup>160</sup>. Once this is accomplished, the same <i>SEED</i>
-   * value is used to construct an <code>X</code> in the range <code>2<sup>L-1
+   * using the {@link Sha160} and a user supplied <i>SEED</i> to construct a
+   * prime, <code>q</code>, in the range 2<sup>159</sup> &lt; q &lt; 2<sup>160</sup>.
+   * Once this is accomplished, the same <i>SEED</i> value is used to construct
+   * an <code>X</code> in the range <code>2<sup>L-1
    * </sup> &lt; X &lt; 2<sup>L</sup>. The prime, <code>p</code>, is then
    * formed by rounding <code>X</code> to a number congruent to <code>1 mod
    * 2q</code>. In this implementation we use the same <i>SEED</i> value given
@@ -168,9 +154,8 @@
                 u = sha.digest();
               }
             for (int i = 0; i < a.length; i++)
-              {
                 a[i] ^= u[i];
-              }
+
             U = new BigInteger(1, a);
             // 3. Form q from U by setting the most significant bit (the
             // 2**159 bit) and the least significant bit to 1. In terms of
@@ -183,11 +168,8 @@
             // most 1/2**80.
             // 5. If q is not prime, go to step 1.
             if (q.isProbablePrime(80))
-              {
                 break step1;
-              }
           } // step1
-
         // 6. Let counter = 0 and offset = 2.
         counter = 0;
         offset = 2;
@@ -200,9 +182,9 @@
               {
                 for (int k = 0; k <= n; k++)
                   {
-                    a = SEED_PLUS_OFFSET.add(
-                                             BigInteger.valueOf(k & 0xFFFFFFFFL)).mod(
-                                                                                      TWO_POW_160).toByteArray();
+                    a = SEED_PLUS_OFFSET
+                        .add(BigInteger.valueOf(k & 0xFFFFFFFFL))
+                        .mod(TWO_POW_160).toByteArray();
                     sha.update(a, 0, a.length);
                     V[k] = new BigInteger(1, sha.digest());
                   }
@@ -213,9 +195,8 @@
             // Note that 0 <= W < 2**(L-1) and hence 2**(L-1) <= X < 2**L.
             W = V[0];
             for (int k = 1; k < n; k++)
-              {
                 W = W.add(V[k].multiply(TWO.pow(k * 160)));
-              }
+
             W = W.add(V[n].mod(TWO.pow(b)).multiply(TWO.pow(n * 160)));
             X = W.add(TWO.pow(L - 1));
             // 9. Let c = X mod 2q and set p = X - (c - 1).
@@ -228,21 +209,16 @@
                 // 11. Perform a robust primality test on p.
                 // 12. If p passes the test performed in step 11, go to step 15.
                 if (p.isProbablePrime(80))
-                  {
                     break algorithm;
                   }
-              }
             // 13. Let counter = counter + 1 and offset = offset + n + 1.
             counter++;
             offset += n + 1;
             // 14. If counter >= 4096 go to step 1, otherwise go to step 7.
             if (counter >= 4096)
-              {
                 continue algorithm;
-              }
           } // step7
       } // algorithm
-
     // compute g. from FIPS-186, Appendix 4:
     // 1. Generate p and q as specified in Appendix 2.
     // 2. Let e = (p - 1) / q
@@ -257,17 +233,12 @@
         // 4. Set g = h**e mod p
         g = h.modPow(e, p);
         // 5. If g = 1, go to step 3
-        if (!g.equals(BigInteger.ONE))
-          {
+        if (! g.equals(BigInteger.ONE))
             break;
           }
-      }
-
     return new BigInteger[] { SEED, BigInteger.valueOf(counter), q, p, e, g };
   }
 
-  // helper methods ----------------------------------------------------------
-
   /**
    * Fills the designated byte array with random data.
    *
@@ -276,9 +247,7 @@
   private void nextRandomBytes(byte[] buffer)
   {
     if (rnd != null)
-      {
         rnd.nextBytes(buffer);
-      }
     else
       getDefaultPRNG().nextBytes(buffer);
   }



From MAILER-DAEMON Tue Jun 20 09:57:58 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fsgju-00029E-Qe
	for mharc-commit-classpath@gnu.org; Tue, 20 Jun 2006 09:57:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fsgjs-000272-Fx
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 09:57:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fsgjq-000252-Bm
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 09:57:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fsgjq-00024q-3I
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 09:57:54 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FsguN-0005Zp-7c
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 10:08:47 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fsgjp-0006Uj-00
	for <commit-classpath@gnu.org>; Tue, 20 Jun 2006 09:57:53 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1Fsgjn-0006Uf-O7
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 13:57:52 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fsgjn-0006Uf-O7@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Tue, 20 Jun 2006 13:57:51 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Cairo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jun 2006 13:57:57 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/20 13:57:51

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 

Log message:
	2006-06-20  Lillian Angel  <langel@redhat.com>
	
	        * gnu/java/awt/peer/gtk/CairoGraphics2D.java
	        (drawImage): Added call to updateColor because
	        Cairo seems to lose the current color.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7881&r2=1.7882
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7881
retrieving revision 1.7882
diff -u -b -r1.7881 -r1.7882
--- ChangeLog	20 Jun 2006 11:36:22 -0000	1.7881
+++ ChangeLog	20 Jun 2006 13:57:49 -0000	1.7882
@@ -1,3 +1,9 @@
+2006-06-20  Lillian Angel  <langel@redhat.com>
+
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
+	(drawImage): Added call to updateColor because
+	Cairo seems to lose the current color.
+
 2006-06-20  Gary Benson  <gbenson@redhat.com>
 
 	* java/awt/Toolkit.java: Add security check.

Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java	19 Jun 2006 20:28:22 -0000	1.26
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java	20 Jun 2006 13:57:51 -0000	1.27
@@ -1233,6 +1233,7 @@
     if(db instanceof CairoSurface)
       {
 	((CairoSurface)db).drawSurface(nativePointer, i2u, alpha);
+        updateColor();
 	return true;
       }
 	    



From MAILER-DAEMON Tue Jun 20 11:36:49 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FsiHZ-0007ZC-MH
	for mharc-commit-classpath@gnu.org; Tue, 20 Jun 2006 11:36:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FsiHX-0007YY-TZ
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 11:36:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FsiHW-0007YM-IC
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 11:36:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FsiHW-0007YJ-DU
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 11:36:46 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FsiS4-00089K-Jt
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 11:47:40 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FsiHT-0003XE-00
	for <commit-classpath@gnu.org>; Tue, 20 Jun 2006 11:36:43 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FsiHR-0003X8-Lv
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 15:36:43 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FsiHR-0003X8-Lv@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Tue, 20 Jun 2006 15:36:41 +0000
Subject: [commit-cp] classpath/javax/swing/text GapContent.java Chan...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jun 2006 15:36:48 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/20 15:36:41

Modified files:
	javax/swing/text: GapContent.java 
	.              : ChangeLog 

Log message:
	2006-06-20  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/text/GapContent.java
		(GapContentPosition.mark): New field.
		(GapContentPosition.index): Removed.
		(GapContentPosition.GapContentPosition): Changed to take the
		real offset as parameter. Added handling of reference counter.
		Try to cleanup before creating new instances.
		(getOffset): Delegate to the Mark method with same name.
		(Mark): New class, encapsulating a mark.
		(positionMarks): Removed field.
		(numMarks): Removed field.
		(marks): New field.
		(queueOfDeath): New field.
		(GapContent): Removed init of old fields, added init of new fields.
		(createPosition): Added check for validity of arguments.
		Create GapContentPosition directly with offset.
		(shiftEnd): Pass end of buffer directly to adjustPositionsInRange.
		(shiftGap): Pass end of buffer directly to adjustPositionsInRange.
		(shiftGapStartDown): Call resetMarksAtZero().
		(shiftGapEndUp): Call resetMarksAtZero().
		(replace): Don't call resetMarksAtZero().
		(setPositionInRange): Replaced by simpler algorithm, similar to
		adjustPositionsInRange.
		(adjustPositionsInRange): Adapted to use of Mark objects.
		(resetMarksAtZero): Reset all marks that point to zero instead
		of only the first one.
		(dumpMarks): Adjusted to dump Mark objects.
		(insertMark): Removed.
		(garbageCollect): New method. Cleans up the marks list.
		(binarySearch): Removed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/GapContent.java?cvsroot=classpath&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7882&r2=1.7883

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7882
retrieving revision 1.7883
diff -u -b -r1.7882 -r1.7883
--- ChangeLog	20 Jun 2006 13:57:49 -0000	1.7882
+++ ChangeLog	20 Jun 2006 15:36:39 -0000	1.7883
@@ -1,3 +1,35 @@
+2006-06-20  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/text/GapContent.java
+	(GapContentPosition.mark): New field.
+	(GapContentPosition.index): Removed.
+	(GapContentPosition.GapContentPosition): Changed to take the
+	real offset as parameter. Added handling of reference counter.
+	Try to cleanup before creating new instances.
+	(getOffset): Delegate to the Mark method with same name.
+	(Mark): New class, encapsulating a mark.
+	(positionMarks): Removed field.
+	(numMarks): Removed field.
+	(marks): New field.
+	(queueOfDeath): New field.
+	(GapContent): Removed init of old fields, added init of new fields.
+	(createPosition): Added check for validity of arguments.
+	Create GapContentPosition directly with offset.
+	(shiftEnd): Pass end of buffer directly to adjustPositionsInRange.
+	(shiftGap): Pass end of buffer directly to adjustPositionsInRange.
+	(shiftGapStartDown): Call resetMarksAtZero().
+	(shiftGapEndUp): Call resetMarksAtZero().
+	(replace): Don't call resetMarksAtZero().
+	(setPositionInRange): Replaced by simpler algorithm, similar to
+	adjustPositionsInRange.
+	(adjustPositionsInRange): Adapted to use of Mark objects.
+	(resetMarksAtZero): Reset all marks that point to zero instead
+	of only the first one.
+	(dumpMarks): Adjusted to dump Mark objects.
+	(insertMark): Removed.
+	(garbageCollect): New method. Cleans up the marks list.
+	(binarySearch): Removed.
+
 2006-06-20  Lillian Angel  <langel@redhat.com>
 
 	* gnu/java/awt/peer/gtk/CairoGraphics2D.java



From MAILER-DAEMON Tue Jun 20 12:24:27 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fsj1f-0006gi-1q
	for mharc-commit-classpath@gnu.org; Tue, 20 Jun 2006 12:24:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fsj1d-0006fM-8D
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 12:24:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fsj1c-0006f0-E8
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 12:24:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fsj1c-0006et-75
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 12:24:24 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FsjCA-0000U9-Sy
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 12:35:19 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fsj1b-0004zG-00
	for <commit-classpath@gnu.org>; Tue, 20 Jun 2006 12:24:23 -0400
Received: from fkung by savannah.gnu.org with local (Exim 4.50)
	id 1Fsj1a-0004zA-NS
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 16:24:23 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fsj1a-0004zA-NS@savannah.gnu.org>
From: Francis Kung <fkung@redhat.com>
Date: Tue, 20 Jun 2006 16:24:22 +0000
Subject: [commit-cp] classpath/examples/gnu/classpath/examples/java2...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jun 2006 16:24:25 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Francis Kung <fkung>	06/06/20 16:24:22

Modified files:
	examples/gnu/classpath/examples/java2d: J2dBenchmark.java 
	.              : ChangeLog 
Added files:
	examples/gnu/classpath/examples/java2d: J2dBenchmarkGUI.java 

Log message:
	2006-06-20  Francis Kung  <fkung@redhat.com>
	
		* examples/gnu/classpath/examples/java2d/J2dBenchmark.java:
		Changed many members to be protected.
		(J2dBenchmark): moved to init() instead.
		(init): New method.
		(main): Call init() after creating object
		(testComplete): New method.
		(test_drawArc): Use maxTests varialbe instead of constant.
		(test_drawCubicCurve): Likewise.
		(test_drawEllipse): Likewise.
		(test_drawGeneralPath): Likewise.
		(test_drawImage): Likewise.
		(test_drawLine): Likewise.
		(test_drawQuadCurve): Likewise.
		(test_drawRectangle): Likewise.
		(test_drawRoundRectangle): Likewise.
		(test_drawTransparentImage): Likewise.
		(test_fillArc): Likewise.
		(test_fillEllipse): Likewise.
		(test_fillGeneralPath): Likewise.
		(test_fillRectangle): Likewise.
		(test_fillRoundRectangle): Likewise.
		(GraphicsTest.runSetNoClipping): Added runCount parameter.
		(GraphicsTest.runSetWithClipping): Likewise.
		(GraphicsTest.runSetZeroClipping): Likewise.
		(GraphicsTest.run): Added checks for more option flags.
		* examples/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java:
		New file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/java2d/J2dBenchmark.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7883&r2=1.7884

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7883
retrieving revision 1.7884
diff -u -b -r1.7883 -r1.7884
--- ChangeLog	20 Jun 2006 15:36:39 -0000	1.7883
+++ ChangeLog	20 Jun 2006 16:24:21 -0000	1.7884
@@ -1,3 +1,33 @@
+2006-06-20  Francis Kung  <fkung@redhat.com>
+
+	* examples/gnu/classpath/examples/java2d/J2dBenchmark.java:
+	Changed many members to be protected.
+	(J2dBenchmark): moved to init() instead.
+	(init): New method.
+	(main): Call init() after creating object
+	(testComplete): New method.
+	(test_drawArc): Use maxTests varialbe instead of constant.
+	(test_drawCubicCurve): Likewise.
+	(test_drawEllipse): Likewise.
+	(test_drawGeneralPath): Likewise.
+	(test_drawImage): Likewise.
+	(test_drawLine): Likewise.
+	(test_drawQuadCurve): Likewise.
+	(test_drawRectangle): Likewise.
+	(test_drawRoundRectangle): Likewise.
+	(test_drawTransparentImage): Likewise.
+	(test_fillArc): Likewise.
+	(test_fillEllipse): Likewise.
+	(test_fillGeneralPath): Likewise.
+	(test_fillRectangle): Likewise.
+	(test_fillRoundRectangle): Likewise.
+	(GraphicsTest.runSetNoClipping): Added runCount parameter.
+	(GraphicsTest.runSetWithClipping): Likewise.
+	(GraphicsTest.runSetZeroClipping): Likewise.
+	(GraphicsTest.run): Added checks for more option flags.
+	* examples/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java:
+	New file.
+
 2006-06-20  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/text/GapContent.java




From MAILER-DAEMON Tue Jun 20 14:24:21 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fskth-0001pT-82
	for mharc-commit-classpath@gnu.org; Tue, 20 Jun 2006 14:24:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fskte-0001oz-Of
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 14:24:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fsktd-0001om-Si
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 14:24:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fsktd-0001oj-Od
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 14:24:17 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fsl4D-0005HC-2T
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 14:35:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fsktc-0003KQ-00
	for <commit-classpath@gnu.org>; Tue, 20 Jun 2006 14:24:16 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1Fskta-0003KK-Qh
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 18:24:16 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fskta-0003KK-Qh@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Tue, 20 Jun 2006 18:24:14 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/text/JTextCompo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jun 2006 18:24:19 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/20 18:24:14

Modified files:
	.              : ChangeLog 
	javax/swing/text: JTextComponent.java 

Log message:
	2006-06-20  Lillian Angel  <langel@redhat.com>
	
	        * javax/swing/text/JTextComponent.java
	        (AccessibleJTextComponent): Rewrote all javadocs
	        for this inner class.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7884&r2=1.7885
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/JTextComponent.java?cvsroot=classpath&r1=1.58&r2=1.59

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7884
retrieving revision 1.7885
diff -u -b -r1.7884 -r1.7885
--- ChangeLog	20 Jun 2006 16:24:21 -0000	1.7884
+++ ChangeLog	20 Jun 2006 18:24:13 -0000	1.7885
@@ -1,3 +1,9 @@
+2006-06-20  Lillian Angel  <langel@redhat.com>
+
+	* javax/swing/text/JTextComponent.java
+	(AccessibleJTextComponent): Rewrote all javadocs
+	for this inner class.
+
 2006-06-20  Francis Kung  <fkung@redhat.com>
 
 	* examples/gnu/classpath/examples/java2d/J2dBenchmark.java:

Index: javax/swing/text/JTextComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/JTextComponent.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- javax/swing/text/JTextComponent.java	15 May 2006 13:01:03 -0000	1.58
+++ javax/swing/text/JTextComponent.java	20 Jun 2006 18:24:14 -0000	1.59
@@ -90,9 +90,10 @@
   implements Scrollable, Accessible
 {
   /**
-   * This class implements accessibility support for the JTextComponent class. 
-   * It provides an implementation of the Java Accessibility API appropriate 
-   * to menu user-interface elements.
+   * AccessibleJTextComponent implements accessibility hooks for
+   * JTextComponent.  It allows an accessibility driver to read and
+   * manipulate the text component's contents as well as update UI
+   * elements such as the caret.
    */
   public class AccessibleJTextComponent extends AccessibleJComponent implements
       AccessibleText, CaretListener, DocumentListener, AccessibleAction,
@@ -100,15 +101,18 @@
   {
     private static final long serialVersionUID = 7664188944091413696L;
 
-    /** The caret's offset. */
+    /**
+     * The caret's offset.
+     */
     int dot = 0;
     
-    /** The current JTextComponent. */
+    /**
+     * The current JTextComponent.
+     */
     JTextComponent textComp = JTextComponent.this;
     
     /**
-     * Constructs an AccessibleJTextComponent. 
-     * Adds a listener to track caret change.
+     * Construct an AccessibleJTextComponent.
      */
     public AccessibleJTextComponent()
     {
@@ -117,11 +121,10 @@
     }
 
     /**
-     * Returns the zero-based offset of the caret. Note: The character 
-     * to the right of the caret will have the same index value as the 
-     * offset (the caret is between two characters).
+     * Retrieve the current caret position.  The index of the first
+     * caret position is 0.
      * 
-     * @return offset of caret
+     * @return caret position
      */
     public int getCaretPosition()
     {
@@ -130,9 +133,10 @@
     }
 
     /**
-     * Returns the portion of the text that is selected.
+     * Retrieve the current text selection.  If no text is selected
+     * this method returns null.
      * 
-     * @return null if no text is selected.
+     * @return the currently selected text or null
      */
     public String getSelectedText()
     {
@@ -140,11 +144,14 @@
     }
 
     /**
-     * Returns the start offset within the selected text. If there is no 
-     * selection, but there is a caret, the start and end offsets will be 
-     * the same. Return 0 if the text is empty, or the caret position if no selection.
+     * Retrieve the index of the first character in the current text
+     * selection.  If there is no text in the text component, this
+     * method returns 0.  If there is text in the text component, but
+     * there is no selection, this method returns the current caret
+     * position.
      * 
-     * @return index of the start of the text >= 0.
+     * @return the index of the first character in the selection, the
+     * current caret position or 0
      */
     public int getSelectionStart()
     {
@@ -154,12 +161,14 @@
     }
 
     /**
-     * Returns the end offset within the selected text. If there is no 
-     * selection, but there is a caret, the start and end offsets will 
-     * be the same. Return 0 if the text is empty, or the caret position
-     * if no selection.
+     * Retrieve the index of the last character in the current text
+     * selection.  If there is no text in the text component, this
+     * method returns 0.  If there is text in the text component, but
+     * there is no selection, this method returns the current caret
+     * position.
      * 
-     * @return index of the end of the text >= 0.
+     * @return the index of the last character in the selection, the
+     * current caret position or 0
      */
     public int getSelectionEnd()
     {
@@ -169,13 +178,10 @@
     }
 
     /**
-     * Handles caret updates (fire appropriate property change event, which are 
-     * AccessibleContext.ACCESSIBLE_CARET_PROPERTY and 
-     * AccessibleContext.ACCESSIBLE_SELECTION_PROPERTY). This keeps track of 
-     * the dot position internally. When the caret moves, the internal position 
-     * is updated after firing the event.
+     * Handle a change in the caret position and fire any applicable
+     * property change events.
      * 
-     * @param e - caret event
+     * @param e - the caret update event
      */
     public void caretUpdate(CaretEvent e)
       throws NotImplementedException
@@ -185,7 +191,7 @@
     }
 
     /**
-     * Returns the accessible state set of this component.
+     * Retreive the accessible state set of this component.
      *
      * @return the accessible state set of this component
      */
@@ -198,7 +204,7 @@
     }
 
     /**
-     * Returns the accessible role of this component.
+     * Retrieve the accessible role of this component.
      *
      * @return the accessible role of this component
      *
@@ -210,7 +216,8 @@
     }
 
     /**
-     * Returns the AccessibleEditableText interface for this text component.
+     * Retrieve an AccessibleEditableText object that controls this
+     * text component.
      * 
      * @return this
      */
@@ -220,10 +227,8 @@
     }
     
     /**
-     * Get the AccessibleText associated with this object. In the implementation 
-     * of the Java Accessibility API for this class, return this object, 
-     * which is responsible for implementing the AccessibleText interface on 
-     * behalf of itself.
+     * Retrieve an AccessibleText object that controls this text
+     * component.
      *
      * @return this
      *
@@ -235,10 +240,11 @@
     }
     
     /**
-     * Insert update. Fire appropriate property change event which 
-     * is AccessibleContext.ACCESSIBLE_TEXT_PROPERTY.
+     * Handle a text insertion event and fire an
+     * AccessibleContext.ACCESSIBLE_TEXT_PROPERTY property change
+     * event.
      * 
-     * @param e - document event
+     * @param e - the insertion event
      */
     public void insertUpdate(DocumentEvent e)
       throws NotImplementedException
@@ -247,10 +253,11 @@
     }
 
     /**
-     * Remove update. Fire appropriate property change event which 
-     * is AccessibleContext.ACCESSIBLE_TEXT_PROPERTY.
+     * Handle a text removal event and fire an
+     * AccessibleContext.ACCESSIBLE_TEXT_PROPERTY property change
+     * event.
      * 
-     * @param e - document event
+     * @param e - the removal event
      */
     public void removeUpdate(DocumentEvent e)
       throws NotImplementedException
@@ -259,10 +266,11 @@
     }
 
     /**
-     * Changed update. Fire appropriate property change event which 
-     * is AccessibleContext.ACCESSIBLE_TEXT_PROPERTY.
+     * Handle a text change event and fire an
+     * AccessibleContext.ACCESSIBLE_TEXT_PROPERTY property change
+     * event.
      * 
-     * @param e - document event
+     * @param e - text change event
      */
     public void changedUpdate(DocumentEvent e)
       throws NotImplementedException
@@ -271,11 +279,13 @@
     }
 
     /**
-     * Given a point in the coordinate system of this object, return the
-     * 0-based index of the character at that point, or -1 if there is none.
+     * Get the index of the character at the given point, in component
+     * pixel co-ordinates.  If the point argument is invalid this
+     * method returns -1.
      *
-     * @param p the point to look at
-     * @return the character index, or -1
+     * @param p - a point in component pixel co-ordinates
+     *
+     * @return a character index, or -1
      */
     public int getIndexAtPoint(Point p)
       throws NotImplementedException
@@ -284,17 +294,14 @@
     }
 
     /**
-     * Determines the bounding box of the indexed character. Returns an empty
-     * rectangle if the index is out of bounds.  The bounds are returned in local coordinates. 
-     * If the index is invalid a null rectangle is returned. The screen coordinates returned are 
-     * "unscrolled coordinates" if the JTextComponent is contained in a JScrollPane in which 
-     * case the resulting rectangle should be composed with the parent coordinates. 
-     * Note: the JTextComponent must have a valid size (e.g. have been added to a parent 
-     * container whose ancestor container is a valid top-level window) for this method to 
-     * be able to return a meaningful (non-null) value.
+     * Calculate the bounding box of the character at the given index.
+     * The returned x and y co-ordinates are relative to this text
+     * component's top-left corner.  If the index is invalid this
+     * method returns null.
+     *
+     * @param index - the character index
      *
-     * @param index the 0-based character index
-     * @return the bounding box, may be empty or null.
+     * @return a character's bounding box, or null
      */
     public Rectangle getCharacterBounds(int index)
       throws NotImplementedException
@@ -303,9 +310,9 @@
     }
 
     /**
-     * Return the number of characters.
+     * Return the length of the text in this text component.
      *
-     * @return the character count
+     * @return a character length
      */
     public int getCharCount()
     {
@@ -313,10 +320,11 @@
     }
 
    /** 
-    * Returns the attributes of a character at an index, or null if the index
-    * is out of bounds.
+    * Gets the character attributes of the character at index. If
+    * the index is out of bounds, null is returned.
+    *
+    * @param index - index of the character
     *
-    * @param index the 0-based character index
     * @return the character's attributes
     */
     public AttributeSet getCharacterAttribute(int index)
@@ -326,12 +334,13 @@
     }
 
     /**
-     * Returns the section of text at the index, or null if the index or part
-     * is invalid.
+     * Gets the text located at index. null is returned if the index
+     * or part is invalid.
      *
-     * @param part {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
-     * @param index the 0-based character index
-     * @return the selection of text at that index, or null
+     * @param part - {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
+     * @param index - index of the part
+     * 
+     * @return the part of text at that index, or null
      */
     public String getAtIndex(int part, int index)
       throws NotImplementedException
@@ -340,12 +349,13 @@
     }
 
     /**
-     * Returns the section of text after the index, or null if the index or part
-     * is invalid.
+     * Gets the text located after index. null is returned if the index
+     * or part is invalid.
+     * 
+     * @param part - {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
+     * @param index - index after the part
      *
-     * @param part {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
-     * @param index the 0-based character index
-     * @return the selection of text after that index, or null
+     * @return the part of text after that index, or null
      */
     public String getAfterIndex(int part, int index)
       throws NotImplementedException
@@ -354,12 +364,13 @@
     }
 
     /**
-     * Returns the section of text before the index, or null if the index or part
-     * is invalid.
+     * Gets the text located before index. null is returned if the index
+     * or part is invalid.
+     * 
+     * @param part - {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
+     * @param index - index before the part
      *
-     * @param part {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
-     * @param index the 0-based character index
-     * @return the selection of text before that index, or null
+     * @return the part of text before that index, or null
      */
     public String getBeforeIndex(int part, int index)
       throws NotImplementedException
@@ -368,10 +379,10 @@
     }
     
     /**
-     * Get the number possible actions for this object, with the zeroth
-     * representing the default action.
+     * Returns the number of actions for this object. The zero-th
+     * object represents the default action.
      * 
-     * @return the 0-based number of actions
+     * @return the number of actions (0-based).
      */
     public int getAccessibleActionCount()
       throws NotImplementedException
@@ -380,11 +391,12 @@
     }
     
     /**
-     * Get a description for the specified action. Returns null if out of
-     * bounds.
+     * Returns the description of the i-th action. Null is returned if
+     * i is out of bounds.
      * 
-     * @param i  the action to describe, 0-based
-     * @return description of the action
+     * @param i - the action to get the description for
+     * 
+     * @return description of the i-th action
      */
     public String getAccessibleActionDescription(int i)
       throws NotImplementedException
@@ -394,10 +406,12 @@
     }
     
     /**
-     * Perform the specified action. Does nothing if out of bounds.
+     * Performs the i-th action. Nothing happens if i is 
+     * out of bounds.
+     *
+     * @param i - the action to perform
      *
-     * @param i the action to perform, 0-based
-     * @return true if the action was performed
+     * @return true if the action was performed successfully
      */
     public boolean doAccessibleAction(int i)
       throws NotImplementedException
@@ -406,9 +420,9 @@
     }
     
     /**
-     * Set the text contents to the given string.
+     * Sets the text contents.
      *
-     * @param s the new text
+     * @param s - the new text contents.
      */
     public void setTextContents(String s)
       throws NotImplementedException
@@ -417,10 +431,10 @@
     }
 
     /**
-     * Inserts the given string at the specified location.
+     * Inserts the text at the given index.
      *
-     * @param index the index for insertion
-     * @param s the new text
+     * @param index - the index to insert the new text at.
+     * @param s - the new text
      */
     public void insertTextAtIndex(int index, String s)
       throws NotImplementedException
@@ -429,10 +443,10 @@
     }
 
     /**
-     * Return the text between two points.
+     * Gets the text between two indexes.
      *
-     * @param start the start position, inclusive
-     * @param end the end position, exclusive
+     * @param start - the starting index (inclusive)
+     * @param end - the ending index (exclusive)
      */
     public String getTextRange(int start, int end)
     {
@@ -447,10 +461,10 @@
     }
 
     /**
-     * Delete the text between two points.
+     * Deletes the text between two indexes.
      *
-     * @param start the start position, inclusive
-     * @param end the end position, exclusive
+     * @param start - the starting index (inclusive)
+     * @param end - the ending index (exclusive)
      */
     public void delete(int start, int end)
     {
@@ -458,10 +472,11 @@
     }
 
     /**
-     * Cut the text between two points to the system clipboard.
+     * Cuts the text between two indexes. The text is put
+     * into the system clipboard.
      *
-     * @param start the start position, inclusive
-     * @param end the end position, exclusive
+     * @param start - the starting index (inclusive)
+     * @param end - the ending index (exclusive)
      */
     public void cut(int start, int end)
     {
@@ -470,9 +485,9 @@
     }
 
     /**
-     * Paste the text from the system clipboard at the given index.
+     * Pastes the text from the system clipboard to the given index.
      *
-     * @param start the start position
+     * @param start - the starting index
      */
     public void paste(int start)
     {
@@ -481,11 +496,12 @@
     }
 
     /**
-     * Replace the text between two points with the given string.
+     * Replaces the text between two indexes with the given text.
+     *
      *
-     * @param start the start position, inclusive
-     * @param end the end position, exclusive
-     * @param s the string to paste
+     * @param start - the starting index (inclusive)
+     * @param end - the ending index (exclusive)
+     * @param s - the text to paste
      */
     public void replaceText(int start, int end, String s)
     {
@@ -494,10 +510,10 @@
     }
 
     /**
-     * Select the text between two points.
+     * Selects the text between two indexes.
      *
-     * @param start the start position, inclusive
-     * @param end the end position, exclusive
+     * @param start - the starting index (inclusive)
+     * @param end - the ending index (exclusive)
      */
     public void selectText(int start, int end)
     {
@@ -505,11 +521,11 @@
     }
 
     /**
-     * Set the attributes of text between two points.
+     * Sets the attributes of all the text between two indexes.
      *
-     * @param start the start position, inclusive
-     * @param end the end position, exclusive
-     * @param s the new attribute set for the range
+     * @param start - the starting index (inclusive)
+     * @param end - the ending index (exclusive)
+     * @param s - the new attribute set for the text in the range
      */
     public void setAttributes(int start, int end, AttributeSet s)
       throws NotImplementedException



From MAILER-DAEMON Tue Jun 20 16:36:25 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FsmxV-0000Su-9y
	for mharc-commit-classpath@gnu.org; Tue, 20 Jun 2006 16:36:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FsmxU-0000Rh-AB
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 16:36:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FsmxT-0000Q6-1H
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 16:36:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FsmxS-0000Pt-N9
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 16:36:22 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fsn83-0000lo-NG
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 16:47:19 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FsmxM-0004lt-00
	for <commit-classpath@gnu.org>; Tue, 20 Jun 2006 16:36:16 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FsmxK-0004ll-UI
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 20:36:15 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FsmxK-0004ll-UI@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Tue, 20 Jun 2006 20:36:14 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/GtkCh...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jun 2006 20:36:24 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/20 20:36:14

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: GtkCheckboxPeer.java GtkLabelPeer.java 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_GtkLabelPeer.c 
	include        : gnu_java_awt_peer_gtk_GtkLabelPeer.h 

Log message:
	2006-06-20  Lillian Angel  <langel@redhat.com>
	
	        * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
	        (create): Added check to prevent Seg Fault. Should not
	        set the label if it is null.
	        * gnu/java/awt/peer/gtk/GtkLabelPeer.java
	        (setText): Changed to be a non-native function. Calls
	        setNativeText if the String parameter is non-null.
	        (setNativeText): Replaces old native setText function.
	        * include/gnu_java_awt_peer_gtk_GtkLabelPeer.h: Regenerated.
	        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
	        (Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText): Removed.
	        Replaced by Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setNativeText.
	        (Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setNativeText): Replaced
	        Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7885&r2=1.7886
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java?cvsroot=classpath&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkLabelPeer.java?cvsroot=classpath&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c?cvsroot=classpath&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h?cvsroot=classpath&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7885
retrieving revision 1.7886
diff -u -b -r1.7885 -r1.7886
--- ChangeLog	20 Jun 2006 18:24:13 -0000	1.7885
+++ ChangeLog	20 Jun 2006 20:36:13 -0000	1.7886
@@ -1,5 +1,21 @@
 2006-06-20  Lillian Angel  <langel@redhat.com>
 
+	* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
+	(create): Added check to prevent Seg Fault. Should not
+	set the label if it is null.
+	* gnu/java/awt/peer/gtk/GtkLabelPeer.java
+	(setText): Changed to be a non-native function. Calls
+	setNativeText if the String parameter is non-null.
+	(setNativeText): Replaces old native setText function.
+	* include/gnu_java_awt_peer_gtk_GtkLabelPeer.h: Regenerated.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
+	(Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText): Removed.
+	Replaced by Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setNativeText.
+	(Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setNativeText): Replaced
+	Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText.
+
+2006-06-20  Lillian Angel  <langel@redhat.com>
+
 	* javax/swing/text/JTextComponent.java
 	(AccessibleJTextComponent): Rewrote all javadocs
 	for this inner class.

Index: gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- gnu/java/awt/peer/gtk/GtkCheckboxPeer.java	22 Feb 2006 14:47:50 -0000	1.24
+++ gnu/java/awt/peer/gtk/GtkCheckboxPeer.java	20 Jun 2006 20:36:14 -0000	1.25
@@ -78,7 +78,10 @@
     create (old_group);
     currentState = checkbox.getState();
     gtkToggleButtonSetActive(currentState);
-    gtkButtonSetLabel (checkbox.getLabel ());
+    
+    String label = checkbox.getLabel();
+    if (label != null)
+      gtkButtonSetLabel(label);
   }
 
   /**

Index: gnu/java/awt/peer/gtk/GtkLabelPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkLabelPeer.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gnu/java/awt/peer/gtk/GtkLabelPeer.java	13 Feb 2006 18:57:03 -0000	1.25
+++ gnu/java/awt/peer/gtk/GtkLabelPeer.java	20 Jun 2006 20:36:14 -0000	1.26
@@ -56,7 +56,7 @@
 
   native void nativeSetAlignment (float alignment);
 
-  public native void setText(String text);
+  public native void setNativeText(String text);
   native void setNativeBounds (int x, int y, int width, int height);
 
   // Because this is a composite widget, we need to retrieve the
@@ -69,6 +69,12 @@
     create (label.getText (), getGtkAlignment (label.getAlignment ()));
   }
 
+  public void setText(String text)
+  {
+    if (text != null)
+      setNativeText(text);
+  }
+  
   public GtkLabelPeer (Label l)
   {
     super (l);

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c	12 Aug 2005 22:49:42 -0000	1.17
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c	20 Jun 2006 20:36:14 -0000	1.18
@@ -147,7 +147,7 @@
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText
+Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setNativeText
   (JNIEnv *env, jobject obj, jstring text)
 {
   const char *str;

Index: include/gnu_java_awt_peer_gtk_GtkLabelPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- include/gnu_java_awt_peer_gtk_GtkLabelPeer.h	30 Apr 2006 10:37:36 -0000	1.11
+++ include/gnu_java_awt_peer_gtk_GtkLabelPeer.h	20 Jun 2006 20:36:14 -0000	1.12
@@ -13,7 +13,7 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_create (JNIEnv *env, jobject, jstring, jfloat);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkWidgetModifyFont (JNIEnv *env, jobject, jstring, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_nativeSetAlignment (JNIEnv *env, jobject, jfloat);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText (JNIEnv *env, jobject, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setNativeText (JNIEnv *env, jobject, jstring);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setNativeBounds (JNIEnv *env, jobject, jint, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkWidgetGetPreferredDimensions (JNIEnv *env, jobject, jintArray);
 



From MAILER-DAEMON Tue Jun 20 17:31:43 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fsnp1-0006ex-5C
	for mharc-commit-classpath@gnu.org; Tue, 20 Jun 2006 17:31:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fsnoz-0006bp-Bm
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 17:31:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fsnoy-0006aB-By
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 17:31:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fsnoy-0006Zr-8Y
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 17:31:40 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FsnzZ-0004zz-SC
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 17:42:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fsnox-00078e-00
	for <commit-classpath@gnu.org>; Tue, 20 Jun 2006 17:31:39 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1Fsnov-00078R-Nu
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 21:31:39 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fsnov-00078R-Nu@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 20 Jun 2006 21:31:37 +0000
Subject: [commit-cp] classpath ChangeLog java/net/URL.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jun 2006 21:31:41 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/20 21:31:37

Modified files:
	.              : ChangeLog 
	java/net       : URL.java 

Log message:
		PR classpath/28095:
		* java/net/URL.java (URL): Throw MalformedURLException if a
		RuntimeException is caught.  Chain exceptions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7886&r2=1.7887
http://cvs.savannah.gnu.org/viewcvs/classpath/java/net/URL.java?cvsroot=classpath&r1=1.53&r2=1.54

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7886
retrieving revision 1.7887
diff -u -b -r1.7886 -r1.7887
--- ChangeLog	20 Jun 2006 20:36:13 -0000	1.7886
+++ ChangeLog	20 Jun 2006 21:31:36 -0000	1.7887
@@ -1,3 +1,9 @@
+2006-06-20  Tom Tromey  <tromey@redhat.com>
+
+	PR classpath/28095:
+	* java/net/URL.java (URL): Throw MalformedURLException if a
+	RuntimeException is caught.  Chain exceptions.
+
 2006-06-20  Lillian Angel  <langel@redhat.com>
 
 	* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java

Index: java/net/URL.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URL.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- java/net/URL.java	2 Mar 2006 00:25:21 -0000	1.53
+++ java/net/URL.java	20 Jun 2006 21:31:37 -0000	1.54
@@ -482,7 +482,17 @@
       }
     catch (URLParseError e)
       {
-	throw new MalformedURLException(e.getMessage());
+        MalformedURLException mue = new MalformedURLException(e.getMessage());
+        mue.initCause(e);
+	throw mue;
+      }
+    catch (RuntimeException e)
+      {
+        // This isn't documented, but the JDK also catches
+        // RuntimeExceptions here.
+        MalformedURLException mue = new MalformedURLException(e.getMessage());
+        mue.initCause(e);
+        throw mue;
       }
 
     if (hashAt >= 0)



From MAILER-DAEMON Tue Jun 20 17:46:47 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fso3b-0005ss-LU
	for mharc-commit-classpath@gnu.org; Tue, 20 Jun 2006 17:46:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fso3Z-0005rS-UE
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 17:46:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fso3Z-0005qu-49
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 17:46:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fso3Z-0005qr-0M
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 17:46:45 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FsoEA-0006Q5-Nm
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 17:57:42 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fso3T-0000Sc-00
	for <commit-classpath@gnu.org>; Tue, 20 Jun 2006 17:46:39 -0400
Received: from fitzsim by savannah.gnu.org with local (Exim 4.50)
	id 1Fso3S-0000SW-EE
	for commit-classpath@gnu.org; Tue, 20 Jun 2006 21:46:39 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fso3S-0000SW-EE@savannah.gnu.org>
From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Tue, 20 Jun 2006 21:46:38 +0000
Subject: [commit-cp] classpath ChangeLog native/plugin/Makefile.am
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jun 2006 21:46:46 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Thomas Fitzsimmons <fitzsim>	06/06/20 21:46:38

Modified files:
	.              : ChangeLog 
	native/plugin  : Makefile.am 

Log message:
	2006-06-20  Thomas Fitzsimmons  <fitzsim@redhat.com>
	
		* native/plugin/Makefile.am (libgcjwebplugin_la_CXXFLAGS): Define
		APPLETVIEWER_EXECUTABLE to gappletviewer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7887&r2=1.7888
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/Makefile.am?cvsroot=classpath&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7887
retrieving revision 1.7888
diff -u -b -r1.7887 -r1.7888
--- ChangeLog	20 Jun 2006 21:31:36 -0000	1.7887
+++ ChangeLog	20 Jun 2006 21:46:37 -0000	1.7888
@@ -1,3 +1,8 @@
+2006-06-20  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* native/plugin/Makefile.am (libgcjwebplugin_la_CXXFLAGS): Define
+	APPLETVIEWER_EXECUTABLE to gappletviewer.
+
 2006-06-20  Tom Tromey  <tromey@redhat.com>
 
 	PR classpath/28095:

Index: native/plugin/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/native/plugin/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- native/plugin/Makefile.am	8 Jun 2006 21:43:45 -0000	1.4
+++ native/plugin/Makefile.am	20 Jun 2006 21:46:38 -0000	1.5
@@ -3,7 +3,7 @@
 libgcjwebplugin_la_SOURCES = gcjwebplugin.cc
 
 libgcjwebplugin_la_CXXFLAGS = \
-	-Wall -DAPPLETVIEWER_EXECUTABLE="\"$(bindir)/appletviewer\"" \
+	-Wall -DAPPLETVIEWER_EXECUTABLE="\"$(bindir)/gappletviewer\"" \
 	$(MOZILLA_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
 
 libgcjwebplugin_la_LDFLAGS = -avoid-version \



From MAILER-DAEMON Wed Jun 21 04:06:35 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FsxjP-0007oL-FM
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 04:06:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FsxjM-0007o7-Te
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 04:06:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FsxjM-0007nH-3d
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 04:06:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FsxjL-0007nD-VH
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 04:06:32 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fsxu3-0006c2-Jq
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 04:17:35 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FsxjL-0003VW-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 04:06:31 -0400
Received: from gbenson by savannah.gnu.org with local (Exim 4.50)
	id 1FsxjJ-0003VQ-FX
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:06:30 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FsxjJ-0003VQ-FX@savannah.gnu.org>
From: Gary Benson <gbenson@redhat.com>
Date: Wed, 21 Jun 2006 08:06:29 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Cairo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 08:06:33 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Gary Benson <gbenson>	06/06/21 08:06:29

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 
	gnu/java/awt/peer/qt: QtGraphics.java 
	gnu/java/awt/java2d: AbstractGraphics2D.java 

Log message:
	2006-06-21  Gary Benson  <gbenson@redhat.com>
	
		* gnu/java/awt/peer/gtk/CairoGraphics2D.java: Add security check.
		* gnu/java/awt/peer/qt/QtGraphics.java: Likewise.
		* gnu/java/awt/java2d/AbstractGraphics2D.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7888&r2=1.7889
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/qt/QtGraphics.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java?cvsroot=classpath&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7888
retrieving revision 1.7889
diff -u -b -r1.7888 -r1.7889
--- ChangeLog	20 Jun 2006 21:46:37 -0000	1.7888
+++ ChangeLog	21 Jun 2006 08:06:28 -0000	1.7889
@@ -1,3 +1,9 @@
+2006-06-21  Gary Benson  <gbenson@redhat.com>
+
+	* gnu/java/awt/peer/gtk/CairoGraphics2D.java: Add security check.
+	* gnu/java/awt/peer/qt/QtGraphics.java: Likewise.
+	* gnu/java/awt/java2d/AbstractGraphics2D.java: Likewise.
+
 2006-06-20  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* native/plugin/Makefile.am (libgcjwebplugin_la_CXXFLAGS): Define

Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java	20 Jun 2006 13:57:51 -0000	1.27
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java	21 Jun 2006 08:06:28 -0000	1.28
@@ -41,6 +41,7 @@
 import gnu.java.awt.ClasspathToolkit;
 
 import java.awt.AlphaComposite;
+import java.awt.AWTPermission;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Composite;
@@ -886,6 +887,12 @@
       }
     else
       {
+        // FIXME: this check is only required "if this Graphics2D
+        // context is drawing to a Component on the display screen".
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null)
+          sm.checkPermission(new AWTPermission("readDisplayPixels"));
+
         // FIXME: implement general Composite support
         throw new java.lang.UnsupportedOperationException();
       }

Index: gnu/java/awt/peer/qt/QtGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtGraphics.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/java/awt/peer/qt/QtGraphics.java	23 Aug 2005 02:13:48 -0000	1.3
+++ gnu/java/awt/peer/qt/QtGraphics.java	21 Jun 2006 08:06:29 -0000	1.4
@@ -38,6 +38,7 @@
 package gnu.java.awt.peer.qt;
 
 import java.awt.AlphaComposite;
+import java.awt.AWTPermission;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Composite;
@@ -605,9 +606,17 @@
 	composite = comp;
       }
     else
+      {
+	// FIXME: this check is only required "if this Graphics2D
+	// context is drawing to a Component on the display screen".
+	SecurityManager sm = System.getSecurityManager();
+	if (sm != null)
+	  sm.checkPermission(new AWTPermission("readDisplayPixels"));
+
       throw new UnsupportedOperationException("We don't support custom"+
 					      " composites yet.");
   }
+  }
 
   public Composite getComposite()
   {

Index: gnu/java/awt/java2d/AbstractGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnu/java/awt/java2d/AbstractGraphics2D.java	9 Jun 2006 20:49:51 -0000	1.9
+++ gnu/java/awt/java2d/AbstractGraphics2D.java	21 Jun 2006 08:06:29 -0000	1.10
@@ -39,6 +39,7 @@
 
 import java.awt.AWTError;
 import java.awt.AlphaComposite;
+import java.awt.AWTPermission;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Composite;
@@ -539,6 +540,15 @@
    */
   public void setComposite(Composite comp)
   {
+    if (! (comp instanceof AlphaComposite))
+      {
+        // FIXME: this check is only required "if this Graphics2D
+        // context is drawing to a Component on the display screen".
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null)
+          sm.checkPermission(new AWTPermission("readDisplayPixels"));
+      }
+
     composite = comp;
     if (! (comp.equals(AlphaComposite.SrcOver)))
       isOptimized = false;



From MAILER-DAEMON Wed Jun 21 05:17:15 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fsypn-0001ni-7L
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 05:17:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fsypl-0001l4-Mq
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 05:17:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fsypk-0001jW-MD
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 05:17:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fsypk-0001jK-Ei
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 05:17:12 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fsz0T-0004d8-0W
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 05:28:17 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fsypj-0007j6-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 05:17:11 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fsypi-0007j0-PO
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:17:11 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fsypi-0007j0-PO@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 21 Jun 2006 09:17:10 +0000
Subject: [commit-cp] classpath/javax/swing/text GapContent.java Chan...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 09:17:14 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/21 09:17:10

Modified files:
	javax/swing/text: GapContent.java 
	.              : ChangeLog 

Log message:
	2006-06-21  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/text/GapContent.java
		(GapContentPosition.GapContentPosition): Replace
		Collections.binarySearch with call to local search() to make
		sure we find the first object that equals the searched object.
		(setPositionsInRange): Likewise.
		(adjustPositionsInRange): Likewise.
		(search): New helper method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/GapContent.java?cvsroot=classpath&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7889&r2=1.7890

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7889
retrieving revision 1.7890
diff -u -b -r1.7889 -r1.7890
--- ChangeLog	21 Jun 2006 08:06:28 -0000	1.7889
+++ ChangeLog	21 Jun 2006 09:17:09 -0000	1.7890
@@ -1,3 +1,13 @@
+2006-06-21  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/text/GapContent.java
+	(GapContentPosition.GapContentPosition): Replace
+	Collections.binarySearch with call to local search() to make
+	sure we find the first object that equals the searched object.
+	(setPositionsInRange): Likewise.
+	(adjustPositionsInRange): Likewise.
+	(search): New helper method.
+
 2006-06-21  Gary Benson  <gbenson@redhat.com>
 
 	* gnu/java/awt/peer/gtk/CairoGraphics2D.java: Add security check.



From MAILER-DAEMON Wed Jun 21 05:59:31 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FszUh-0001k4-03
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 05:59:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FszUf-0001jy-Tj
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 05:59:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FszUd-0001iv-Q2
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 05:59:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FszUd-0001ir-NR
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 05:59:27 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FszfM-0008Sf-F2
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 06:10:32 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FszUc-00037X-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 05:59:26 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FszUb-00037R-D2
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:59:26 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FszUb-00037R-D2@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 21 Jun 2006 09:59:25 +0000
Subject: [commit-cp] classpath/javax/swing UIManager.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 09:59:30 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/21 09:59:25

Modified files:
	javax/swing    : UIManager.java 
	.              : ChangeLog 

Log message:
	2006-06-21  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/UIManager.java
		(MultiplexUIDefaults): New inner class.
		(currentUIDefaults): Changed type to be MultiplexUIDefaults.
		(userUIDefaults): Changed name to be lookAndFeelDefaults.
		(<cinit>): Call setLookAndFeel(String) instead of trying to load
		directly. Print stacktrace if something goes wrong.
		(get): Delegate call to currentUIDefaults.
		(getDefaults): If currentUIDefaults is null, then lazily instantiate
		it.
		(getUI): Delegate call to currentUIDefaults.
		(put): Delegate call to currentUIDefaults.
		(setLookAndFeel): Initialize currentUIDefaults with
		MultiplexUIDefaults. Set lookAndFeelDefaults.
		(setLookAndFeel): Use current thread's context classloader for
		loading the L&F.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/UIManager.java?cvsroot=classpath&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7890&r2=1.7891

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7890
retrieving revision 1.7891
diff -u -b -r1.7890 -r1.7891
--- ChangeLog	21 Jun 2006 09:17:09 -0000	1.7890
+++ ChangeLog	21 Jun 2006 09:59:24 -0000	1.7891
@@ -1,5 +1,23 @@
 2006-06-21  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/UIManager.java
+	(MultiplexUIDefaults): New inner class.
+	(currentUIDefaults): Changed type to be MultiplexUIDefaults.
+	(userUIDefaults): Changed name to be lookAndFeelDefaults.
+	(<cinit>): Call setLookAndFeel(String) instead of trying to load
+	directly. Print stacktrace if something goes wrong.
+	(get): Delegate call to currentUIDefaults.
+	(getDefaults): If currentUIDefaults is null, then lazily instantiate
+	it.
+	(getUI): Delegate call to currentUIDefaults.
+	(put): Delegate call to currentUIDefaults.
+	(setLookAndFeel): Initialize currentUIDefaults with
+	MultiplexUIDefaults. Set lookAndFeelDefaults.
+	(setLookAndFeel): Use current thread's context classloader for
+	loading the L&F.
+
+2006-06-21  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/text/GapContent.java
 	(GapContentPosition.GapContentPosition): Replace
 	Collections.binarySearch with call to local search() to make



From MAILER-DAEMON Wed Jun 21 07:38:58 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft12w-0003Bw-9O
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 07:38:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft12u-0003A7-Di
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 07:38:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft12r-00039G-P7
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 07:38:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft12r-00039D-Hz
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 07:38:53 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft1Db-0004qG-1Q
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 07:49:59 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft12p-0003As-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 07:38:51 -0400
Received: from jfrijters by savannah.gnu.org with local (Exim 4.50)
	id 1Ft12o-0003Ai-Ry
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 11:38:51 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft12o-0003Ai-Ry@savannah.gnu.org>
From: Jeroen Frijters <jeroen@sumatra.nl>
Date: Wed, 21 Jun 2006 11:38:50 +0000
Subject: [commit-cp] classpath ChangeLog java/util/Collections.java
	[generics-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 11:38:57 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics-branch
Changes by:	Jeroen Frijters <jfrijters>	06/06/21 11:38:48

Modified files:
	.              : ChangeLog 
	java/util      : Collections.java 

Log message:
	2006-06-21  Jeroen Frijters  <jeroen@frijters.net>
	
	        * java/util/Collections (entrySet): Fixed compile error.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.275&r2=1.2386.2.276
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/Collections.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.28.2.22&r2=1.28.2.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.275
retrieving revision 1.2386.2.276
diff -u -b -r1.2386.2.275 -r1.2386.2.276
--- ChangeLog	17 Jun 2006 15:42:59 -0000	1.2386.2.275
+++ ChangeLog	21 Jun 2006 11:38:46 -0000	1.2386.2.276
@@ -1,3 +1,7 @@
+2006-06-21  Jeroen Frijters  <jeroen@frijters.net>
+
+	* java/util/Collections (entrySet): Fixed compile error.
+
 2006-06-17  Tom Tromey  <tromey@redhat.com>
 
 	* lib/gen-classlist.sh.in: Search all top-level directories, not

Index: java/util/Collections.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Collections.java,v
retrieving revision 1.28.2.22
retrieving revision 1.28.2.23
diff -u -b -r1.28.2.22 -r1.28.2.23
--- java/util/Collections.java	11 Jun 2006 18:23:24 -0000	1.28.2.22
+++ java/util/Collections.java	21 Jun 2006 11:38:48 -0000	1.28.2.23
@@ -6619,7 +6619,7 @@
       if (entries == null)
 	{
 	  Class<Map.Entry<K,V>> klass =
-	    (Class<Map.Entry<K,V>>) Map.Entry.class;
+	    (Class<Map.Entry<K,V>>) (Class) Map.Entry.class;
 	  entries = new CheckedEntrySet<Map.Entry<K,V>,K,V>(m.entrySet(),
 							    klass,
 							    keyType,



From MAILER-DAEMON Wed Jun 21 08:29:49 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft1q9-0007Cn-Gw
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 08:29:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft1q8-0007Cc-Eh
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:29:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft1q6-0007CA-VL
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:29:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft1q6-0007C7-Rq
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:29:46 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft20r-0000fH-7A
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:40:53 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft1q5-0006UU-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 08:29:45 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Ft1q5-0006UQ-Go
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:29:45 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft1q5-0006UQ-Go@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 21 Jun 2006 12:29:45 +0000
Subject: [commit-cp] classpath/javax/swing AbstractButton.java Chang...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 12:29:48 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/21 12:29:45

Modified files:
	javax/swing    : AbstractButton.java 
	.              : ChangeLog 

Log message:
	2006-06-21  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/AbstractButton.java
		(init): Call setText() instead of setting the property directly,
		so that listeners (especially in the UI) get notified.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/AbstractButton.java?cvsroot=classpath&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7891&r2=1.7892

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7891
retrieving revision 1.7892
diff -u -b -r1.7891 -r1.7892
--- ChangeLog	21 Jun 2006 09:59:24 -0000	1.7891
+++ ChangeLog	21 Jun 2006 12:29:44 -0000	1.7892
@@ -1,5 +1,11 @@
 2006-06-21  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/AbstractButton.java
+	(init): Call setText() instead of setting the property directly,
+	so that listeners (especially in the UI) get notified.
+
+2006-06-21  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/UIManager.java
 	(MultiplexUIDefaults): New inner class.
 	(currentUIDefaults): Changed type to be MultiplexUIDefaults.



From MAILER-DAEMON Wed Jun 21 08:34:51 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft1v0-0001mg-Ve
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 08:34:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft1v0-0001mV-3b
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:34:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft1uz-0001m3-Jq
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:34:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft1uz-0001lv-FX
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:34:49 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft25j-00010e-QJ
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:45:55 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft1uy-000724-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 08:34:48 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Ft1ux-00071q-7J
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:34:48 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft1ux-00071q-7J@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 21 Jun 2006 12:34:47 +0000
Subject: [commit-cp] classpath/javax/swing JComponent.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 12:34:50 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/21 12:34:47

Modified files:
	javax/swing    : JComponent.java 
	.              : ChangeLog 

Log message:
	2006-06-21  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/JComponent.java
		(paintChildrenWithOverlap): Determine opaque property by
		calling the corresponding Component method, without requiring
		a JComponent.
		(paintChildrenOptimized): Removed old unneeded code.
		(paintImmediately): Use JComponent's convertRectangleToAncestor()
		method instead of SwingUtilities.convertRectangle(). This is
		more efficient.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.128&r2=1.129
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7892&r2=1.7893

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7892
retrieving revision 1.7893
diff -u -b -r1.7892 -r1.7893
--- ChangeLog	21 Jun 2006 12:29:44 -0000	1.7892
+++ ChangeLog	21 Jun 2006 12:34:46 -0000	1.7893
@@ -1,5 +1,16 @@
 2006-06-21  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/JComponent.java
+	(paintChildrenWithOverlap): Determine opaque property by
+	calling the corresponding Component method, without requiring
+	a JComponent.
+	(paintChildrenOptimized): Removed old unneeded code.
+	(paintImmediately): Use JComponent's convertRectangleToAncestor()
+	method instead of SwingUtilities.convertRectangle(). This is
+	more efficient.
+
+2006-06-21  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/AbstractButton.java
 	(init): Call setText() instead of setting the property directly,
 	so that listeners (especially in the UI) get notified.



From MAILER-DAEMON Wed Jun 21 08:39:28 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft1zT-0003n7-V0
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 08:39:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft1zR-0003mG-RT
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:39:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft1zQ-0003lw-Tl
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:39:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft1zQ-0003ln-Kh
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:39:24 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft2AB-0001NE-2A
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:50:31 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft1zQ-00081O-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 08:39:24 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Ft1zO-00081H-VD
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:39:23 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft1zO-00081H-VD@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 21 Jun 2006 12:39:22 +0000
Subject: [commit-cp] classpath/javax/swing JSplitPane.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 12:39:26 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/21 12:39:22

Modified files:
	javax/swing    : JSplitPane.java 
	.              : ChangeLog 

Log message:
	2006-06-21  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/JSplitPane.java
		(setDividerLocation): Substract divider size when computing
		the absolute size.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JSplitPane.java?cvsroot=classpath&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7893&r2=1.7894

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7893
retrieving revision 1.7894
diff -u -b -r1.7893 -r1.7894
--- ChangeLog	21 Jun 2006 12:34:46 -0000	1.7893
+++ ChangeLog	21 Jun 2006 12:39:22 -0000	1.7894
@@ -1,5 +1,11 @@
 2006-06-21  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/JSplitPane.java
+	(setDividerLocation): Substract divider size when computing
+	the absolute size.
+
+2006-06-21  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/JComponent.java
 	(paintChildrenWithOverlap): Determine opaque property by
 	calling the corresponding Component method, without requiring



From MAILER-DAEMON Wed Jun 21 08:43:27 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft23L-0005HL-1l
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 08:43:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft23K-0005H3-0k
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:43:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft23I-0005GL-VN
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:43:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft23I-0005GB-JR
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:43:24 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft2E3-0001jb-0s
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:54:31 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft23H-0000EY-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 08:43:23 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Ft23G-0000ER-KM
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:43:23 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft23G-0000ER-KM@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 21 Jun 2006 12:43:22 +0000
Subject: [commit-cp] classpath/javax/swing SizeSequence.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 12:43:26 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/21 12:43:22

Modified files:
	javax/swing    : SizeSequence.java 
	.              : ChangeLog 

Log message:
	2006-06-21  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/SizeSequence.java
		(SizeSequence): Initialize array with correct number of entries.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/SizeSequence.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7894&r2=1.7895

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7894
retrieving revision 1.7895
diff -u -b -r1.7894 -r1.7895
--- ChangeLog	21 Jun 2006 12:39:22 -0000	1.7894
+++ ChangeLog	21 Jun 2006 12:43:22 -0000	1.7895
@@ -1,5 +1,10 @@
 2006-06-21  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/SizeSequence.java
+	(SizeSequence): Initialize array with correct number of entries.
+
+2006-06-21  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/JSplitPane.java
 	(setDividerLocation): Substract divider size when computing
 	the absolute size.



From MAILER-DAEMON Wed Jun 21 08:57:11 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft2Gd-0002LX-2k
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 08:57:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft2Gb-0002Ke-Lz
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:57:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft2Ga-0002JF-N0
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:57:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft2Ga-0002J8-Jk
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:57:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft2RL-0002qT-2v
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:08:15 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft2GZ-0000yw-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 08:57:07 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Ft2GY-0000yq-Vk
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:57:07 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft2GY-0000yq-Vk@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 21 Jun 2006 12:57:06 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/event/KeyEvent.jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 12:57:09 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/21 12:57:06

Modified files:
	.              : ChangeLog 
	java/awt/event : KeyEvent.java 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_GtkWindowPeer.c 

Log message:
	2006-06-18  Sven de Marothy  <sven@physto.se>
	
		* java/awt/event/KeyEvent.java:
		(VK_WINDOWS, VK_CONTEXT_MENU, VK_BEGIN): Add new keysym fields.
		*  natve/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
		Implement WINDOWS, ALT_GR and CONTEXT_MENU keysyms.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7864&r2=1.7865
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/event/KeyEvent.java?cvsroot=classpath&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c?cvsroot=classpath&r1=1.66&r2=1.67

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7864
retrieving revision 1.7865
diff -u -b -r1.7864 -r1.7865
--- ChangeLog	18 Jun 2006 02:43:55 -0000	1.7864
+++ ChangeLog	18 Jun 2006 03:45:27 -0000	1.7865
@@ -1,3 +1,10 @@
+2006-06-18  Sven de Marothy  <sven@physto.se>
+
+	* java/awt/event/KeyEvent.java:
+	(VK_WINDOWS, VK_CONTEXT_MENU, VK_BEGIN): Add new keysym fields.
+	*  natve/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
+	Implement WINDOWS, ALT_GR and CONTEXT_MENU keysyms.
+
 2006-06-18  Raif S. Naffah  <raif@swiftdsl.com.au>
 
 	* gnu/java/security/util/Prime2.java: Removed.





From MAILER-DAEMON Wed Jun 21 08:57:11 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft2Gd-0002Lp-74
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 08:57:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft2Gb-0002Kz-V3
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:57:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft2Gb-0002KQ-9v
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:57:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft2Gb-0002KB-4n
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 08:57:09 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft2RL-0002qd-Ib
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:08:15 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft2Ga-0000z6-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 08:57:08 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Ft2Ga-0000z2-16
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:57:08 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft2Ga-0000z2-16@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 21 Jun 2006 12:57:08 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/basic BasicTextUI.ja...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 12:57:10 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/21 12:57:06

Modified files:
	javax/swing/plaf/basic: BasicTextUI.java BasicTextFieldUI.java 
	                        SharedUIDefaults.java 
	.              : ChangeLog 

Log message:
	2006-06-21  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/plaf/basic/BasicTextUI.java
		(PropertyChangeHandler.propertyChange): Handle document listener
		update here.
		(background): Removed unneeded fields.
		(inactiveBackground): Remove unneeded fields.
		(installUI): Install the document listener. Slightly changed
		order of operations. Don't trigger modelChanged().
		(installDefaults): Only install properties when the
		current properties are null or instances of UIResource.
		(installListeners): Removed unnecessary listener installs.
		(installDocumentListeners): Removed unneeded method.
		(uninstallListeners): Removed unnecessary listener uninstalls.
		(modelChanged): Removed call to installDocumentListeners().	
		* javax/swing/plaf/basic/BasicTextFieldUI.java
		(propertyChange): Update the colors by fetching them from
		SharedUIDefaults. Fixed conditions.
		* javax/swing/plaf/basic/SharedUIDefaults.java
		(getColor): New method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTextUI.java?cvsroot=classpath&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTextFieldUI.java?cvsroot=classpath&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/SharedUIDefaults.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7895&r2=1.7896

Patches:



Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7895
retrieving revision 1.7896
diff -u -b -r1.7895 -r1.7896
--- ChangeLog	21 Jun 2006 12:43:22 -0000	1.7895
+++ ChangeLog	21 Jun 2006 12:57:05 -0000	1.7896
@@ -1,5 +1,26 @@
 2006-06-21  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/plaf/basic/BasicTextUI.java
+	(PropertyChangeHandler.propertyChange): Handle document listener
+	update here.
+	(background): Removed unneeded fields.
+	(inactiveBackground): Remove unneeded fields.
+	(installUI): Install the document listener. Slightly changed
+	order of operations. Don't trigger modelChanged().
+	(installDefaults): Only install properties when the
+	current properties are null or instances of UIResource.
+	(installListeners): Removed unnecessary listener installs.
+	(installDocumentListeners): Removed unneeded method.
+	(uninstallListeners): Removed unnecessary listener uninstalls.
+	(modelChanged): Removed call to installDocumentListeners().	
+	* javax/swing/plaf/basic/BasicTextFieldUI.java
+	(propertyChange): Update the colors by fetching them from
+	SharedUIDefaults. Fixed conditions.
+	* javax/swing/plaf/basic/SharedUIDefaults.java
+	(getColor): New method.
+
+2006-06-21  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/SizeSequence.java
 	(SizeSequence): Initialize array with correct number of entries.
 



From MAILER-DAEMON Wed Jun 21 09:13:46 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft2Wg-0000D0-LF
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 09:13:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft2We-0000Ci-Jg
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:13:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft2Wd-0000CV-US
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:13:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft2Wd-0000CS-OY
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:13:43 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft2hO-0004fc-B6
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:24:50 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft2Wc-0001ip-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 09:13:42 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Ft2Wb-0001ik-R2
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 13:13:42 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft2Wb-0001ik-R2@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 21 Jun 2006 13:13:42 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 13:13:44 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/21 13:13:40

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicButtonListener.java 
	                        BasicButtonUI.java 
	                        BasicGraphicsUtils.java 
	                        BasicMenuItemUI.java BasicMenuUI.java 

Log message:
	2006-06-21  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/plaf/basic/BasicButtonListener.java
		(propertyChange): Create a TextLayout and store it in the button
		when the 'text' property changes.
		* javax/swing/plaf/basic/BasicButtonUI.java
		(paintText): Call BasicGraphicsUtils utility method for
		drawing strings, instead of Graphics.drawString().
		* javax/swing/plaf/basic/BasicGraphicsUtils.java
		(CACHE_TEXT_LAYOUT): New constant field. Used as a key for storing
		cached text layouts as client properties in JComponents.
		(drawString(JComponent,Graphics,String,int,int)): New helper method.
		(drawStringUnderlineCharAt): New helper method.
		* javax/swing/plaf/basic/BasicMenuItemUI.java
		(PropertyChangeHandler.propertyChange): Update cached text layout
		when 'text' property changes. Use equals() instead of == for
		string comparison.
		(paintText): Use new BasicGraphicsUtils methods for painting
		the cached text layout.
		(installListeners): Call super.installListeners() and remove
		the unneeded listener installs.
		(uninstallListeners): Call super.uninstallListeners() and remove
		the unneeded listener uninstalls.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7896&r2=1.7897
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicButtonListener.java?cvsroot=classpath&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicButtonUI.java?cvsroot=classpath&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java?cvsroot=classpath&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java?cvsroot=classpath&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicMenuUI.java?cvsroot=classpath&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7896
retrieving revision 1.7897
diff -u -b -r1.7896 -r1.7897
--- ChangeLog	21 Jun 2006 12:57:05 -0000	1.7896
+++ ChangeLog	21 Jun 2006 13:13:39 -0000	1.7897
@@ -1,5 +1,29 @@
 2006-06-21  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/plaf/basic/BasicButtonListener.java
+	(propertyChange): Create a TextLayout and store it in the button
+	when the 'text' property changes.
+	* javax/swing/plaf/basic/BasicButtonUI.java
+	(paintText): Call BasicGraphicsUtils utility method for
+	drawing strings, instead of Graphics.drawString().
+	* javax/swing/plaf/basic/BasicGraphicsUtils.java
+	(CACHE_TEXT_LAYOUT): New constant field. Used as a key for storing
+	cached text layouts as client properties in JComponents.
+	(drawString(JComponent,Graphics,String,int,int)): New helper method.
+	(drawStringUnderlineCharAt): New helper method.
+	* javax/swing/plaf/basic/BasicMenuItemUI.java
+	(PropertyChangeHandler.propertyChange): Update cached text layout
+	when 'text' property changes. Use equals() instead of == for
+	string comparison.
+	(paintText): Use new BasicGraphicsUtils methods for painting
+	the cached text layout.
+	(installListeners): Call super.installListeners() and remove
+	the unneeded listener installs.
+	(uninstallListeners): Call super.uninstallListeners() and remove
+	the unneeded listener uninstalls.
+
+2006-06-21  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/plaf/basic/BasicTextUI.java
 	(PropertyChangeHandler.propertyChange): Handle document listener
 	update here.

Index: javax/swing/plaf/basic/BasicButtonListener.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicButtonListener.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- javax/swing/plaf/basic/BasicButtonListener.java	4 May 2006 14:45:50 -0000	1.13
+++ javax/swing/plaf/basic/BasicButtonListener.java	21 Jun 2006 13:13:40 -0000	1.14
@@ -41,10 +41,12 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
+import java.awt.font.FontRenderContext;
+import java.awt.font.TextLayout;
+import java.awt.geom.AffineTransform;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
@@ -66,7 +68,21 @@
   
   public void propertyChange(PropertyChangeEvent e)
   {
-    // TODO: What should be done here, if anything?
+    // Store the TextLayout for this in a client property for speed-up
+    // painting of the label.
+    String property = e.getPropertyName();
+    if (property.equals(AbstractButton.TEXT_CHANGED_PROPERTY)
+        || property.equals("font"))
+      {
+        AbstractButton b = (AbstractButton) e.getSource();
+        String text = b.getText();
+        if (text == null)
+          text = "";
+        FontRenderContext frc = new FontRenderContext(new AffineTransform(),
+                                                      false, false);
+        TextLayout layout = new TextLayout(text, b.getFont(), frc);
+        b.putClientProperty(BasicGraphicsUtils.CACHED_TEXT_LAYOUT, layout);
+      }
   }
   
   protected void checkOpacity(AbstractButton b) 

Index: javax/swing/plaf/basic/BasicButtonUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicButtonUI.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- javax/swing/plaf/basic/BasicButtonUI.java	1 Jun 2006 05:17:02 -0000	1.38
+++ javax/swing/plaf/basic/BasicButtonUI.java	21 Jun 2006 13:13:40 -0000	1.39
@@ -442,13 +442,17 @@
     if (b.isEnabled())
       {
         g.setColor(b.getForeground());
-        g.drawString(text, textRect.x, textRect.y + fm.getAscent());
+        // FIXME: Underline mnemonic.
+        BasicGraphicsUtils.drawString(b, g, text, -1, textRect.x,
+                                      textRect.y + fm.getAscent());
       }
     else
       {
         String prefix = getPropertyPrefix();
         g.setColor(UIManager.getColor(prefix + "disabledText"));
-        g.drawString(text, textRect.x, textRect.y + fm.getAscent());
+        // FIXME: Underline mnemonic.
+        BasicGraphicsUtils.drawString(b, g, text, -1, textRect.x,
+                                      textRect.y + fm.getAscent());
       }
   } 
 }

Index: javax/swing/plaf/basic/BasicGraphicsUtils.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- javax/swing/plaf/basic/BasicGraphicsUtils.java	18 Oct 2005 22:10:32 -0000	1.17
+++ javax/swing/plaf/basic/BasicGraphicsUtils.java	21 Jun 2006 13:13:40 -0000	1.18
@@ -37,6 +37,8 @@
 
 package javax.swing.plaf.basic;
 
+import gnu.classpath.SystemProperties;
+
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
@@ -65,6 +67,14 @@
 public class BasicGraphicsUtils
 {
   /**
+   * Used as a key for a client property to store cached TextLayouts in. This
+   * is used for speed-up drawing of text in
+   * {@link #drawString(Graphics, String, int, int, int)}.
+   */
+  static final String CACHED_TEXT_LAYOUT =
+    "BasicGraphicsUtils.cachedTextLayout";
+
+  /**
    * Constructor. It is utterly unclear why this class should
    * be constructable, but this is what the API specification
    * says.
@@ -536,6 +546,170 @@
     g2.fill(underline);
   }
 
+  /**
+   * Draws a string on the specified component.
+   *
+   * @param c the component
+   * @param g the Graphics context
+   * @param text the string
+   * @param underlinedChar the character to be underlined
+   * @param x the X location
+   * @param y the Y location
+   */
+  static void drawString(JComponent c, Graphics g, String text,
+                                int underlinedChar, int x, int y)
+  {
+    int index = -1;
+
+    /* It is intentional that lower case is used. In some languages,
+     * the set of lowercase characters is larger than the set of
+     * uppercase ones. Therefore, it is good practice to use lowercase
+     * for such comparisons (which really means that the author of this
+     * code can vaguely remember having read some Unicode techreport
+     * with this recommendation, but is too lazy to look for the URL).
+     */
+    if ((underlinedChar >= 0) || (underlinedChar <= 0xffff))
+      index = text.toLowerCase().indexOf(
+        Character.toLowerCase((char) underlinedChar));
+
+    drawStringUnderlineCharAt(c, g, text, index, x, y);
+  }
+
+
+  /**
+   * Draws a String at the given location, underlining the character
+   * at the specified index. Drawing is performed in the current color
+   * and font of <code>g</code>.
+   *
+   * <p><img src="doc-files/BasicGraphicsUtils-5.png" width="500"
+   * height="100" alt="[An illustration showing how to use the
+   * method]" />
+   *
+   * This is an accelerated version of the method with the same name. It
+   * uses a pre-laid out TextLayout stored in a client property.
+   *
+   * @param c the component that is drawn
+   * @param g the graphics into which the String is drawn.
+   *
+   * @param text the String to draw.
+   *
+   * @param underlinedIndex the index of the underlined character in
+   *        <code>text</code>.  If <code>underlinedIndex</code> falls
+   *        outside the range <code>[0, text.length() - 1]</code>, the
+   *        text will be drawn without underlining anything.
+   *        
+   * @param x the x coordinate of the text, as it would be passed to
+   *        {@link java.awt.Graphics#drawString(java.lang.String,
+   *        int, int)}.
+   *
+   * @param y the y coordinate of the text, as it would be passed to
+   *        {@link java.awt.Graphics#drawString(java.lang.String,
+   *        int, int)}.
+   */
+  static void drawStringUnderlineCharAt(JComponent c, Graphics g, String text,
+                                        int underlinedIndex,
+                                        int x, int y)
+  {
+    Graphics2D g2;
+    Rectangle2D.Double underline;
+    FontRenderContext frc;
+    FontMetrics fmet;
+    LineMetrics lineMetrics;
+    Font font;
+    TextLayout layout;
+    double underlineX1, underlineX2;
+    boolean drawUnderline;
+    int textLength;
+
+    textLength = text.length();
+    if (textLength == 0)
+      return;
+
+    drawUnderline = (underlinedIndex >= 0) && (underlinedIndex < textLength);
+
+    // FIXME: unfortunately pango and cairo can't agree on metrics
+    // so for the time being we continue to *not* use TextLayouts.
+    if (!(g instanceof Graphics2D)
+       || SystemProperties.getProperty("gnu.javax.swing.noGraphics2D") != null)
+    {
+      /* Fall-back. This is likely to produce garbage for any text
+       * containing right-to-left (Hebrew or Arabic) characters, even
+       * if the underlined character is left-to-right.
+       */
+      g.drawString(text, x, y);
+      if (drawUnderline)
+      {
+        fmet = g.getFontMetrics();
+        g.fillRect(
+          /* x */ x + fmet.stringWidth(text.substring(0, underlinedIndex)),
+          /* y */ y + fmet.getDescent() - 1,
+          /* width */ fmet.charWidth(text.charAt(underlinedIndex)),
+          /* height */ 1);
+      }
+
+      return;
+    }
+
+    g2 = (Graphics2D) g;
+    font = g2.getFont();
+    frc = g2.getFontRenderContext();
+    lineMetrics = font.getLineMetrics(text, frc);
+    layout = (TextLayout) c.getClientProperty(CACHED_TEXT_LAYOUT);
+    if (layout == null)
+      {
+        layout = new TextLayout(text, font, frc);
+        System.err.println("Unable to use cached TextLayout for: " + text);
+      }
+
+    /* Draw the text. */
+    layout.draw(g2, x, y);
+    if (!drawUnderline)
+      return;
+
+    underlineX1 = x + layout.getLogicalHighlightShape(
+     underlinedIndex, underlinedIndex).getBounds2D().getX();
+    underlineX2 = x + layout.getLogicalHighlightShape(
+     underlinedIndex + 1, underlinedIndex + 1).getBounds2D().getX();
+
+    underline = new Rectangle2D.Double();
+    if (underlineX1 < underlineX2)
+    {
+      underline.x = underlineX1;
+      underline.width = underlineX2 - underlineX1;
+    }
+    else
+    {
+      underline.x = underlineX2;
+      underline.width = underlineX1 - underlineX2;
+    }
+
+    
+    underline.height = lineMetrics.getUnderlineThickness();
+    underline.y = lineMetrics.getUnderlineOffset();
+    if (underline.y == 0)
+    {
+      /* Some fonts do not specify an underline offset, although they
+       * actually should do so. In that case, the result of calling
+       * lineMetrics.getUnderlineOffset() will be zero. Since it would
+       * look very ugly if the underline was be positioned immediately
+       * below the baseline, we check for this and move the underline
+       * below the descent, as shown in the following ASCII picture:
+       *
+       *   #####       ##### #
+       *  #     #     #     #
+       *  #     #     #     #
+       *  #     #     #     #
+       *   #####       ######        ---- baseline (0)
+       *                    #
+       *                    #
+       * ------------------###----------- lineMetrics.getDescent()
+       */
+      underline.y = lineMetrics.getDescent();
+    }
+
+    underline.y += y;
+    g2.fill(underline);
+  }
 
   /**
    * Draws a rectangle, simulating a dotted stroke by painting only

Index: javax/swing/plaf/basic/BasicMenuItemUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- javax/swing/plaf/basic/BasicMenuItemUI.java	13 Jun 2006 09:28:57 -0000	1.47
+++ javax/swing/plaf/basic/BasicMenuItemUI.java	21 Jun 2006 13:13:40 -0000	1.48
@@ -52,11 +52,15 @@
 import java.awt.event.ItemListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.awt.font.FontRenderContext;
+import java.awt.font.TextLayout;
+import java.awt.geom.AffineTransform;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 
 import javax.swing.AbstractAction;
+import javax.swing.AbstractButton;
 import javax.swing.ActionMap;
 import javax.swing.ButtonModel;
 import javax.swing.Icon;
@@ -237,7 +241,8 @@
      */
     public void propertyChange(PropertyChangeEvent e)
     {
-      if (e.getPropertyName() == "accelerator")
+      String property = e.getPropertyName();
+      if (property.equals("accelerator"))
         {
           InputMap map = SwingUtilities.getUIInputMap(menuItem, 
               JComponent.WHEN_IN_FOCUSED_WINDOW);
@@ -250,6 +255,19 @@
           if (accelerator != null)
             map.put(accelerator, "doClick");
         }
+      // TextLayout caching for speed-up drawing of text.
+      else if (property.equals(AbstractButton.TEXT_CHANGED_PROPERTY)
+          || property.equals("font"))
+        {
+          AbstractButton b = (AbstractButton) e.getSource();
+          String text = b.getText();
+          if (text == null)
+            text = "";
+          FontRenderContext frc = new FontRenderContext(new AffineTransform(),
+                                                        false, false);
+          TextLayout layout = new TextLayout(text, b.getFont(), frc);
+          b.putClientProperty(BasicGraphicsUtils.CACHED_TEXT_LAYOUT, layout);
+        }
     }
   }
   
@@ -833,12 +851,13 @@
         int mnemonicIndex = menuItem.getDisplayedMnemonicIndex();
 
         if (mnemonicIndex != -1)
-          BasicGraphicsUtils.drawStringUnderlineCharAt(g, text, mnemonicIndex,
+          BasicGraphicsUtils.drawStringUnderlineCharAt(menuItem, g, text,
+                                                       mnemonicIndex,
                                                        textRect.x,
                                                        textRect.y
                                                            + fm.getAscent());
         else
-          BasicGraphicsUtils.drawString(g, text, 0, textRect.x,
+          BasicGraphicsUtils.drawString(menuItem, g, text, 0, textRect.x,
                                         textRect.y + fm.getAscent());
       }
   }

Index: javax/swing/plaf/basic/BasicMenuUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicMenuUI.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- javax/swing/plaf/basic/BasicMenuUI.java	17 Apr 2006 07:41:05 -0000	1.23
+++ javax/swing/plaf/basic/BasicMenuUI.java	21 Jun 2006 13:13:40 -0000	1.24
@@ -230,10 +230,8 @@
    */
   protected void installListeners()
   {
-    ((JMenu) menuItem).addMouseListener(mouseInputListener);
-    ((JMenu) menuItem).addMouseMotionListener(mouseInputListener);
+    super.installListeners();
     ((JMenu) menuItem).addMenuListener(menuListener);
-    ((JMenu) menuItem).addMenuDragMouseListener(menuDragMouseListener);
   }
 
   protected void setupPostTimer(JMenu menu)
@@ -276,9 +274,8 @@
    */
   protected void uninstallListeners()
   {
-    ((JMenu) menuItem).removeMouseListener(mouseInputListener);
+    super.uninstallListeners();
     ((JMenu) menuItem).removeMenuListener(menuListener);
-    ((JMenu) menuItem).removePropertyChangeListener(propertyChangeListener);
   }
 
   /**



From MAILER-DAEMON Wed Jun 21 09:23:13 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft2fp-00032y-EB
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 09:23:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft2fn-00031V-3O
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:23:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft2fl-00030n-E8
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:23:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft2fl-00030h-8P
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:23:09 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft2qW-0005h1-51
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:34:16 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft2fk-0002DJ-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 09:23:08 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Ft2fj-0002DE-SY
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 13:23:08 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft2fj-0002DE-SY@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 21 Jun 2006 13:23:07 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/metal MetalUtils.jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 13:23:11 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/21 13:23:07

Modified files:
	javax/swing/plaf/metal: MetalUtils.java 
	.              : ChangeLog 

Log message:
	2006-06-21  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/plaf/metal/MetalUtils.java
		(paintHorizontalGradient): Use paintHorizontalGradient2D when
		Graphics2D is available. Use fillRect instead of drawLine, this
		is much faster.
		(paintVerticalGradient): Use paintHorizontalGradient2D when
		Graphics2D is available. Use fillRect instead of drawLine, this
		is much faster.
		(paintHorizontalGradient2D): New method. Paints gradient
		using Graphics2D functions.
		(paintVerticalGradient2D): New method. Paints gradient
		using Graphics2D functions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/metal/MetalUtils.java?cvsroot=classpath&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7897&r2=1.7898

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7897
retrieving revision 1.7898
diff -u -b -r1.7897 -r1.7898
--- ChangeLog	21 Jun 2006 13:13:39 -0000	1.7897
+++ ChangeLog	21 Jun 2006 13:23:06 -0000	1.7898
@@ -1,5 +1,19 @@
 2006-06-21  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/plaf/metal/MetalUtils.java
+	(paintHorizontalGradient): Use paintHorizontalGradient2D when
+	Graphics2D is available. Use fillRect instead of drawLine, this
+	is much faster.
+	(paintVerticalGradient): Use paintHorizontalGradient2D when
+	Graphics2D is available. Use fillRect instead of drawLine, this
+	is much faster.
+	(paintHorizontalGradient2D): New method. Paints gradient
+	using Graphics2D functions.
+	(paintVerticalGradient2D): New method. Paints gradient
+	using Graphics2D functions.
+
+2006-06-21  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/plaf/basic/BasicButtonListener.java
 	(propertyChange): Create a TextLayout and store it in the button
 	when the 'text' property changes.



From MAILER-DAEMON Wed Jun 21 09:43:52 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft2zo-0003oT-G3
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 09:43:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft2zn-0003o6-M8
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:43:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft2zm-0003mL-24
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:43:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft2zl-0003mB-Nj
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:43:49 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft3AW-0007Xq-OC
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:54:56 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft2zl-0004GP-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 09:43:49 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Ft2zj-0004G8-LO
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 13:43:48 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft2zj-0004G8-LO@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 21 Jun 2006 13:43:47 +0000
Subject: [commit-cp] classpath/javax/swing UIManager.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 13:43:52 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/21 13:43:47

Modified files:
	javax/swing    : UIManager.java 
	.              : ChangeLog 

Log message:
	2006-06-21  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/UIManager.java
		(MultiplexUIDefaults.clear): Removed method. The fallback UIDefaults
		must not be cleared.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/UIManager.java?cvsroot=classpath&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7898&r2=1.7899

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7898
retrieving revision 1.7899
diff -u -b -r1.7898 -r1.7899
--- ChangeLog	21 Jun 2006 13:23:06 -0000	1.7898
+++ ChangeLog	21 Jun 2006 13:43:46 -0000	1.7899
@@ -1,5 +1,11 @@
 2006-06-21  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/UIManager.java
+	(MultiplexUIDefaults.clear): Removed method. The fallback UIDefaults
+	must not be cleared.
+
+2006-06-21  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/plaf/metal/MetalUtils.java
 	(paintHorizontalGradient): Use paintHorizontalGradient2D when
 	Graphics2D is available. Use fillRect instead of drawLine, this



From MAILER-DAEMON Wed Jun 21 09:51:04 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft36l-0006Qm-M8
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 09:51:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft36k-0006Q7-5g
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:51:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft36j-0006Pk-Mg
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:51:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft36j-0006Pg-K8
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 09:51:01 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft3HU-00089S-Hy
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 10:02:08 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft36i-0005HW-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 09:51:00 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Ft36h-0005HM-Lh
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 13:51:00 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft36h-0005HM-Lh@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 21 Jun 2006 13:50:59 +0000
Subject: [commit-cp] classpath/java/awt/font FontRenderContext.java ...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 13:51:02 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/21 13:50:59

Modified files:
	java/awt/font  : FontRenderContext.java 
	.              : ChangeLog 

Log message:
	2006-06-21  Roman Kennke  <kennke@aicas.com>
	
		* java/awt/font/FontRenderContext.java:
		(equals): Added special conditions for affineTransform beeing
		null.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/FontRenderContext.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7899&r2=1.7900

Patches:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7899
retrieving revision 1.7900
diff -u -b -r1.7899 -r1.7900
--- ChangeLog	21 Jun 2006 13:43:46 -0000	1.7899
+++ ChangeLog	21 Jun 2006 13:50:58 -0000	1.7900
@@ -1,5 +1,11 @@
 2006-06-21  Roman Kennke  <kennke@aicas.com>
 
+	* java/awt/font/FontRenderContext.java:
+	(equals): Added special conditions for affineTransform beeing
+	null.
+
+2006-06-21  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/UIManager.java
 	(MultiplexUIDefaults.clear): Removed method. The fallback UIDefaults
 	must not be cleared.



From MAILER-DAEMON Wed Jun 21 10:55:12 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft46q-0002yF-BJ
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 10:55:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft46n-0002vx-0y
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 10:55:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft46k-0002ta-EG
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 10:55:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft46j-0002sm-Oy
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 10:55:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft4HU-0005gX-O4
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 11:06:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft46i-0001CM-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 10:55:04 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1Ft46h-0001CJ-LB
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 14:55:03 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft46h-0001CJ-LB@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Wed, 21 Jun 2006 14:55:03 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JMenu.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 14:55:10 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/21 14:55:03

Modified files:
	.              : ChangeLog 
	javax/swing    : JMenu.java 

Log message:
		2006-06-21  Tania Bento  <tbento@redhat.com>
	
	        * javax/swing/JMenu.java
	        (JMenu): Delay should be set to 200, not default of 0.
	        (JMenu): Delay should be set to 200, not default of 0.
	        (JMenu): Delay should be set to 200, not default of 0.
	        (JMenu): Delay should be set to 200, not default of 0.
	        (remove): Added check that index >= 0 before removing
	        the component.
	        (getItem): Return null if item count equals 0.
	        (isTearOff): Should throw new error and not return false.
	        (getMenuComponent): Return null if popupMenu is null or
	        if there are no menu components.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7900&r2=1.7901
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JMenu.java?cvsroot=classpath&r1=1.27&r2=1.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7900
retrieving revision 1.7901
diff -u -b -r1.7900 -r1.7901
--- ChangeLog	21 Jun 2006 13:50:58 -0000	1.7900
+++ ChangeLog	21 Jun 2006 14:55:00 -0000	1.7901
@@ -1,3 +1,17 @@
+2006-06-21  Tania Bento  <tbento@redhat.com>
+
+	* javax/swing/JMenu.java
+	(JMenu): Delay should be set to 200, not default of 0.
+	(JMenu): Delay should be set to 200, not default of 0.
+	(JMenu): Delay should be set to 200, not default of 0.
+	(JMenu): Delay should be set to 200, not default of 0.	
+	(remove): Added check that index >= 0 before removing
+	the component.
+	(getItem): Return null if item count equals 0.
+	(isTearOff): Should throw new error and not return false.
+	(getMenuComponent): Return null if popupMenu is null or
+	if there are no menu components.
+
 2006-06-21  Roman Kennke  <kennke@aicas.com>
 
 	* java/awt/font/FontRenderContext.java:
@@ -142,6 +156,7 @@
 	* java/net/URL.java (URL): Throw MalformedURLException if a
 	RuntimeException is caught.  Chain exceptions.
 
+>>>>>>> 1.7898
 2006-06-20  Lillian Angel  <langel@redhat.com>
 
 	* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java

Index: javax/swing/JMenu.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JMenu.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- javax/swing/JMenu.java	16 May 2006 06:49:32 -0000	1.27
+++ javax/swing/JMenu.java	21 Jun 2006 14:55:03 -0000	1.28
@@ -40,6 +40,7 @@
 
 import java.awt.Component;
 import java.awt.Point;
+import java.awt.PopupMenu;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -74,7 +75,7 @@
   private static final long serialVersionUID = 4227225638931828014L;
 
   /** A Popup menu associated with this menu, which pops up when menu is selected */
-  private JPopupMenu popupMenu = new JPopupMenu();
+  private JPopupMenu popupMenu = null;
 
   /** Whenever menu is selected or deselected the MenuEvent is fired to
      menu's registered listeners. */
@@ -98,6 +99,7 @@
   {
     super();
     setOpaque(false);
+    setDelay(200);
   }
 
   /**
@@ -108,8 +110,10 @@
   public JMenu(String text)
   {
     super(text);
+    popupMenu = new JPopupMenu(); 
     popupMenu.setInvoker(this);
     setOpaque(false);
+    setDelay(200);
   }
 
   /**
@@ -122,8 +126,10 @@
   {
     super(action);
     createActionChangeListener(this);
+    popupMenu = new JPopupMenu();
     popupMenu.setInvoker(this);
     setOpaque(false);
+    setDelay(200);
   }
 
   /**
@@ -137,6 +143,7 @@
   {
     // FIXME: tearoff not implemented
     this(text);
+    setDelay(200);
   }
 
   /**
@@ -148,7 +155,7 @@
    */
   public JMenuItem add(JMenuItem item)
   {
-    return popupMenu.add(item);
+    return getPopupMenu().add(item);
   }
 
   /**
@@ -160,7 +167,7 @@
    */
   public Component add(Component component)
   {
-    popupMenu.insert(component, -1);
+    getPopupMenu().insert(component, -1);
     return component;
   }
 
@@ -174,7 +181,7 @@
    */
   public Component add(Component component, int index)
   {
-    return popupMenu.add(component, index);
+    return getPopupMenu().add(component, index);
   }
 
   /**
@@ -186,7 +193,7 @@
    */
   public JMenuItem add(String text)
   {
-    return popupMenu.add(text);
+    return getPopupMenu().add(text);
   }
 
   /**
@@ -198,7 +205,7 @@
    */
   public JMenuItem add(Action action)
   {
-    return popupMenu.add(action);
+    return getPopupMenu().add(action);
   }
 
   /**
@@ -209,7 +216,7 @@
    */
   public void remove(JMenuItem item)
   {
-    popupMenu.remove(item);
+    getPopupMenu().remove(item);
   }
 
   /**
@@ -219,6 +226,10 @@
    */
   public void remove(int index)
   {
+    if (index < 0 || (index > 0 && getMenuComponentCount() == 0))
+      throw new IllegalArgumentException();
+  
+    if (getMenuComponentCount() > 0)
     popupMenu.remove(index);
   }
 
@@ -229,8 +240,9 @@
    */
   public void remove(Component component)
   {
-    int index = popupMenu.getComponentIndex(component);
-    popupMenu.remove(index);
+    int index = getPopupMenu().getComponentIndex(component);
+    if (index >= 0)
+      getPopupMenu().remove(index);
   }
 
   /**
@@ -267,7 +279,7 @@
     if (index < 0)
       throw new IllegalArgumentException("index less than zero");
 
-    popupMenu.insert(item, index);
+    getPopupMenu().insert(item, index);
     return item;
   }
 
@@ -381,7 +393,7 @@
 	super.setSelected(false);
 	super.setArmed(false);
 	fireMenuDeselected();
-	popupMenu.setVisible(false);
+        getPopupMenu().setVisible(false);
       }
   }
 
@@ -404,7 +416,7 @@
    */
   public boolean isPopupMenuVisible()
   {
-    return popupMenu.isVisible();
+    return getPopupMenu().isVisible();
   }
 
   /**
@@ -415,7 +427,7 @@
   public void setPopupMenuVisible(boolean popup)
   {
     if (getModel().isEnabled())
-      popupMenu.setVisible(popup);
+      getPopupMenu().setVisible(popup);
   }
 
   /**
@@ -530,6 +542,9 @@
     if (index < 0)
       throw new IllegalArgumentException("index less than 0");
 
+    if (getItemCount() == 0)
+      return null;
+    
     Component c = popupMenu.getComponentAtIndex(index);
 
     if (c instanceof JMenuItem)
@@ -558,7 +573,7 @@
   public boolean isTearOff()
   {
     // NOT YET IMPLEMENTED 
-    return false;
+    throw new Error("The method isTearOff() has not yet been implemented.");
   }
 
   /**
@@ -568,7 +583,7 @@
    */
   public int getMenuComponentCount()
   {
-    return popupMenu.getComponentCount();
+    return getPopupMenu().getComponentCount();
   }
 
   /**
@@ -581,6 +596,9 @@
    */
   public Component getMenuComponent(int index)
   {
+    if (getPopupMenu() == null || getMenuComponentCount() == 0)
+      return null;
+    
     return (Component) popupMenu.getComponentAtIndex(index);
   }
 
@@ -591,7 +609,7 @@
    */
   public Component[] getMenuComponents()
   {
-    return popupMenu.getComponents();
+    return getPopupMenu().getComponents();
   }
 
   /**
@@ -626,6 +644,11 @@
    */
   public JPopupMenu getPopupMenu()
   {
+    if (popupMenu == null)
+      {
+        popupMenu = new JPopupMenu();
+        popupMenu.setInvoker(this);
+      }
     return popupMenu;
   }
 



From MAILER-DAEMON Wed Jun 21 11:35:13 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft4jZ-0008FN-9f
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 11:35:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft4jY-0008FI-Dj
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 11:35:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft4jX-0008F6-TE
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 11:35:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft4jX-0008F3-NI
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 11:35:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft4uJ-0000SP-Os
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 11:46:19 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft4jX-00055q-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 11:35:11 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1Ft4jW-00055Y-79
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 15:35:11 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft4jW-00055Y-79@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Wed, 21 Jun 2006 15:35:10 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/text/DefaultCar...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 15:35:12 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/21 15:35:10

Modified files:
	.              : ChangeLog 
	javax/swing/text: DefaultCaret.java 

Log message:
	2006-06-21  Lillian Angel  <langel@redhat.com>
	
	        * javax/swing/text/DefaultCaret.java
	        (install): Added check to prevent NPE.
	        (propertyChange): Added checks to prevent NPEs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7901&r2=1.7902
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/DefaultCaret.java?cvsroot=classpath&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7901
retrieving revision 1.7902
diff -u -b -r1.7901 -r1.7902
--- ChangeLog	21 Jun 2006 14:55:00 -0000	1.7901
+++ ChangeLog	21 Jun 2006 15:35:08 -0000	1.7902
@@ -1,3 +1,9 @@
+2006-06-21  Lillian Angel  <langel@redhat.com>
+
+	* javax/swing/text/DefaultCaret.java
+	(install): Added check to prevent NPE.
+	(propertyChange): Added checks to prevent NPEs.
+
 2006-06-21  Tania Bento  <tbento@redhat.com>
 
 	* javax/swing/JMenu.java

Index: javax/swing/text/DefaultCaret.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/DefaultCaret.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- javax/swing/text/DefaultCaret.java	11 May 2006 16:29:29 -0000	1.41
+++ javax/swing/text/DefaultCaret.java	21 Jun 2006 15:35:09 -0000	1.42
@@ -221,8 +221,11 @@
       if (name.equals("document"))
         {
           Document oldDoc = (Document) e.getOldValue();
+          if (oldDoc != null)
           oldDoc.removeDocumentListener(documentListener);
+          
           Document newDoc = (Document) e.getNewValue();
+          if (newDoc != null)
           newDoc.addDocumentListener(documentListener);
         }
       else if (name.equals("editable"))
@@ -708,7 +711,11 @@
     propertyChangeListener = new PropertyChangeHandler();
     textComponent.addPropertyChangeListener(propertyChangeListener);
     documentListener = new DocumentHandler();
-    textComponent.getDocument().addDocumentListener(documentListener);
+    
+    Document doc = textComponent.getDocument();
+    if (doc != null)
+      doc.addDocumentListener(documentListener);
+    
     active = textComponent.isEditable() && textComponent.isEnabled();
 
     repaint();



From MAILER-DAEMON Wed Jun 21 12:10:25 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft5Hd-0004v9-Cm
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 12:10:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft5Hb-0004tp-DA
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:10:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft5Ha-0004t3-TP
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:10:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft5Ha-0004sn-M6
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:10:22 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft5SN-0003yX-5s
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:21:31 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft5Ha-0008LR-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 12:10:22 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1Ft5HY-0008LC-MA
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 16:10:21 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft5HY-0008LC-MA@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Wed, 21 Jun 2006 16:10:20 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 16:10:24 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/21 16:10:20

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicPopupMenuUI.java 

Log message:
	        2006-06-21  Tania Bento  <tbento@redhat.com>
	
	        * javax/swing/JMenu.java
	        Changed instantiation of popupMenu to null.
	        (JMenu): Instantiated popupMenu to new JPopupMenu.
	        (JMenu): Instantiated popupMenu to new JPopupMenu.
	        (add): Changed popupMenu to getPopupMenu().
	        (add): Changed popupMenu to getPopupMenu().
	        (add): Changed popupMenu to getPopupMenu().
	        (add): Changed popupMenu to getPopupMenu().
	        (remove): Changed popupMenu to getPopupMenu().
	        (remove): Changed popupMenu to getPopupMenu().
	        (insert): Changed popupMenu to getPopupMenu().
	        (setSelectedHelper): Changed popupMenu to getPopupMenu().
	        (isPopupMenuVisible): Changed popupMenu to getPopupMenu().
	        (setPopupMenuVisible): Changed popupMenu to getPopupMenu().
	        (getMenuComponentCount): Changed popupMenu to getPopupMenu().
	        (getMenuComponents): Changed popupMenu to getPopupMenu().
	        (getPopupMenu): Check first if popupMenu is null and if so,
	        instantiate it to a new JPopupMenu and set the invoker.
	        * javax/swing/plaf/basic/BasicPopupMenuUI.java
	        (popupMenuWillBecomeVisible): Component Listener should only
	        be added to the root container if the root container is not
	        null. This avoids a null pointer exception.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7902&r2=1.7903
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java?cvsroot=classpath&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7902
retrieving revision 1.7903
diff -u -b -r1.7902 -r1.7903
--- ChangeLog	21 Jun 2006 15:35:08 -0000	1.7902
+++ ChangeLog	21 Jun 2006 16:10:19 -0000	1.7903
@@ -7,6 +7,31 @@
 2006-06-21  Tania Bento  <tbento@redhat.com>
 
 	* javax/swing/JMenu.java
+	Changed instantiation of popupMenu to null.
+	(JMenu): Instantiated popupMenu to new JPopupMenu.
+	(JMenu): Instantiated popupMenu to new JPopupMenu.	
+	(add): Changed popupMenu to getPopupMenu().
+	(add): Changed popupMenu to getPopupMenu().
+	(add): Changed popupMenu to getPopupMenu().
+	(add): Changed popupMenu to getPopupMenu().
+	(remove): Changed popupMenu to getPopupMenu().
+	(remove): Changed popupMenu to getPopupMenu().
+	(insert): Changed popupMenu to getPopupMenu().
+	(setSelectedHelper): Changed popupMenu to getPopupMenu().
+	(isPopupMenuVisible): Changed popupMenu to getPopupMenu().
+	(setPopupMenuVisible): Changed popupMenu to getPopupMenu().
+	(getMenuComponentCount): Changed popupMenu to getPopupMenu().
+	(getMenuComponents): Changed popupMenu to getPopupMenu().
+	(getPopupMenu): Check first if popupMenu is null and if so,
+	instantiate it to a new JPopupMenu and set the invoker.
+	* javax/swing/plaf/basic/BasicPopupMenuUI.java
+	(popupMenuWillBecomeVisible): Component Listener should only
+	be added to the root container if the root container is not 
+	null. This avoids a null pointer exception.
+
+2006-06-21  Tania Bento  <tbento@redhat.com>
+
+	* javax/swing/JMenu.java
 	(JMenu): Delay should be set to 200, not default of 0.
 	(JMenu): Delay should be set to 200, not default of 0.
 	(JMenu): Delay should be set to 200, not default of 0.

Index: javax/swing/plaf/basic/BasicPopupMenuUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- javax/swing/plaf/basic/BasicPopupMenuUI.java	17 Apr 2006 07:41:05 -0000	1.18
+++ javax/swing/plaf/basic/BasicPopupMenuUI.java	21 Jun 2006 16:10:20 -0000	1.19
@@ -280,6 +280,7 @@
       // if topWindow to which this popup belongs was resized or moved.
       Component invoker = popupMenu.getInvoker();
       Component rootContainer = SwingUtilities.getRoot(invoker);
+      if (rootContainer != null)
       rootContainer.addComponentListener(topWindowListener);
 
       // if this popup menu is a free floating popup menu,



From MAILER-DAEMON Wed Jun 21 12:11:43 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft5Is-0005Ku-WC
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 12:11:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft5Iq-0005Jo-FX
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:11:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft5Ip-0005JW-NB
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:11:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft5Ip-0005JT-HU
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:11:39 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft5Tc-00043h-0h
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 12:22:48 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft5Io-0008Sa-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 12:11:38 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1Ft5In-0008SQ-RV
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 16:11:38 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft5In-0008SQ-RV@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Wed, 21 Jun 2006 16:11:37 +0000
Subject: [commit-cp] classpath ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 16:11:41 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/21 16:11:37

Modified files:
	.              : ChangeLog 

Log message:
		2006-06-21  Tania Bento  <tbento@redhat.com>
	
	        * javax/swing/JMenu.java
	        (remove): An IllegalArgumentException should be thrown if
	        either index < 0 or if index > 0 and there are no menu
	        components. Also, a check was added that ensures there are
	        menu components before removing the desired the component.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7903&r2=1.7904

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7903
retrieving revision 1.7904
diff -u -b -r1.7903 -r1.7904
--- ChangeLog	21 Jun 2006 16:10:19 -0000	1.7903
+++ ChangeLog	21 Jun 2006 16:11:37 -0000	1.7904
@@ -1,3 +1,11 @@
+2006-06-21  Tania Bento  <tbento@redhat.com>
+
+	* javax/swing/JMenu.java
+	(remove): An IllegalArgumentException should be thrown if
+	either index < 0 or if index > 0 and there are no menu
+	components. Also, a check was added that ensures there are
+	menu components before removing the desired the component.
+
 2006-06-21  Lillian Angel  <langel@redhat.com>
 
 	* javax/swing/text/DefaultCaret.java



From MAILER-DAEMON Wed Jun 21 13:04:50 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft68I-00071J-Hm
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 13:04:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft68G-00070G-IP
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 13:04:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft68E-0006z5-UK
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 13:04:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft68E-0006z0-GX
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 13:04:46 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ft6J1-00009e-6m
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 13:15:55 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft68B-0005EO-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 13:04:43 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Ft68A-0005EC-5m
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 17:04:43 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft68A-0005EC-5m@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 21 Jun 2006 17:04:42 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/text/AbstractDo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 17:04:48 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/21 17:04:41

Modified files:
	.              : ChangeLog 
	javax/swing/text: AbstractDocument.java JTextComponent.java 
	                  PlainDocument.java 
	javax/swing/text/rtf: RTFParser.java RTFScanner.java 

Log message:
	2006-06-21  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/text/AbstractDocument.java
		(BranchElement.numChildren): New field.
		(BranchElement.BranchElement): Initialize children array with
		one element (that's the least number of elements that makes sense).
		Initialize numChildren.
		(BranchElement.children): Use numChildren as boundary.
		(BranchElement.getElement): Use numChildren as boundary.
		(BranchElement.getElementCount): Use numChildren as boundary.
		(BranchElement.getElementIndex): Use numChildren as boundary.
		(BranchElement.getEndOffset): Use numChildren as boundary.
		(BranchElement.getStartOffset): Use numChildren as boundary.
		(BranchElement.positionToElement): Use numChildren as boundary.
		(BranchElement.replace): Handle the children array more efficiently
		by growing in blocks > 1, and reusing space from removed elements.
		(LeafElement.startDelta): Removed.
		(LeafElement.endDelta): Removed.
		(LeafElement.LeafElement): Removed handling of deltas.
		(LeafElement.getEndOffset): Likewise.
		(LeafElement.getStartOffset): Likewise.
		* javax/swing/text/JTextComponent.java
		(setDocument): Added locking of the old document to avoid dangling
		notification beeing delivered while the document is beeing
		disconnected.
		(getScrollableTracksViewportWidth): Fixed condition.
		* javax/swing/text/PlainDocument.java
		(createDefaultRoot): Create elements without AttributeSet.
		* javax/swing/text/rtf/RTFParser.java
		(parseFile): Handle slightly incorrect RTF gracefully.
		* javax/swing/text/rtf/RTFScanner.java
		(lastToken): New field.
		(readTokenImpl): New method.
		(peekToken): New method.
		(readToken): Changed to call readTokenImpl or return the lastToken
		if there's one present.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7904&r2=1.7905
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/AbstractDocument.java?cvsroot=classpath&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/JTextComponent.java?cvsroot=classpath&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/PlainDocument.java?cvsroot=classpath&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/rtf/RTFParser.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/rtf/RTFScanner.java?cvsroot=classpath&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7904
retrieving revision 1.7905
diff -u -b -r1.7904 -r1.7905
--- ChangeLog	21 Jun 2006 16:11:37 -0000	1.7904
+++ ChangeLog	21 Jun 2006 17:04:41 -0000	1.7905
@@ -1,3 +1,40 @@
+2006-06-21  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/text/AbstractDocument.java
+	(BranchElement.numChildren): New field.
+	(BranchElement.BranchElement): Initialize children array with
+	one element (that's the least number of elements that makes sense).
+	Initialize numChildren.
+	(BranchElement.children): Use numChildren as boundary.
+	(BranchElement.getElement): Use numChildren as boundary.
+	(BranchElement.getElementCount): Use numChildren as boundary.
+	(BranchElement.getElementIndex): Use numChildren as boundary.
+	(BranchElement.getEndOffset): Use numChildren as boundary.
+	(BranchElement.getStartOffset): Use numChildren as boundary.
+	(BranchElement.positionToElement): Use numChildren as boundary.
+	(BranchElement.replace): Handle the children array more efficiently
+	by growing in blocks > 1, and reusing space from removed elements.
+	(LeafElement.startDelta): Removed.
+	(LeafElement.endDelta): Removed.
+	(LeafElement.LeafElement): Removed handling of deltas.
+	(LeafElement.getEndOffset): Likewise.
+	(LeafElement.getStartOffset): Likewise.
+	* javax/swing/text/JTextComponent.java
+	(setDocument): Added locking of the old document to avoid dangling
+	notification beeing delivered while the document is beeing
+	disconnected.
+	(getScrollableTracksViewportWidth): Fixed condition.
+	* javax/swing/text/PlainDocument.java
+	(createDefaultRoot): Create elements without AttributeSet.
+	* javax/swing/text/rtf/RTFParser.java
+	(parseFile): Handle slightly incorrect RTF gracefully.
+	* javax/swing/text/rtf/RTFScanner.java
+	(lastToken): New field.
+	(readTokenImpl): New method.
+	(peekToken): New method.
+	(readToken): Changed to call readTokenImpl or return the lastToken
+	if there's one present.
+
 2006-06-21  Tania Bento  <tbento@redhat.com>
 
 	* javax/swing/JMenu.java

Index: javax/swing/text/AbstractDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/AbstractDocument.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- javax/swing/text/AbstractDocument.java	13 May 2006 23:11:13 -0000	1.57
+++ javax/swing/text/AbstractDocument.java	21 Jun 2006 17:04:41 -0000	1.58
@@ -1674,8 +1674,15 @@
     /** The serialization UID (compatible with JDK1.5). */
     private static final long serialVersionUID = -6037216547466333183L;
 
-    /** The child elements of this BranchElement. */
-    private Element[] children = new Element[0];
+    /**
+     * The child elements of this BranchElement.
+     */
+    private Element[] children;;
+
+    /**
+     * The number of children in the branch element.
+     */
+    private int numChildren;
 
     /**
      * The cached startOffset value. This is used in the case when a
@@ -1700,6 +1707,8 @@
     public BranchElement(Element parent, AttributeSet attributes)
     {
       super(parent, attributes);
+      children = new Element[1];
+      numChildren = 0;
       startOffset = -1;
       endOffset = -1;
     }
@@ -1716,7 +1725,7 @@
 
       Vector tmp = new Vector();
 
-      for (int index = 0; index < children.length; ++index)
+      for (int index = 0; index < numChildren; ++index)
 	tmp.add(children[index]);
       
       return tmp.elements();
@@ -1743,7 +1752,7 @@
      */
     public Element getElement(int index)
     {
-      if (index < 0 || index >= children.length)
+      if (index < 0 || index >= numChildren)
 	return null;
 
       return children[index];
@@ -1756,7 +1765,7 @@
      */
     public int getElementCount()
     {
-      return children.length;
+      return numChildren;
     }
 
     /**
@@ -1777,7 +1786,7 @@
 
       // XXX: There is surely a better algorithm
       // as beginning from first element each time.
-      for (int index = 0; index < children.length - 1; ++index)
+      for (int index = 0; index < numChildren - 1; ++index)
         {
           Element elem = children[index];
 
@@ -1814,13 +1823,13 @@
      */
     public int getEndOffset()
     {
-      if (children.length == 0)
+      if (numChildren == 0)
         {
           if (endOffset == -1)
             throw new NullPointerException("BranchElement has no children.");
         }
       else
-        endOffset = children[children.length - 1].getEndOffset();
+        endOffset = children[numChildren - 1].getEndOffset();
 
       return endOffset;
     }
@@ -1848,7 +1857,7 @@
      */
     public int getStartOffset()
     {
-      if (children.length == 0)
+      if (numChildren == 0)
         {
           if (startOffset == -1)
             throw new NullPointerException("BranchElement has no children.");
@@ -1884,7 +1893,7 @@
     {
       // XXX: There is surely a better algorithm
       // as beginning from first element each time.
-      for (int index = 0; index < children.length; ++index)
+      for (int index = 0; index < numChildren; ++index)
         {
 	  Element elem = children[index];
 
@@ -1905,15 +1914,28 @@
      */
     public void replace(int offset, int length, Element[] elements)
     {
-      Element[] target = new Element[children.length - length
-				     + elements.length];
+      if (numChildren + elements.length - length > children.length)
+        {
+          // Gotta grow the array.
+          int newSize = Math.max(2 * children.length,
+                                 numChildren + elements.length - length);
+          Element[] target = new Element[newSize];
       System.arraycopy(children, 0, target, 0, offset);
       System.arraycopy(elements, 0, target, offset, elements.length);
       System.arraycopy(children, offset + length, target,
 		       offset + elements.length,
-		       children.length - offset - length);
+                           numChildren - offset - length);
       children = target;
     }
+      else
+        {
+          System.arraycopy(children, offset + length, children,
+                           offset + elements.length,
+                           numChildren - offset - length);
+          System.arraycopy(elements, 0, children, offset, elements.length);
+        }
+      numChildren += elements.length - length;
+    }
 
     /**
      * Returns a string representation of this element.
@@ -2165,18 +2187,6 @@
     private Position endPos;
 
     /**
-     * This gets possible added to the startOffset when a startOffset
-     * outside the document range is requested.
-     */
-    private int startDelta;
-
-    /**
-     * This gets possible added to the endOffset when a endOffset
-     * outside the document range is requested.
-     */
-    private int endDelta;
-    
-    /**
      * Creates a new <code>LeafElement</code>.
      *
      * @param parent the parent of this <code>LeafElement</code>
@@ -2188,17 +2198,10 @@
                        int end)
     {
       super(parent, attributes);
-      int len = content.length();
-      startDelta = 0;
-      if (start > len)
-        startDelta = start - len;
-      endDelta = 0;
-      if (end > len)
-        endDelta = end - len;
       try
 	    {
-		  startPos = createPosition(start - startDelta);
-		  endPos = createPosition(end - endDelta);
+          startPos = createPosition(start);
+          endPos = createPosition(end);
 		}
 	  catch (BadLocationException ex)
 	    {
@@ -2281,7 +2284,7 @@
      */
     public int getEndOffset()
     {
-      return endPos.getOffset() + endDelta;
+      return endPos.getOffset();
     }
 
     /**
@@ -2307,7 +2310,7 @@
      */
     public int getStartOffset()
     {
-      return startPos.getOffset() + startDelta;
+      return startPos.getOffset();
     }
 
     /**

Index: javax/swing/text/JTextComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/JTextComponent.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- javax/swing/text/JTextComponent.java	20 Jun 2006 18:24:14 -0000	1.59
+++ javax/swing/text/JTextComponent.java	21 Jun 2006 17:04:41 -0000	1.60
@@ -42,6 +42,7 @@
 
 import java.awt.AWTEvent;
 import java.awt.Color;
+import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Insets;
 import java.awt.Point;
@@ -1179,8 +1180,19 @@
   public void setDocument(Document newDoc)
   {
     Document oldDoc = doc;
+    try
+      {
+        if (oldDoc instanceof AbstractDocument)
+          ((AbstractDocument) oldDoc).readLock();
+
     doc = newDoc;
     firePropertyChange("document", oldDoc, newDoc);
+      }
+    finally
+      {
+        if (oldDoc instanceof AbstractDocument)
+          ((AbstractDocument) oldDoc).readUnlock();
+      }
     revalidate();
     repaint();
   }
@@ -1657,10 +1669,12 @@
 
   public boolean getScrollableTracksViewportWidth()
   {
-    if (getParent() instanceof JViewport)
-      return getParent().getWidth() > getPreferredSize().width;
+    boolean res = false;;
+    Container c = getParent();
+    if (c instanceof JViewport)
+      res = ((JViewport) c).getExtentSize().width > getPreferredSize().width;
 
-    return false;
+    return res;
   }
 
   /**

Index: javax/swing/text/PlainDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/PlainDocument.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- javax/swing/text/PlainDocument.java	6 Mar 2006 10:51:19 -0000	1.21
+++ javax/swing/text/PlainDocument.java	21 Jun 2006 17:04:41 -0000	1.22
@@ -105,10 +105,10 @@
   protected AbstractDocument.AbstractElement createDefaultRoot()
   {
     BranchElement root =
-      (BranchElement) createBranchElement(null, SimpleAttributeSet.EMPTY);
+      (BranchElement) createBranchElement(null, null);
 
     Element[] array = new Element[1];
-    array[0] = createLeafElement(root, SimpleAttributeSet.EMPTY, 0, 1);
+    array[0] = createLeafElement(root, null, 0, 1);
     root.replace(0, 0, array);
     
     return root;

Index: javax/swing/text/rtf/RTFParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/rtf/RTFParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- javax/swing/text/rtf/RTFParser.java	2 Jul 2005 20:32:51 -0000	1.3
+++ javax/swing/text/rtf/RTFParser.java	21 Jun 2006 17:04:41 -0000	1.4
@@ -140,9 +140,17 @@
     parseHeader();
     parseDocument();
   
-    Token t2 = scanner.readToken();
-    if (t2.type != Token.RCURLY)
-      throw new RTFParseException("expected right curly braces");
+    Token t2 = scanner.peekToken();
+    if (t2.type == Token.RCURLY)
+      {
+        // Eat the token.
+        scanner.readToken();
+      }
+    else
+      {
+        // Ignore this for maximum robustness when file is broken.
+        System.err.println("RTF warning: expected right curly braces");
+      }
 
   }
 

Index: javax/swing/text/rtf/RTFScanner.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/rtf/RTFScanner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- javax/swing/text/rtf/RTFScanner.java	2 Jul 2005 20:32:51 -0000	1.3
+++ javax/swing/text/rtf/RTFScanner.java	21 Jun 2006 17:04:41 -0000	1.4
@@ -71,6 +71,11 @@
   private StringBuffer buffer;
 
   /**
+   * Lookahead token.
+   */
+  private Token lastToken;
+
+  /**
    * Constructs a new RTFScanner without initializing the {@link Reader}.
    */
   private RTFScanner()
@@ -120,7 +125,7 @@
    *
    * @throws IOException if the underlying stream has problems
    */
-  public Token readToken()
+  private Token readTokenImpl()
     throws IOException
   {
     Token token = null;
@@ -156,6 +161,27 @@
     return token;
   }
 
+  Token peekToken()
+    throws IOException
+  {
+    lastToken = readTokenImpl();
+    return lastToken;
+  }
+
+  Token readToken()
+    throws IOException
+  {
+    Token token;
+    if (lastToken != null)
+      {
+        token = lastToken;
+        lastToken = null;
+      }
+    else
+      token = readTokenImpl();
+    return token;
+  }
+
   /**
    * Reads in a control word and optional parameter.
    *



From MAILER-DAEMON Wed Jun 21 17:01:41 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ft9pV-0005ju-FL
	for mharc-commit-classpath@gnu.org; Wed, 21 Jun 2006 17:01:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ft9pS-0005jd-J1
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 17:01:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ft9pQ-0005ij-Lw
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 17:01:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ft9pQ-0005ie-Fe
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 17:01:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtA0F-0002Xp-Id
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 17:12:47 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ft9pN-000896-00
	for <commit-classpath@gnu.org>; Wed, 21 Jun 2006 17:01:33 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1Ft9pM-000890-Dw
	for commit-classpath@gnu.org; Wed, 21 Jun 2006 21:01:33 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ft9pM-000890-Dw@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Wed, 21 Jun 2006 21:01:32 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/DefaultListSele...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2006 21:01:39 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/21 21:01:32

Modified files:
	.              : ChangeLog 
	javax/swing    : DefaultListSelectionModel.java 

Log message:
	2006-06-21  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/DefaultListSelectionModel.java
		(getSelectionMode): Updated API docs,
		(setAnchorSelectionIndex): Added ListSelectionEvent generation,
		(addSelectionInterval): If mode is SINGLE_SELECTION, just call 
		setSelectionInterval(),
		(setSelectionInterval): Reimplemented SINGLE_SELECTION and 
		SINGLE_INTERVAL_SELECTION cases.
	----------------------------------------------------------------------

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7905&r2=1.7906
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/DefaultListSelectionModel.java?cvsroot=classpath&r1=1.31&r2=1.32

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7905
retrieving revision 1.7906
diff -u -b -r1.7905 -r1.7906
--- ChangeLog	21 Jun 2006 17:04:41 -0000	1.7905
+++ ChangeLog	21 Jun 2006 21:01:30 -0000	1.7906
@@ -1,3 +1,13 @@
+2006-06-21  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/DefaultListSelectionModel.java
+	(getSelectionMode): Updated API docs,
+	(setAnchorSelectionIndex): Added ListSelectionEvent generation,
+	(addSelectionInterval): If mode is SINGLE_SELECTION, just call 
+	setSelectionInterval(),
+	(setSelectionInterval): Reimplemented SINGLE_SELECTION and 
+	SINGLE_INTERVAL_SELECTION cases.
+
 2006-06-21  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/text/AbstractDocument.java

Index: javax/swing/DefaultListSelectionModel.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/DefaultListSelectionModel.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- javax/swing/DefaultListSelectionModel.java	26 Apr 2006 15:29:34 -0000	1.31
+++ javax/swing/DefaultListSelectionModel.java	21 Jun 2006 21:01:32 -0000	1.32
@@ -150,9 +150,14 @@
   boolean setLeadCalledFromAdd = false;
 
   /**
-   * Gets the value of the {@link #selectionMode} property.
+   * Returns the selection mode, which is one of {@link #SINGLE_SELECTION}, 
+   * {@link #SINGLE_INTERVAL_SELECTION} and 
+   * {@link #MULTIPLE_INTERVAL_SELECTION}.  The default value is
+   * {@link #MULTIPLE_INTERVAL_SELECTION}.
    *
-   * @return The current value of the property
+   * @return The selection mode.
+   * 
+   * @see #setSelectionMode(int)
    */
   public int getSelectionMode()
   {
@@ -187,13 +192,19 @@
   /**
    * Sets the value of the {@link #anchorSelectionIndex} property.
    * 
-   * @param anchorIndex The new property value
+   * @param index The new property value
    *
    * @see #getAnchorSelectionIndex
    */
-  public void setAnchorSelectionIndex(int anchorIndex)
+  public void setAnchorSelectionIndex(int index)
+  {
+    if (anchorSelectionIndex != index)
   {
-    anchorSelectionIndex = anchorIndex;
+        int old = anchorSelectionIndex;
+        anchorSelectionIndex = index;
+        if (leadAnchorNotificationEnabled)
+          fireValueChanged(index, old);
+      }
   }
   
   /**
@@ -459,12 +470,14 @@
     if (index0 == -1 || index1 == -1)
       return;
     
+    if (selectionMode == SINGLE_SELECTION)
+      setSelectionInterval(index0, index1);
+    else
+    {
     int lo = Math.min(index0, index1);
     int hi = Math.max(index0, index1);
     oldSel = sel.clone();
 
-    if (selectionMode == SINGLE_SELECTION)
-      setSelectionInterval(index0, index1);
 
     // COMPAT: Like Sun (but not like IBM), we allow calls to 
     // addSelectionInterval when selectionMode is
@@ -504,6 +517,7 @@
         fireDifference(sel, (BitSet) oldSel);
       }
   }
+  }
 
 
   /**
@@ -588,28 +602,83 @@
    * the current selection mode is <code>SINGLE_SELECTION</code> only the
    * index <code>index2</code> is selected.
    * 
-   * @param index0 The low end of the new selection
-   * @param index1 The high end of the new selection
+   * @param anchor  the anchor selection index.
+   * @param lead  the lead selection index.
    */
-  public void setSelectionInterval(int index0, int index1)
+  public void setSelectionInterval(int anchor, int lead)
   {
-    if (index0 == -1 || index1 == -1)
+    if (anchor == -1 || lead == -1)
       return;
+    if (selectionMode == SINGLE_SELECTION)
+      {
+        int lo = lead;
+        int hi = lead;
+        int selected = sel.nextSetBit(0);
+        if (selected == lead)
+          return;  // the selection is not changing
+        if (selected >= 0)
+          {
+            lo = Math.min(lo, selected);
+            hi = Math.max(hi, selected);
+          }
+        if (anchorSelectionIndex >= 0)
+          {
+            lo = Math.min(lo, anchorSelectionIndex);
+            hi = Math.max(hi, anchorSelectionIndex);
+          }
+        sel.clear();
+        sel.set(lead);
+        leadSelectionIndex = lead;
+        anchorSelectionIndex = lead;
+        fireValueChanged(lo, hi);
+      }
+    else if (selectionMode == SINGLE_INTERVAL_SELECTION)
+      {
+        // determine the current interval
+        int first = sel.nextSetBit(0);
+        int last = first;
+        if (first >= 0)
+          last += (sel.cardinality() - 1);
+        
+        // update the selection
+        int lo = Math.min(anchor, lead);
+        int hi = Math.max(anchor, lead);
+        if (lo == first && hi == last)
+          return;  // selected interval is not being changed
+        sel.clear();
+        sel.set(lo, hi + 1);
     
+        // include the old selection in the event range
+        if (first >= 0)
+          lo = Math.min(lo, first);
+        if (last >= 0)
+          hi = Math.max(hi, last);
+        if (anchorSelectionIndex >= 0)
+          {
+            lo = Math.min(lo, anchorSelectionIndex);
+            hi = Math.max(hi, anchorSelectionIndex);
+          }
+        anchorSelectionIndex = anchor;
+        leadSelectionIndex = lead;
+        fireValueChanged(lo, hi);
+      }    
+    else
+    {
     BitSet oldSel = (BitSet) sel.clone();
     sel.clear();
     if (selectionMode == SINGLE_SELECTION)
-      index0 = index1;
+        anchor = lead;
 
-    int lo = Math.min(index0, index1);
-    int hi = Math.max(index0, index1);
+      int lo = Math.min(anchor, lead);
+      int hi = Math.max(anchor, lead);
     sel.set(lo, hi+1);
     // update the anchorSelectionIndex and leadSelectionIndex variables
-    setAnchorSelectionIndex(index0);
-    leadSelectionIndex=index1;
+      setAnchorSelectionIndex(anchor);
+      leadSelectionIndex = lead;
     
     fireDifference(sel, oldSel);
   }
+  }
 
   /**
    * Inserts a number of indices either before or after a particular



From MAILER-DAEMON Thu Jun 22 05:04:21 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtL6r-00073A-3V
	for mharc-commit-classpath@gnu.org; Thu, 22 Jun 2006 05:04:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtL6p-00072B-RZ
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 05:04:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtL6p-00071T-70
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 05:04:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtL6o-00071D-Ou
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 05:04:18 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtLHk-0004AE-SN
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 05:15:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtL6m-0001H7-00
	for <commit-classpath@gnu.org>; Thu, 22 Jun 2006 05:04:16 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FtL6l-0001Gy-Dj
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 09:04:16 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtL6l-0001Gy-Dj@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Thu, 22 Jun 2006 09:04:15 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JLabel.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2006 09:04:20 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/22 09:04:15

Modified files:
	.              : ChangeLog 
	javax/swing    : JLabel.java 

Log message:
	2006-06-22  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JLabel.java
		(setDisplayedMnemonic): Updated API docs,
		(getDisplayedMnemonic): Removed unnecessary type-cast,
		(setDisplayedMnemonicIndex): Removed unnecessary validation, 
		(getDisplayedMnemonicIndex): Updated API docs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7906&r2=1.7907
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JLabel.java?cvsroot=classpath&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7906
retrieving revision 1.7907
diff -u -b -r1.7906 -r1.7907
--- ChangeLog	21 Jun 2006 21:01:30 -0000	1.7906
+++ ChangeLog	22 Jun 2006 09:04:14 -0000	1.7907
@@ -1,3 +1,11 @@
+2006-06-22  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/JLabel.java
+	(setDisplayedMnemonic): Updated API docs,
+	(getDisplayedMnemonic): Removed unnecessary type-cast,
+	(setDisplayedMnemonicIndex): Removed unnecessary validation, 
+	(getDisplayedMnemonicIndex): Updated API docs.
+
 2006-06-21  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/DefaultListSelectionModel.java

Index: javax/swing/JLabel.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/JLabel.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- javax/swing/JLabel.java	22 May 2006 22:16:05 -0000	1.36
+++ javax/swing/JLabel.java	22 Jun 2006 09:04:15 -0000	1.37
@@ -615,13 +615,14 @@
    * focus to that component when the mnemonic is activated.
    *
    * @param mnemonic The keycode to use for the mnemonic.
+   * 
+   * @see #getDisplayedMnemonic()
    */
   public void setDisplayedMnemonic(int mnemonic)
   {
     if (displayedMnemonic != mnemonic)
       {
-	firePropertyChange("displayedMnemonic",
-	                   displayedMnemonic, mnemonic);
+        firePropertyChange("displayedMnemonic", displayedMnemonic, mnemonic);
 	displayedMnemonic = mnemonic;
 
 	if (text != null)
@@ -645,22 +646,33 @@
    * This method returns the keycode that is used for the label's mnemonic.
    *
    * @return The keycode that is used for the label's mnemonic.
+   * 
+   * @see #setDisplayedMnemonic(int)
    */
   public int getDisplayedMnemonic()
   {
-    return (int) displayedMnemonic;
+    return displayedMnemonic;
   }
 
   /**
-   * This method sets which character in the text will be the underlined
-   * character. If the given index is -1, then this indicates  that there is
-   * no mnemonic. If the index is less than -1 or if the index is equal to
-   * the length, this method will throw an IllegalArgumentException.
+   * Sets the index of the character in the text that will be underlined to
+   * indicate that it is the mnemonic character for the label.  You only need
+   * to call this method if you wish to override the automatically calculated
+   * character index.  For instance, for a label "Find Next" with the mnemonic
+   * character 'n', you might wish to underline the second occurrence of 'n'
+   * rather than the first (which is the default).
+   * <br><br>
+   * Note that this method does not validate the character at the specified 
+   * index to ensure that it matches the key code returned by
+   * {@link #getDisplayedMnemonic()}.
    *
    * @param newIndex The index of the character to underline.
    *
-   * @throws IllegalArgumentException If index less than -1 or index equals
-   *         length.
+   * @throws IllegalArgumentException If index less than -1 or index is greater
+   *         than or equal to the label length.
+   *         
+   * @see #getDisplayedMnemonicIndex()
+   * @since 1.4
    */
   public void setDisplayedMnemonicIndex(int newIndex)
     throws IllegalArgumentException
@@ -668,25 +680,23 @@
     if (newIndex < -1 || (text != null && newIndex >= text.length()))
       throw new IllegalArgumentException();
 
-    if (newIndex == -1
-        || text == null
-	|| text.charAt(newIndex) != displayedMnemonic)
-      newIndex = -1;
-
     if (newIndex != displayedMnemonicIndex)
       {
 	int oldIndex = displayedMnemonicIndex;
 	displayedMnemonicIndex = newIndex;
-	firePropertyChange("displayedMnemonicIndex",
-	                   oldIndex, newIndex);
+        firePropertyChange("displayedMnemonicIndex", oldIndex, newIndex);
       }
   }
 
   /**
-   * This method returns which character in the text will be  the underlined
-   * character.
+   * Returns the index of the character in the label's text that will be
+   * underlined (to indicate that it is the mnemonic character), or -1 if no
+   * character is to be underlined.
    *
    * @return The index of the character that will be underlined.
+   * 
+   * @see #setDisplayedMnemonicIndex(int)
+   * @since 1.4
    */
   public int getDisplayedMnemonicIndex()
   {



From MAILER-DAEMON Thu Jun 22 05:47:37 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtLmj-0004EI-EB
	for mharc-commit-classpath@gnu.org; Thu, 22 Jun 2006 05:47:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtLmh-0004Dl-Ti
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 05:47:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtLmg-0004D8-Uh
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 05:47:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtLmg-0004Cz-NZ
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 05:47:34 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtLxd-0008Fk-6l
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 05:58:53 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtLmf-0004y8-00
	for <commit-classpath@gnu.org>; Thu, 22 Jun 2006 05:47:33 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FtLmf-0004y4-Ll
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 09:47:33 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtLmf-0004y4-Ll@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Thu, 22 Jun 2006 09:47:33 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JLabel.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2006 09:47:36 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/22 09:47:33

Modified files:
	.              : ChangeLog 
	javax/swing    : JLabel.java 

Log message:
	2006-06-22  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JLabel.java
		(setDisplayedMnemonic(int)): Fire property change event AFTER updating 
		field,
		(setDisplayedMnemonicIndex): Modified argument checking to handle case
		where label text is null.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7907&r2=1.7908
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JLabel.java?cvsroot=classpath&r1=1.37&r2=1.38

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7907
retrieving revision 1.7908
diff -u -b -r1.7907 -r1.7908
--- ChangeLog	22 Jun 2006 09:04:14 -0000	1.7907
+++ ChangeLog	22 Jun 2006 09:47:31 -0000	1.7908
@@ -1,6 +1,14 @@
 2006-06-22  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* javax/swing/JLabel.java
+	(setDisplayedMnemonic(int)): Fire property change event AFTER updating 
+	field,
+	(setDisplayedMnemonicIndex): Modified argument checking to handle case
+	where label text is null.
+
+2006-06-22  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/JLabel.java
 	(setDisplayedMnemonic): Updated API docs,
 	(getDisplayedMnemonic): Removed unnecessary type-cast,
 	(setDisplayedMnemonicIndex): Removed unnecessary validation, 

Index: javax/swing/JLabel.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/JLabel.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- javax/swing/JLabel.java	22 Jun 2006 09:04:15 -0000	1.37
+++ javax/swing/JLabel.java	22 Jun 2006 09:47:32 -0000	1.38
@@ -622,9 +622,9 @@
   {
     if (displayedMnemonic != mnemonic)
       {
-        firePropertyChange("displayedMnemonic", displayedMnemonic, mnemonic);
+        int old = displayedMnemonic;
         displayedMnemonic = mnemonic;
-
+        firePropertyChange("displayedMnemonic", old, displayedMnemonic);
         if (text != null)
           setDisplayedMnemonicIndex(text.toUpperCase().indexOf(mnemonic));
       }
@@ -677,7 +677,10 @@
   public void setDisplayedMnemonicIndex(int newIndex)
     throws IllegalArgumentException
   {
-    if (newIndex < -1 || (text != null && newIndex >= text.length()))
+    int maxValid = -1;
+    if (text != null)
+      maxValid = text.length() - 1;
+    if (newIndex < -1 || newIndex > maxValid)
       throw new IllegalArgumentException();
 
     if (newIndex != displayedMnemonicIndex)



From MAILER-DAEMON Thu Jun 22 07:12:55 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtN7H-00075x-Jv
	for mharc-commit-classpath@gnu.org; Thu, 22 Jun 2006 07:12:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtN7G-00074l-EL
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 07:12:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtN7E-00072y-Qu
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 07:12:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtN7E-00072n-Nu
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 07:12:52 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtNIC-0008Pz-AA
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 07:24:12 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtN7E-0002Rq-00
	for <commit-classpath@gnu.org>; Thu, 22 Jun 2006 07:12:52 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FtN7C-0002Rj-T8
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:12:51 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtN7C-0002Rj-T8@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Thu, 22 Jun 2006 11:12:50 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JLabel.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2006 11:12:54 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/22 11:12:50

Modified files:
	.              : ChangeLog 
	javax/swing    : JLabel.java 

Log message:
	2006-06-22  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JLabel.java
		(getText): Updated API docs,
		(setText): Corrected the check for an unchanged value, and the update 
		of the displayedMnemonicIndex.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7908&r2=1.7909
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JLabel.java?cvsroot=classpath&r1=1.38&r2=1.39



From MAILER-DAEMON Thu Jun 22 09:21:11 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtP7P-0005Xy-Pd
	for mharc-commit-classpath@gnu.org; Thu, 22 Jun 2006 09:21:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtP7O-0005Xh-5t
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 09:21:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtP7L-0005XL-Vw
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 09:21:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtP7L-0005XI-R3
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 09:21:07 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtPIK-0003Pz-II
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 09:32:28 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtP7J-0001zB-00
	for <commit-classpath@gnu.org>; Thu, 22 Jun 2006 09:21:05 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1FtP7I-0001z6-KT
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 13:21:05 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtP7I-0001z6-KT@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Thu, 22 Jun 2006 13:21:04 +0000
Subject: [commit-cp] classpath/javax/swing JMenu.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2006 13:21:10 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/22 13:21:04

Modified files:
	javax/swing    : JMenu.java 
	.              : ChangeLog 

Log message:
	2006-06-22  Robert Schuster  <robertschuster@fsfe.org>
	
	        * javax/swing/JMenu.java:
	        (removeAll): Added check for popupMenu not being null.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JMenu.java?cvsroot=classpath&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7909&r2=1.7910



From MAILER-DAEMON Thu Jun 22 10:25:55 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtQ83-0004eW-5D
	for mharc-commit-classpath@gnu.org; Thu, 22 Jun 2006 10:25:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtQ81-0004dT-FT
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 10:25:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtQ7z-0004ci-Mg
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 10:25:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtQ7z-0004cd-GF
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 10:25:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtQIy-0000Sr-O5
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 10:37:12 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtQ7y-0005dq-00
	for <commit-classpath@gnu.org>; Thu, 22 Jun 2006 10:25:50 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FtQ7w-0005dk-HG
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 14:25:49 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtQ7w-0005dk-HG@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Thu, 22 Jun 2006 14:25:48 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2006 14:25:54 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/22 14:25:48

Modified files:
	.              : ChangeLog 
	javax/swing/plaf/basic: BasicLabelUI.java 

Log message:
	2006-06-22  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/plaf/basic/BasicLabelUI.java
		(installKeyboardActions): Implemented,
		(uninstallKeyboardActions): Implemented,
		(propertyChange): Add handling for 'displayedMnemonic' and 'labelFor'
		properties.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7910&r2=1.7911
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicLabelUI.java?cvsroot=classpath&r1=1.23&r2=1.24



From MAILER-DAEMON Thu Jun 22 11:06:02 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtQkr-00045S-Th
	for mharc-commit-classpath@gnu.org; Thu, 22 Jun 2006 11:06:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtQkq-00044O-H2
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:06:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtQkp-00043y-1g
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:06:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtQko-00043v-Tw
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:05:58 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtQvo-00044o-KT
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:17:20 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtQkn-0000e8-00
	for <commit-classpath@gnu.org>; Thu, 22 Jun 2006 11:05:57 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FtQkn-0000e4-I0
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 15:05:57 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtQkn-0000e4-I0@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Thu, 22 Jun 2006 15:05:57 +0000
Subject: [commit-cp] classpath/javax/swing/text PlainDocument.java C...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2006 15:06:00 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/22 15:05:57

Modified files:
	javax/swing/text: PlainDocument.java 
	.              : ChangeLog 

Log message:
	2006-06-22  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/text/PlainDocument.java
		(rootElement): Changed type to Element.
		(tabSize): Removed field. This is stored in the document properties
		instead.
		(PlainDocument): Set tabSize property. Init rootElement without
		cast.
		(insertUpdate): Rewritten. The previous implementation did not
		handle some corner cases properly and was a mess.
		(removeUpdate): Cast rootElement to BranchElement.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/PlainDocument.java?cvsroot=classpath&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7911&r2=1.7912



From MAILER-DAEMON Thu Jun 22 11:14:06 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtQsg-0006zc-2J
	for mharc-commit-classpath@gnu.org; Thu, 22 Jun 2006 11:14:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtQsf-0006zM-E1
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:14:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtQsf-0006z5-2F
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:14:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtQse-0006z2-Rv
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:14:04 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtR3e-0004wX-T4
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:25:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtQse-0001Dh-00
	for <commit-classpath@gnu.org>; Thu, 22 Jun 2006 11:14:04 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FtQsd-0001Da-27
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 15:14:03 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtQsd-0001Da-27@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Thu, 22 Jun 2006 15:14:03 +0000
Subject: [commit-cp] classpath/javax/swing/text AbstractDocument.jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2006 15:14:05 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/22 15:14:03

Modified files:
	javax/swing/text: AbstractDocument.java 
	.              : ChangeLog 

Log message:
	2006-06-22  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/text/AbstractDocument.java
		(AbstractDocument): Set the i18n document property.
		(removeImpl): Added checks for correct boundaries.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/AbstractDocument.java?cvsroot=classpath&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7912&r2=1.7913



From MAILER-DAEMON Thu Jun 22 11:18:55 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtQxL-0001yz-B1
	for mharc-commit-classpath@gnu.org; Thu, 22 Jun 2006 11:18:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtQxJ-0001xZ-Tb
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:18:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtQxJ-0001x2-CR
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:18:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtQxJ-0001wq-60
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:18:53 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtR8J-0005Wx-5v
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:30:15 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtQxI-0001ba-00
	for <commit-classpath@gnu.org>; Thu, 22 Jun 2006 11:18:52 -0400
Received: from rschuster by savannah.gnu.org with local (Exim 4.50)
	id 1FtQxH-0001bT-Mh
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 15:18:51 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtQxH-0001bT-Mh@savannah.gnu.org>
From: Robert Schuster <theBohemian@gmx.net>
Date: Thu, 22 Jun 2006 15:18:51 +0000
Subject: [commit-cp] classpath/java/awt Insets.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2006 15:18:54 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Robert Schuster <rschuster>	06/06/22 15:18:51

Modified files:
	java/awt       : Insets.java 
	.              : ChangeLog 

Log message:
	2006-06-22  Robert Schuster  <robertschuster@fsfe.org>
	
	        * java/awt/Insets.java: Updated copyright year.
	        (toString): Changed string, removed a line from the
	        documentation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Insets.java?cvsroot=classpath&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7913&r2=1.7914



From MAILER-DAEMON Thu Jun 22 11:45:03 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtRMc-00050n-R4
	for mharc-commit-classpath@gnu.org; Thu, 22 Jun 2006 11:45:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtRMa-0004zG-U8
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:45:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtRMY-0004yE-Br
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:45:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtRMY-0004yB-5q
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:44:58 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtRXW-0008Iu-Sj
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 11:56:19 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtRMT-0004Ly-00
	for <commit-classpath@gnu.org>; Thu, 22 Jun 2006 11:44:53 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FtRMS-0004Lr-1r
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 15:44:53 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtRMS-0004Lr-1r@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Thu, 22 Jun 2006 15:44:52 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JLabel.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2006 15:45:01 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/22 15:44:51

Modified files:
	.              : ChangeLog 
	javax/swing    : JLabel.java 

Log message:
	2006-06-22  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JLabel.java: Updated API docs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7914&r2=1.7915
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JLabel.java?cvsroot=classpath&r1=1.39&r2=1.40



From MAILER-DAEMON Thu Jun 22 17:00:32 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtWHv-0006dK-Rd
	for mharc-commit-classpath@gnu.org; Thu, 22 Jun 2006 17:00:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtWHu-0006ce-PG
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 17:00:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtWHt-0006be-0q
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 17:00:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtWHs-0006bV-Tg
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 17:00:28 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtWSv-0001w1-WC
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 17:11:54 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtWHo-0004rI-00
	for <commit-classpath@gnu.org>; Thu, 22 Jun 2006 17:00:24 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FtWHn-0004rF-76
	for commit-classpath@gnu.org; Thu, 22 Jun 2006 21:00:24 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtWHn-0004rF-76@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Thu, 22 Jun 2006 21:00:23 +0000
Subject: [commit-cp] classpath/javax/swing JComponent.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2006 21:00:31 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/22 21:00:23

Modified files:
	javax/swing    : JComponent.java 
	.              : ChangeLog 

Log message:
	2006-06-22  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/JComponent.java
		(vetoableChangeSupport): New field.
		(removeVetoableChangeListener): Rewritten to use
		vetoableChangeSupport.
		(addVetoableChangeListener): Rewritten to use
		vetoableChangeSupport.
		(fireVetoableChange): Rewritten to use
		vetoableChangeSupport.
		(addPropertyChangeListener): Removed. This is handled in
		Component already.
		(firePropertyChange(String,boolean,boolean)): Likewise.
		(firePropertyChange(String,char,char)): Likewise.
		(firePropertyChange(String,int,int)): Likewise.
		(revalidate): Don't do anything when the commponent has no
		parent.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.129&r2=1.130
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7915&r2=1.7916



From MAILER-DAEMON Fri Jun 23 07:00:18 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtjOb-0001VK-WA
	for mharc-commit-classpath@gnu.org; Fri, 23 Jun 2006 07:00:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtjOZ-0001V1-Sn
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 07:00:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtjOY-0001T5-DR
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 07:00:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtjOY-0001St-6e
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 07:00:14 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtjZj-0007Wo-Hq
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 07:11:47 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtjOX-0000Rw-00
	for <commit-classpath@gnu.org>; Fri, 23 Jun 2006 07:00:13 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FtjOV-0000Rl-Ul
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 11:00:13 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtjOV-0000Rl-Ul@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Fri, 23 Jun 2006 11:00:11 +0000
Subject: [commit-cp] classpath/java/awt Container.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jun 2006 11:00:16 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/23 11:00:11

Modified files:
	java/awt       : Container.java 
	.              : ChangeLog 

Log message:
	2006-06-22  Roman Kennke  <kennke@aicas.com>
	
		* java/awt/Container.java
		(getComponentZOrder): Use ncomponents instead of
		component.length so that we don't consider the empty space
		after the last component.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Container.java?cvsroot=classpath&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7916&r2=1.7917



From MAILER-DAEMON Fri Jun 23 07:08:33 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtjWb-0004pg-JD
	for mharc-commit-classpath@gnu.org; Fri, 23 Jun 2006 07:08:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtjWa-0004oz-8e
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 07:08:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtjWZ-0004oB-9b
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 07:08:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtjWY-0004o4-Vg
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 07:08:31 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ftjhk-00087I-3r
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 07:20:04 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtjWX-0001Cr-00
	for <commit-classpath@gnu.org>; Fri, 23 Jun 2006 07:08:29 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FtjWW-0001Cf-5L
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 11:08:29 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtjWW-0001Cf-5L@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Fri, 23 Jun 2006 11:08:28 +0000
Subject: [commit-cp] classpath/javax/swing JLayeredPane.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jun 2006 11:08:32 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/23 11:08:28

Modified files:
	javax/swing    : JLayeredPane.java 
	.              : ChangeLog 

Log message:
	2006-06-23  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/JLayeredPane.java
		(getPosition): Moved code around to avoid unnecessary method calls.
		(setPosition): Delegate to setLayer().
		(insertIndexForLayer(int,int)): Delegate to new private helper method.
		(insertIndexForLayer(Component,int,int)): New helper method
		to support the use of setComponentZOrder() which doesn't remove
		the component and thus the insertIndexForLayer must ignore
		the component to be moved to get the index right.
		(setLayer): Added check to prevent unnecessary execution of
		method body. Changed to update the component order here.
		Added repaint() to make sure that the update becomes visible.
		(addImpl): Call setLayer() only when a constraint has been specified.
		Validate and repaint the JLayeredPane.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JLayeredPane.java?cvsroot=classpath&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7917&r2=1.7918



From MAILER-DAEMON Fri Jun 23 08:24:43 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtkiJ-0000NW-QR
	for mharc-commit-classpath@gnu.org; Fri, 23 Jun 2006 08:24:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtkiI-0000NF-LL
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 08:24:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtkiH-0000MH-Al
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 08:24:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtkiH-0000ME-3c
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 08:24:41 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtktT-00066U-Cu
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 08:36:15 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtkiG-0007DA-00
	for <commit-classpath@gnu.org>; Fri, 23 Jun 2006 08:24:40 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FtkiE-0007D7-Kh
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 12:24:40 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtkiE-0007D7-Kh@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Fri, 23 Jun 2006 12:24:38 +0000
Subject: [commit-cp] classpath/javax/swing JInternalFrame.java Chang...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jun 2006 12:24:42 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/23 12:24:38

Modified files:
	javax/swing    : JInternalFrame.java 
	.              : ChangeLog 

Log message:
	2006-06-23  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/JInternalFrame.java
		(maxTransition): Removed.
		(JInternalFrame): Set maxium=false. Initialize desktopIcon here.
		Don't initialize storedBounds here.
		(dipose): Rewritten to correctly dispose the JInternalFrame.
		(getDesktopIcon): Don't initialize desktopIcon here.
		(getLayer): Delegate to JLayeredPane.getLayer().
		(getNormalBounds): Return bounds when storedBounds == null,
		otherwise storedBounds.
		(hide): Don't change selection. Also hide the desktopIcon.
		(moveToBack): Call getParent() only once.
		(moveToFront): Call getParent() only once.
		(pack): Call validate() to make sure that the layout is
		propagated to the children.
		(setClosed): Fire InternalFrameEvent first, before the
		PropertyVetoEvent.
		(setJMenuBar): Fire PropertyChangeEvent for this property.
		(setLayer): Delegate to JLayeredPane.
		(setLayeredPane): Check for null and throw IllegalArgumenException.
		(setMaximum): Remove handling of maxTransition and normalBounds.
		Should probably be done in the UI.
		(setNormalBounds): Store Rectangle object directly, not a copy.
		(setRootPane): Go into rootPaneCheckingEnabled mode so that
		adding the RootPane doesn't add it to the contentPane.
		Fire PropertyChangeEvent.
		(setSelected): Added condition for when this property must not
		be changed.
		(show): Don't ask the DesktopPane to select the frame. Moved
		code around to fire InternalFrameEvent before actually calling
		super.show(). Also make the desktopIcon visible.
		(setTitle): Fire PropertyChangeEvent unconditionally.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JInternalFrame.java?cvsroot=classpath&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7918&r2=1.7919



From MAILER-DAEMON Fri Jun 23 08:28:39 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ftkm7-0001Vu-5o
	for mharc-commit-classpath@gnu.org; Fri, 23 Jun 2006 08:28:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ftkm5-0001VS-0m
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 08:28:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ftkm3-0001VG-EM
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 08:28:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ftkm3-0001VD-78
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 08:28:35 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtkxF-0006Nc-H4
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 08:40:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ftkm2-0007GG-00
	for <commit-classpath@gnu.org>; Fri, 23 Jun 2006 08:28:34 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Ftkm1-0007GD-DN
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 12:28:34 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ftkm1-0007GD-DN@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Fri, 23 Jun 2006 12:28:33 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/basic BasicInternalF...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jun 2006 12:28:37 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/23 12:28:33

Modified files:
	javax/swing/plaf/basic: BasicInternalFrameUI.java 
	.              : ChangeLog 

Log message:
	2006-06-23  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/plaf/basic/BasicInternalFrameUI.java
		(InternalFramePropertyChangeListener.propertyChange):
		Don't call getPropertyName() repeatedly. Added null checks
		to avoid NPEs. Call closeFrame() if the closed property
		changes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java?cvsroot=classpath&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7919&r2=1.7920



From MAILER-DAEMON Fri Jun 23 13:24:26 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtpOM-00044E-0O
	for mharc-commit-classpath@gnu.org; Fri, 23 Jun 2006 13:24:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtpOK-00042l-ES
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 13:24:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtpOI-00041U-Im
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 13:24:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtpOI-00041M-AR
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 13:24:22 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtpZX-0003re-G9
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 13:35:59 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtpOH-0005Kh-00
	for <commit-classpath@gnu.org>; Fri, 23 Jun 2006 13:24:21 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1FtpOG-0005KW-BP
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 17:24:21 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtpOG-0005KW-BP@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Fri, 23 Jun 2006 17:24:20 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/TextField.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jun 2006 17:24:24 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/23 17:24:20

Modified files:
	.              : ChangeLog 
	java/awt       : TextField.java 

Log message:
		2006-06-23  Tania Bento  <tbento@redhat.com>
	
	        * java/awt/TextField.java
	        (TextField): Default number of columns should be 0, not 1.
	        (TextField): Check if number of columns given as argument
	        is valid (>= 0) and set the number of columns accordingly.
	        (TextField): Check if the string passed is null. If it is,
	        set columns to 0, else columns is set to the length of
	        the string.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7920&r2=1.7921
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/TextField.java?cvsroot=classpath&r1=1.17&r2=1.18



From MAILER-DAEMON Fri Jun 23 16:23:51 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FtsBz-0004Eo-BF
	for mharc-commit-classpath@gnu.org; Fri, 23 Jun 2006 16:23:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FtsBy-0004Eb-6H
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 16:23:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FtsBv-0004EP-Oz
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 16:23:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FtsBv-0004EM-7W
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 16:23:47 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtsNC-0008LX-5W
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 16:35:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtsBu-0001WX-00
	for <commit-classpath@gnu.org>; Fri, 23 Jun 2006 16:23:46 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FtsBt-0001WQ-S1
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 20:23:46 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtsBt-0001WQ-S1@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 23 Jun 2006 20:23:45 +0000
Subject: [commit-cp] classpath/java/util/logging LogManager.java Cha...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jun 2006 20:23:50 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/23 20:23:45

Modified files:
	java/util/logging: LogManager.java 
	.              : ChangeLog 
Added files:
	java/util/logging: LoggingMXBean.java 

Log message:
		* java/util/logging/LoggingMXBean.java: New file.
		* java/util/logging/LogManager.java (LOGGING_MXBEAN_NAME): New field.
		(loggingBean): New field.
		(getLoggingMXBean): New method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/logging/LogManager.java?cvsroot=classpath&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/logging/LoggingMXBean.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7921&r2=1.7922



From MAILER-DAEMON Fri Jun 23 17:31:23 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FttFK-0001hK-Ri
	for mharc-commit-classpath@gnu.org; Fri, 23 Jun 2006 17:31:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FttFJ-0001h3-6G
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 17:31:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FttFG-0001gr-RJ
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 17:31:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FttFG-0001go-M9
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 17:31:18 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FttQY-0005lb-3O
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 17:42:58 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FttFF-0006sW-00
	for <commit-classpath@gnu.org>; Fri, 23 Jun 2006 17:31:17 -0400
Received: from fkung by savannah.gnu.org with local (Exim 4.50)
	id 1FttFE-0006sQ-9c
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 21:31:17 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FttFE-0006sQ-9c@savannah.gnu.org>
From: Francis Kung <fkung@redhat.com>
Date: Fri, 23 Jun 2006 21:31:16 +0000
Subject: [commit-cp] classpath/examples/gnu/classpath/examples/java2...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jun 2006 21:31:21 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Francis Kung <fkung>	06/06/23 21:31:16

Modified files:
	examples/gnu/classpath/examples/java2d: J2dBenchmark.java 
	                                        J2dBenchmarkGUI.java 
	.              : ChangeLog 

Log message:
	2006-06-23  Francis Kung  <fkung@redhat.com>
	
		* examples/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java
		(Harness.actionPerformed): Process additional options.
		(J2dBenchmarkWrapper): Defer init call until after options are processed.
		(J2dBenchmarkWrapper.setAlias): New method.
		(J2dBenchmarkWrapper.setComposite): New method.
		(J2dBenchmarkWrapper.setFill): New method.
		(J2dBenchmarkWrapper.setRotation): New method.
		(J2dBenchmarkWrapper.setShear): New method.
		(J2dBenchmarkWrapper.setStroke): New method.
		(J2dBenchmarkWrapper.setTranslation): New method.
		(run): Add additional options to GUI.
		* examples/gnu/classpath/examples/java2d/J2dBenchmark.java:
		Added protected fields for various options.
		(GraphicsTest.runSet_noClipping): Reset graphics settings between tests.
		(GraphicsTest.runSet_withClipping): Reset graphics settings between tests.
		(GraphicsTest.runSet_zeroClipping): Reset graphics settings between tests.
		(getNextColor): Renamed to setRandom.
		(init): Load additional image for texturing if needed.
		(loadBufferedImage): New method.
		(main): Accept additional command-line switches.
		(prepareGraphics): New method.
		(resetGraphics): New method.
		(runTestSuite): Accept additional image-processing options.
		(setRandom): Renamed from getNextColor; generate various random options
		(test_drawArc): Rename getNextColor to setRandom.
		(test_drawCubic): Likewise.
		(test_drawEllipse): Likewise.
		(test_drawGeneralPath): Likewise.
		(test_drawImage): Likewise.
		(test_drawLine): Likewise.
		(test_drawQuadCurve): Likewise.
		(test_drawRectangle): Likewise.
		(test_drawRoundRectangle): Likewise.
		(test_drawTransparentImage): Likewise.
		(test_fillArc): Rename getNextColor to setRandom.
		(test_fillEllipse): Likewise.
		(test_fillGeneralPath): Likewise.
		(test_fillRectangle): Likewise.
		(test_fillRoundRectangle): Likewise.
		(TestRecorder.getAverage): Round the average time.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/java2d/J2dBenchmark.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7922&r2=1.7923



From MAILER-DAEMON Fri Jun 23 20:09:59 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ftvip-0008D6-3V
	for mharc-commit-classpath@gnu.org; Fri, 23 Jun 2006 20:09:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ftvin-0008Cj-1F
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 20:09:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ftvil-0008CO-Fl
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 20:09:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ftvil-0008CL-BG
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 20:09:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Ftvu4-0007bN-Bm
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 20:21:36 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FtviK-0006CF-00
	for <commit-classpath@gnu.org>; Fri, 23 Jun 2006 20:09:28 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FtviJ-0006C9-PG
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 00:09:28 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FtviJ-0006C9-PG@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sat, 24 Jun 2006 00:09:27 +0000
Subject: [commit-cp] classpath/gnu/java/security prngIRandom.java pr...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jun 2006 00:09:57 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/24 00:09:27

Modified files:
	gnu/java/security/prng: IRandom.java EntropySource.java 
	                        RandomEventListener.java 
	                        PRNGFactory.java RandomEvent.java 
	                        LimitReachedException.java 
	                        MDGenerator.java BasePRNG.java 
	gnu/java/security/util: ExpirableObject.java Util.java 
	                        Sequence.java PRNG.java Base64.java 
	                        SimpleList.java 
	gnu/java/security/sig/rsa: RSAPSSSignatureRawCodec.java 
	                           EMSA_PSS.java RSA.java 
	                           EMSA_PKCS1_V1_5.java 
	                           EME_PKCS1_V1_5.java 
	                           RSAPKCS1V1_5Signature.java 
	                           RSAPSSSignature.java 
	gnu/java/security/sig: SignatureFactory.java 
	                       ISignatureCodec.java ISignature.java 
	                       BaseSignature.java 
	gnu/java/security/provider: PKIXCertPathValidatorImpl.java 
	                            Gnu.java X509CertificateFactory.java 
	.              : ChangeLog 
	gnu/java/security/sig/dss: DSSSignatureRawCodec.java 
	                           DSSSignature.java 

Log message:
	2006-06-24  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/java/security/util/Util.java: Source formatting.
		* gnu/java/security/util/SimpleList.java: Likewise.
		* gnu/java/security/util/Sequence.java: Likewise.
		* gnu/java/security/util/PRNG.java: Likewise.
		* gnu/java/security/util/ExpirableObject.java: Likewise.
		* gnu/java/security/util/Base64.java: Likewise.
		* gnu/java/security/sig/SignatureFactory.java: Likewise.
		* gnu/java/security/sig/ISignatureCodec.java: Likewise.
		* gnu/java/security/sig/ISignature.java: Likewise.
		* gnu/java/security/sig/BaseSignature.java: Likewise.
		* gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java: Likewise.
		* gnu/java/security/sig/rsa/RSAPSSSignature.java: Likewise.
		* gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java: Likewise.
		* gnu/java/security/sig/rsa/RSA.java: Likewise.
		* gnu/java/security/sig/rsa/EMSA_PSS.java: Likewise.
		* gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java: Likewise.
		* gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java: Likewise.
		* gnu/java/security/sig/dss/DSSSignatureRawCodec.java: Likewise.
		* gnu/java/security/sig/dss/DSSSignature.java: Likewise.
		* gnu/java/security/provider/X509CertificateFactory.java: Likewise.
		* gnu/java/security/provider/PKIXCertPathValidatorImpl.java: Likewise.
		* gnu/java/security/provider/Gnu.java: Likewise.
		* gnu/java/security/prng/RandomEventListener.java: Likewise.
		* gnu/java/security/prng/RandomEvent.java: Likewise.
		* gnu/java/security/prng/PRNGFactory.java: Likewise.
		* gnu/java/security/prng/MDGenerator.java: Likewise.
		* gnu/java/security/prng/LimitReachedException.java: Likewise.
		* gnu/java/security/prng/IRandom.java: Likewise.
		* gnu/java/security/prng/EntropySource.java: Likewise.
		* gnu/java/security/prng/BasePRNG.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/IRandom.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/EntropySource.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/RandomEventListener.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/PRNGFactory.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/RandomEvent.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/LimitReachedException.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/MDGenerator.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/BasePRNG.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/ExpirableObject.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/Util.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/Sequence.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/PRNG.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/Base64.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/SimpleList.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/RSA.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/SignatureFactory.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/ISignatureCodec.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/ISignature.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/BaseSignature.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java?cvsroot=classpath&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/provider/Gnu.java?cvsroot=classpath&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/provider/X509CertificateFactory.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7923&r2=1.7924
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/dss/DSSSignatureRawCodec.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/dss/DSSSignature.java?cvsroot=classpath&r1=1.2&r2=1.3



From MAILER-DAEMON Fri Jun 23 20:12:22 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ftvl8-00009t-H5
	for mharc-commit-classpath@gnu.org; Fri, 23 Jun 2006 20:12:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ftvl6-00009a-Uh
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 20:12:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ftvl5-00009O-Hu
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 20:12:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ftvl5-00009K-CG
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 20:12:19 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FtvwO-0007iP-IS
	for commit-classpath@gnu.org; Fri, 23 Jun 2006 20:24:00 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Ftvl4-0006Me-00
	for <commit-classpath@gnu.org>; Fri, 23 Jun 2006 20:12:18 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1Ftvl3-0006MX-5o
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 00:12:18 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Ftvl3-0006MX-5o@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sat, 24 Jun 2006 00:12:17 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/security/Propertie...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jun 2006 00:12:21 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/24 00:12:17

Modified files:
	.              : ChangeLog 
	gnu/java/security: Properties.java Registry.java 

Log message:
	2006-06-24  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/java/security/Properties.java: Source formatting.
		* gnu/java/security/Registry.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7924&r2=1.7925
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/Properties.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/Registry.java?cvsroot=classpath&r1=1.6&r2=1.7



From MAILER-DAEMON Sat Jun 24 17:20:39 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FuFYV-0001nZ-3J
	for mharc-commit-classpath@gnu.org; Sat, 24 Jun 2006 17:20:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FuFYT-0001lz-OV
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 17:20:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FuFYS-0001jt-CM
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 17:20:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FuFYS-0001jo-A0
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 17:20:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FuFjx-0003r2-Lu
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 17:32:29 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FuFYR-0003ur-00
	for <commit-classpath@gnu.org>; Sat, 24 Jun 2006 17:20:35 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FuFYQ-0003ui-Ox
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 21:20:35 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FuFYQ-0003ui-Ox@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sat, 24 Jun 2006 21:20:34 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/lang/management/Ru...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jun 2006 21:20:38 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/24 21:20:34

Modified files:
	.              : ChangeLog 
	gnu/java/lang/management: RuntimeMXBeanImpl.java 

Log message:
	2006-06-24  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* gnu/java/lang/management/RuntimeMXBeanImpl.java:
		(isBootClassPathSupported()): Use SystemProperties
		rather than System.getProperty.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7925&r2=1.7926
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/lang/management/RuntimeMXBeanImpl.java?cvsroot=classpath&r1=1.1&r2=1.2



From MAILER-DAEMON Sat Jun 24 20:52:38 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FuIre-0003BX-R4
	for mharc-commit-classpath@gnu.org; Sat, 24 Jun 2006 20:52:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FuIrd-0003BS-Gu
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 20:52:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FuIrd-0003BG-3E
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 20:52:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FuIrd-0003BD-0O
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 20:52:37 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FuJ3A-0003eq-AP
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 21:04:32 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FuIrc-00086o-00
	for <commit-classpath@gnu.org>; Sat, 24 Jun 2006 20:52:36 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FuIra-00086c-Os
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 00:52:36 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FuIra-00086c-Os@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 25 Jun 2006 00:52:34 +0000
Subject: [commit-cp] classpath ChangeLog NEWS doc/vmintegration.texi...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jun 2006 00:52:37 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/25 00:52:34

Modified files:
	.              : ChangeLog NEWS 
	doc            : vmintegration.texinfo 
	java/lang/management: ManagementFactory.java 
Added files:
	gnu/java/lang/management: ClassLoadingMXBeanImpl.java 
	java/lang/management: ClassLoadingMXBean.java 
	vm/reference/gnu/java/lang/management: 
	                                       VMClassLoadingMXBeanImpl.java 

Log message:
	2006-06-24  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* NEWS,
		* doc/vmintegration.texinfo:
		Updated with information on new VM interface.
		* gnu/java/lang/management/ClassLoadingMXBeanImpl.java,
		* java/lang/management/ClassLoadingMXBean.java:
		New files implementing the class loading bean.
		* java/lang/management/ManagementFactory.java:
		(getClassLoadingMXBean()): Implemented.
		* vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java:
		New VM interface file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7926&r2=1.7927
http://cvs.savannah.gnu.org/viewcvs/classpath/NEWS?cvsroot=classpath&r1=1.151&r2=1.152
http://cvs.savannah.gnu.org/viewcvs/classpath/doc/vmintegration.texinfo?cvsroot=classpath&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/lang/management/ClassLoadingMXBeanImpl.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ManagementFactory.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ClassLoadingMXBean.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java?cvsroot=classpath&rev=1.1



From MAILER-DAEMON Sat Jun 24 22:07:54 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FuK2T-0000K0-Vr
	for mharc-commit-classpath@gnu.org; Sat, 24 Jun 2006 22:07:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FuK2S-0000Hi-Rt
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 22:07:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FuK2R-0000Fh-Nw
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 22:07:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FuK2R-0000F6-Gr
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 22:07:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FuKDz-0002nD-Jz
	for commit-classpath@gnu.org; Sat, 24 Jun 2006 22:19:47 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FuK2M-0005vO-00
	for <commit-classpath@gnu.org>; Sat, 24 Jun 2006 22:07:46 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FuK2L-0005vJ-HB
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 02:07:46 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FuK2L-0005vJ-HB@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sun, 25 Jun 2006 02:07:45 +0000
Subject: [commit-cp] classpath/gnu/javax/crypto/assembly CascadeStag...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jun 2006 02:07:53 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/25 02:07:45

Modified files:
	gnu/javax/crypto/assembly: CascadeStage.java Operation.java 
	                           CascadeTransformer.java Stage.java 
	                           LoopbackTransformer.java 
	                           TransformerException.java 
	                           Direction.java 
	                           DeflateTransformer.java Assembly.java 
	                           ModeStage.java Transformer.java 
	                           Cascade.java PaddingTransformer.java 
	.              : ChangeLog 

Log message:
	2006-06-25  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/javax/crypto/assembly/TransformerException.java: Source formatting.
		* gnu/javax/crypto/assembly/Transformer.java: Likewise.
		* gnu/javax/crypto/assembly/Stage.java: Likewise.
		* gnu/javax/crypto/assembly/PaddingTransformer.java: Likewise.
		* gnu/javax/crypto/assembly/Operation.java: Likewise.
		* gnu/javax/crypto/assembly/ModeStage.java: Likewise.
		* gnu/javax/crypto/assembly/LoopbackTransformer.java: Likewise.
		* gnu/javax/crypto/assembly/Direction.java: Likewise.
		* gnu/javax/crypto/assembly/DeflateTransformer.java: Likewise.
		* gnu/javax/crypto/assembly/CascadeTransformer.java: Likewise.
		* gnu/javax/crypto/assembly/CascadeStage.java: Likewise.
		* gnu/javax/crypto/assembly/Cascade.java: Likewise.
		* gnu/javax/crypto/assembly/Assembly.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/CascadeStage.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Operation.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/CascadeTransformer.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Stage.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/LoopbackTransformer.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/TransformerException.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Direction.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/DeflateTransformer.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Assembly.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/ModeStage.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Transformer.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Cascade.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/PaddingTransformer.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7927&r2=1.7928



From MAILER-DAEMON Sun Jun 25 08:01:47 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FuTJC-0000EH-GF
	for mharc-commit-classpath@gnu.org; Sun, 25 Jun 2006 08:01:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FuTJA-0000BR-C1
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 08:01:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FuTJ8-00009i-Qg
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 08:01:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FuTJ8-00009J-Hl
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 08:01:42 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FuTUm-0001Lp-2Y
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 08:13:44 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FuTJ5-0004RU-00
	for <commit-classpath@gnu.org>; Sun, 25 Jun 2006 08:01:39 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FuTJ4-0004RQ-OB
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 12:01:39 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FuTJ4-0004RQ-OB@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Sun, 25 Jun 2006 12:01:38 +0000
Subject: [commit-cp] classpath/gnu/javax/crypto/cipher Twofish.java ...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jun 2006 12:01:44 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/25 12:01:38

Modified files:
	gnu/javax/crypto/cipher: Twofish.java Cast5.java Blowfish.java 
	                         BaseCipher.java DES.java 
	                         IBlockCipher.java Square.java 
	                         CipherFactory.java Anubis.java 
	                         TripleDES.java NullCipher.java 
	                         Rijndael.java Serpent.java Khazad.java 
	                         IBlockCipherSpi.java 
	                         WeakKeyException.java 
	.              : ChangeLog 

Log message:
	2006-06-25  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/javax/crypto/cipher/WeakKeyException.java: Source formatting.
		* gnu/javax/crypto/cipher/Twofish.java: Likewise.
		* gnu/javax/crypto/cipher/TripleDES.java: Likewise.
		* gnu/javax/crypto/cipher/Square.java: Likewise.
		* gnu/javax/crypto/cipher/Serpent.java: Likewise.
		* gnu/javax/crypto/cipher/Rijndael.java: Likewise.
		* gnu/javax/crypto/cipher/NullCipher.java: Likewise.
		* gnu/javax/crypto/cipher/Khazad.java: Likewise.
		* gnu/javax/crypto/cipher/IBlockCipherSpi.java: Likewise.
		* gnu/javax/crypto/cipher/IBlockCipher.java: Likewise.
		* gnu/javax/crypto/cipher/DES.java: Likewise.
		* gnu/javax/crypto/cipher/CipherFactory.java: Likewise.
		* gnu/javax/crypto/cipher/Cast5.java: Likewise.
		* gnu/javax/crypto/cipher/Blowfish.java: Likewise.
		* gnu/javax/crypto/cipher/BaseCipher.java: Likewise.
		* gnu/javax/crypto/cipher/Anubis.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Twofish.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Cast5.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Blowfish.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/BaseCipher.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/DES.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/IBlockCipher.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Square.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/CipherFactory.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Anubis.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/TripleDES.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/NullCipher.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Rijndael.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Serpent.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Khazad.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/WeakKeyException.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7928&r2=1.7929



From MAILER-DAEMON Sun Jun 25 12:55:01 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FuXsz-0000t7-Kc
	for mharc-commit-classpath@gnu.org; Sun, 25 Jun 2006 12:55:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FuXsy-0000t2-84
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 12:55:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FuXsx-0000sn-Nc
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 12:54:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FuXsx-0000sk-Cm
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 12:54:59 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FuY4e-0007sy-2Z
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 13:07:04 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FuXsw-0004i5-00
	for <commit-classpath@gnu.org>; Sun, 25 Jun 2006 12:54:58 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FuXsv-0004i0-VZ
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 16:54:58 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FuXsv-0004i0-VZ@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sun, 25 Jun 2006 16:54:57 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/lang/management/Cl...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jun 2006 16:55:00 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/25 16:54:57

Modified files:
	.              : ChangeLog 
	gnu/java/lang/management: ClassLoadingMXBeanImpl.java 
	java/lang/management: ClassLoadingMXBean.java 
	vm/reference/gnu/java/lang/management: 
	                                       VMClassLoadingMXBeanImpl.java 

Log message:
	2006-06-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* gnu/java/lang/management/ClassLoadingMXBeanImpl.java,
		* java/lang/management/ClassLoadingMXBean.java:
		(getTotalLoadedClassCount()): Corrected return type.
		(getUnloadedClassCount()): Likewise.
		* vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java:
		(getUnloadedClassCount()): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7929&r2=1.7930
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/lang/management/ClassLoadingMXBeanImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ClassLoadingMXBean.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java?cvsroot=classpath&r1=1.1&r2=1.2



From MAILER-DAEMON Sun Jun 25 17:37:09 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FucI1-0002lR-IX
	for mharc-commit-classpath@gnu.org; Sun, 25 Jun 2006 17:37:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FucI0-0002kl-C1
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 17:37:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FucHy-0002iY-Qt
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 17:37:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FucHy-0002iJ-KL
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 17:37:06 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FucTi-0004QE-5S
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 17:49:14 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FucHy-00023D-00
	for <commit-classpath@gnu.org>; Sun, 25 Jun 2006 17:37:06 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FucHw-000237-NN
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 21:37:05 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FucHw-000237-NN@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Sun, 25 Jun 2006 21:37:04 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/text/DefaultCar...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jun 2006 21:37:08 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/25 21:37:04

Modified files:
	.              : ChangeLog 
	javax/swing/text: DefaultCaret.java 

Log message:
	2006-06-25  Carsten Neumann  <cn-develop@gmx.net>
	
	       * javax/swing/text/DefaultCaret.java (isActive): New method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7930&r2=1.7931
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/DefaultCaret.java?cvsroot=classpath&r1=1.42&r2=1.43



From MAILER-DAEMON Mon Jun 26 05:41:45 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FunbF-0001Vk-CS
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 05:41:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FunbD-0001TQ-FS
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 05:41:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Funb7-0001O1-N3
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 05:41:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Funb7-0001No-Ee
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 05:41:37 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Funmx-0001eH-RS
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 05:53:51 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Funb5-0008MT-00
	for <commit-classpath@gnu.org>; Mon, 26 Jun 2006 05:41:35 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Funb4-0008MO-N0
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 09:41:35 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Funb4-0008MO-N0@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Mon, 26 Jun 2006 09:41:34 +0000
Subject: [commit-cp] classpath/javax/swing JComponent.java ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 09:41:43 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/26 09:41:34

Modified files:
	javax/swing    : JComponent.java 
	.              : ChangeLog 

Log message:
	2006-06-26  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/JComponent.java
		(firePropertyChange(String,int,int)): New method. Overrides
		Component method and makes it public.
		(firePropertyChange(String,boolean,boolean)): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.130&r2=1.131
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7932&r2=1.7933



From MAILER-DAEMON Mon Jun 26 08:37:23 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FuqLD-0005L2-5I
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 08:37:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FudMI-0005iS-9r
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 18:45:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FudMH-0005hp-KX
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 18:45:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FudMH-0005he-G3
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 18:45:37 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FudY1-0000nb-Gs
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 18:57:45 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FudMB-0005WP-00
	for <commit-classpath@gnu.org>; Sun, 25 Jun 2006 18:45:31 -0400
Received: from vivekl by savannah.gnu.org with local (Exim 4.50)
	id 1FudMA-0005WL-4x
	for commit-classpath@gnu.org; Sun, 25 Jun 2006 22:45:31 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FudMA-0005WL-4x@savannah.gnu.org>
From: Vivek Lakshmanan <vivekl@redhat.com>
Date: Sun, 25 Jun 2006 22:45:30 +0000
X-Mailman-Approved-At: Mon, 26 Jun 2006 08:37:21 -0400
Subject: [commit-cp] classpath gnu/javax/crypto/key/dhGnuDHKeyPairGe...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jun 2006 22:45:38 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Vivek Lakshmanan <vivekl>	06/06/25 22:45:30

Modified files:
	gnu/javax/crypto/key/dh: GnuDHKeyPairGenerator.java 
	gnu/javax/security/auth/login: GnuConfiguration.java 
	                               ConfigFileTokenizer.java 
	                               ConfigFileParser.java 
	gnu/javax/crypto/cipher: Twofish.java BaseCipher.java 
	                         Rijndael.java Anubis.java Khazad.java 
	gnu/javax/crypto/jce/keyring: GnuKeyring.java 
	gnu/java/security: Properties.java 
	gnu/javax/crypto/keyring: GnuPublicKeyring.java 
	                          GnuPrivateKeyring.java Entry.java 
	                          PasswordEncryptedEntry.java 
	                          PasswordAuthenticatedEntry.java 
	                          EnvelopeEntry.java 
	gnu/java/security/key/rsa: GnuRSAPrivateKey.java 
	                           RSAKeyPairPKCS8Codec.java 
	                           RSAKeyPairX509Codec.java 
	                           RSAKeyPairGenerator.java 
	gnu/javax/crypto/jce/prng: UMacRandomSpi.java ICMRandomSpi.java 
	gnu/java/security/x509: X509CRLEntry.java X509CRL.java 
	gnu/javax/crypto/pad: TBC.java PKCS7.java PKCS1_V1_5.java 
	                      BasePad.java 
	gnu/java/security/hash: Whirlpool.java 
	gnu/javax/crypto/prng: CSPRNG.java 
	lib            : Makefile.am 
	gnu/java/security/key/dss: DSSPrivateKey.java 
	                           DSSKeyPairPKCS8Codec.java 
	                           DSSKeyPairGenerator.java 
	gnu/java/security/x509/ext: Extension.java 
	gnu/javax/crypto/sasl/srp: SRPServer.java SRPClient.java 
	gnu/javax/crypto/key/srp6: SRPKeyPairGenerator.java 
	gnu/java/security/util: Base64.java 
	gnu/java/security/sig/rsa: EMSA_PSS.java RSAPSSSignature.java 
	gnu/java/security/pkcs: PKCS7SignedData.java SignerInfo.java 
	gnu/java/security/jce/sig: SignatureAdapter.java 
	                           EncodedKeyFactory.java 
	gnu/java/security/provider: PKIXCertPathValidatorImpl.java 
	gnu/javax/crypto/sasl: SaslInputStream.java 
	                       SaslOutputStream.java 
	.              : ChangeLog configure.ac 
	gnu/javax/crypto/mac: OMAC.java 
Added files:
	gnu/java/security: Configuration.java.in .cvsignore 

Log message:
	2006-06-25  Vivek Lakshmanan  <vivekl@redhat.com>
		
		* gnu/java/security/.cvsignore: New File.
		* gnu/java/security/Configuration.java.in: New File.
		* gnu/java/security/Properties.java: Change import from 
		gnu.classpath.Configuration to gnu.java.security.Configuration.
		* gnu/java/security/hash/Whirlpool.java: Likewise.
		* gnu/java/security/jce/sig/EncodedKeyFactory.java: Likewise.
		* gnu/java/security/jce/sig/SignatureAdapter.java: Likewise.
		* gnu/java/security/key/dss/DSSKeyPairGenerator.java: Likewise.
		* gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java: Likewise.
		* gnu/java/security/key/dss/DSSPrivateKey.java: Likewise.
		* gnu/java/security/key/rsa/GnuRSAPrivateKey.java: Likewise.
		* gnu/java/security/key/rsa/RSAKeyPairGenerator.java: Likewise.
		* gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java: Likewise.
		* gnu/java/security/key/rsa/RSAKeyPairX509Codec.java: Likewise.
		* gnu/java/security/pkcs/PKCS7SignedData.java: Likewise.
		* gnu/java/security/pkcs/SignerInfo.java: Likewise.
		* gnu/java/security/provider/PKIXCertPathValidatorImpl.java: Likewise.
		* gnu/java/security/sig/rsa/EMSA_PSS.java: Likewise.
		* gnu/java/security/sig/rsa/RSAPSSSignature.java: Likewise.
		* gnu/java/security/util/Base64.java: Likewise.
		* gnu/java/security/x509/X509CRL.java: Likewise.
		* gnu/java/security/x509/X509CRLEntry.java: Likewise.
		* gnu/java/security/x509/ext/Extension.java: Likewise.
		* gnu/javax/crypto/cipher/Anubis.java: Likewise.
		* gnu/javax/crypto/cipher/BaseCipher.java: Likewise.
		* gnu/javax/crypto/cipher/Khazad.java: Likewise.
		* gnu/javax/crypto/cipher/Rijndael.java: Likewise.
		* gnu/javax/crypto/cipher/Twofish.java: Likewise.
		* gnu/javax/crypto/jce/keyring/GnuKeyring.java: Likewise.
		* gnu/javax/crypto/jce/prng/ICMRandomSpi.java: Likewise.
		* gnu/javax/crypto/jce/prng/UMacRandomSpi.java: Likewise.
		* gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java: Likewise.
		* gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java: Likewise.
		* gnu/javax/crypto/keyring/Entry.java: Likewise.
		* gnu/javax/crypto/keyring/EnvelopeEntry.java: Likewise.
		* gnu/javax/crypto/keyring/GnuPrivateKeyring.java: Likewise.
		* gnu/javax/crypto/keyring/GnuPublicKeyring.java: Likewise.
		* gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java: Likewise.
		* gnu/javax/crypto/keyring/PasswordEncryptedEntry.java: Likewise.
		* gnu/javax/crypto/mac/OMAC.java: Likewise.
		* gnu/javax/crypto/pad/BasePad.java: Likewise.
		* gnu/javax/crypto/pad/PKCS1_V1_5.java: Likewise.
		* gnu/javax/crypto/pad/PKCS7.java: Likewise.
		* gnu/javax/crypto/pad/TBC.java: Likewise.
		* gnu/javax/crypto/prng/CSPRNG.java: Likewise.
		* gnu/javax/crypto/sasl/SaslInputStream.java: Likewise.
		* gnu/javax/crypto/sasl/SaslOutputStream.java: Likewise.
		* gnu/javax/crypto/sasl/srp/SRPClient.java: Likewise.
		* gnu/javax/crypto/sasl/srp/SRPServer.java: Likewise.
		* gnu/javax/security/auth/login/ConfigFileParser.java: Likewise.
		* gnu/javax/security/auth/login/ConfigFileTokenizer.java: Likewise.
		* gnu/javax/security/auth/login/GnuConfiguration.java 
		(getAppConfigurationEntry): Change reference to 
		gnu.classpath.Configuration.DEBUG to
		gnu.java.security.Configuration.DEBUG.
		(getConfigFromUserHome): Likewise.
		(getInputStreamFromURL): Likewise.
		(getUserHome): Likewise.
		(init): Likewise.
		(processSecurityProperties): Likewise.
		(processSystemProperty): Likewise.
		(processUserHome): Likewise.
		* configure.ac: Add gnu/java/security/Configuration.java to
		AC_CONFIG_FILES list.
		* lib/Makefile.am: Remove gnu/java/security/Configuration.java when
		required.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/login/GnuConfiguration.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/login/ConfigFileParser.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Twofish.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/BaseCipher.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Rijndael.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Anubis.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Khazad.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/Properties.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/Configuration.java.in?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/.cvsignore?cvsroot=classpath&rev=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/GnuPublicKeyring.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/GnuPrivateKeyring.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/Entry.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/X509CRLEntry.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/X509CRL.java?cvsroot=classpath&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/TBC.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/PKCS7.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/BasePad.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Whirlpool.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/prng/CSPRNG.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/Makefile.am?cvsroot=classpath&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSPrivateKey.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/ext/Extension.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/Base64.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/pkcs/PKCS7SignedData.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/pkcs/SignerInfo.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/SignatureAdapter.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/EncodedKeyFactory.java?cvsroot=classpath&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java?cvsroot=classpath&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/SaslInputStream.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7931&r2=1.7932
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&r1=1.163&r2=1.164
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mac/OMAC.java?cvsroot=classpath&r1=1.3&r2=1.4



From MAILER-DAEMON Mon Jun 26 09:23:48 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fur48-0001q6-Gx
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 09:23:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fur46-0001oq-4J
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 09:23:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fur44-0001oW-GT
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 09:23:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fur44-0001oM-CW
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 09:23:44 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FurFv-0004iu-N4
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 09:36:00 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fur3r-0007KA-00
	for <commit-classpath@gnu.org>; Mon, 26 Jun 2006 09:23:31 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1Fur3p-0007Jz-VO
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 13:23:31 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fur3p-0007Jz-VO@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Mon, 26 Jun 2006 13:23:29 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JList.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 13:23:46 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/26 13:23:29

Modified files:
	.              : ChangeLog 
	javax/swing    : JList.java 

Log message:
	2006-06-26  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JList.java
		(setLayoutOrientation): Check for valid argument.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7933&r2=1.7934
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JList.java?cvsroot=classpath&r1=1.55&r2=1.56



From MAILER-DAEMON Mon Jun 26 09:30:28 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FurAa-0004pt-29
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 09:30:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FurAX-0004n6-6z
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 09:30:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FurAW-0004mr-Gc
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 09:30:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FurAW-0004mo-CA
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 09:30:24 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FurMO-0005GD-Or
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 09:42:41 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FurAP-0007mn-00
	for <commit-classpath@gnu.org>; Mon, 26 Jun 2006 09:30:17 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FurAN-0007me-DA
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 13:30:16 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FurAN-0007me-DA@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Mon, 26 Jun 2006 13:30:15 +0000
Subject: [commit-cp] classpath/gnu/javax/crypto/jce GnuCrypto.java D...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 13:30:25 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/26 13:30:15

Modified files:
	gnu/javax/crypto/jce: GnuCrypto.java DiffieHellmanImpl.java 
	                      PBKDF2SecretKeyFactory.java GnuSasl.java 
	gnu/javax/crypto/jce/mac: HMacTigerSpi.java HMacMD4Spi.java 
	                          OMacTripleDESImpl.java 
	                          HMacHavalSpi.java HMacSHA512Spi.java 
	                          HMacWhirlpoolSpi.java UMac32Spi.java 
	                          OMacDESImpl.java HMacMD2Spi.java 
	                          OMacCast5Impl.java MacAdapter.java 
	                          HMacSHA384Spi.java HMacSHA256Spi.java 
	                          OMacSerpentImpl.java 
	                          HMacRipeMD160Spi.java 
	                          OMacKhazadImpl.java UHash32Spi.java 
	                          OMacSquareImpl.java 
	                          OMacBlowfishImpl.java HMacMD5Spi.java 
	                          TMMH16Spi.java OMacRijndaelImpl.java 
	                          HMacSHA160Spi.java OMacAnubisImpl.java 
	                          HMacRipeMD128Spi.java OMacImpl.java 
	                          OMacTwofishImpl.java 
	gnu/javax/crypto/jce/spec: TMMHParameterSpec.java 
	                           UMac32ParameterSpec.java 
	                           BlockCipherParameterSpec.java 
	gnu/javax/crypto/jce/cipher: BlowfishSpi.java DESSpi.java 
	                             NullCipherSpi.java ARCFourSpi.java 
	                             PBES2.java RijndaelSpi.java 
	                             SerpentSpi.java AESSpi.java 
	                             Cast5Spi.java KhazadSpi.java 
	                             TwofishSpi.java TripleDESSpi.java 
	                             SquareSpi.java AnubisSpi.java 
	                             CipherAdapter.java 
	gnu/javax/crypto/jce/params: DEREncodingException.java 
	                             BlockCipherParameters.java 
	                             DERReader.java DERWriter.java 
	gnu/javax/crypto/jce/keyring: GnuKeyring.java 
	gnu/javax/crypto/jce/key: TripleDESKeyGeneratorImpl.java 
	                          KhazadKeyGeneratorImpl.java 
	                          TwofishSecretKeyFactoryImpl.java 
	                          SerpentKeyGeneratorImpl.java 
	                          TwofishKeyGeneratorImpl.java 
	                          Cast5SecretKeyFactoryImpl.java 
	                          SquareKeyGeneratorImpl.java 
	                          Cast5KeyGeneratorImpl.java 
	                          DESedeSecretKeyFactoryImpl.java 
	                          SquareSecretKeyFactoryImpl.java 
	                          BlowfishSecretKeyFactoryImpl.java 
	                          KhazadSecretKeyFactoryImpl.java 
	                          AnubisKeyGeneratorImpl.java 
	                          AnubisSecretKeyFactoryImpl.java 
	                          SecretKeyGeneratorImpl.java 
	                          RijndaelKeyGeneratorImpl.java 
	                          BlowfishKeyGeneratorImpl.java 
	                          DESKeyGeneratorImpl.java 
	                          RijndaelSecretKeyFactoryImpl.java 
	                          SecretKeyFactoryImpl.java 
	                          DESSecretKeyFactoryImpl.java 
	                          SerpentSecretKeyFactoryImpl.java 
	gnu/javax/crypto/jce/prng: CSPRNGSpi.java UMacRandomSpi.java 
	                           ICMRandomSpi.java FortunaImpl.java 
	                           ARCFourRandomSpi.java 
	gnu/javax/crypto/jce/sig: DHKeyFactory.java 
	.              : ChangeLog 

Log message:
	2006-06-26  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java: Source formatting.
		* gnu/javax/crypto/jce/GnuSasl.java: Likewise.
		* gnu/javax/crypto/jce/GnuCrypto.java: Likewise.
		* gnu/javax/crypto/jce/DiffieHellmanImpl.java: Likewise.
		* gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java: Likewise.
		* gnu/javax/crypto/jce/spec/TMMHParameterSpec.java: Likewise.
		* gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java: Likewise.
		* gnu/javax/crypto/jce/sig/DHKeyFactory.java: Likewise.
		* gnu/javax/crypto/jce/prng/UMacRandomSpi.java: Likewise.
		* gnu/javax/crypto/jce/prng/ICMRandomSpi.java: Likewise.
		* gnu/javax/crypto/jce/prng/FortunaImpl.java: Likewise.
		* gnu/javax/crypto/jce/prng/CSPRNGSpi.java: Likewise.
		* gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java: Likewise.
		* gnu/javax/crypto/jce/params/DERWriter.java: Likewise.
		* gnu/javax/crypto/jce/params/DERReader.java: Likewise.
		* gnu/javax/crypto/jce/params/DEREncodingException.java: Likewise.
		* gnu/javax/crypto/jce/params/BlockCipherParameters.java: Likewise.
		* gnu/javax/crypto/jce/mac/UMac32Spi.java: Likewise.
		* gnu/javax/crypto/jce/mac/UHash32Spi.java: Likewise.
		* gnu/javax/crypto/jce/mac/TMMH16Spi.java: Likewise.
		* gnu/javax/crypto/jce/mac/OMacTwofishImpl.java: Likewise.
		* gnu/javax/crypto/jce/mac/OMacTripleDESImpl.java: Likewise.
		* gnu/javax/crypto/jce/mac/OMacSquareImpl.java: Likewise.
		* gnu/javax/crypto/jce/mac/OMacSerpentImpl.java: Likewise.
		* gnu/javax/crypto/jce/mac/OMacRijndaelImpl.java: Likewise.
		* gnu/javax/crypto/jce/mac/OMacKhazadImpl.java: Likewise.
		* gnu/javax/crypto/jce/mac/OMacImpl.java: Likewise.
		* gnu/javax/crypto/jce/mac/OMacDESImpl.java: Likewise.
		* gnu/javax/crypto/jce/mac/OMacCast5Impl.java: Likewise.
		* gnu/javax/crypto/jce/mac/OMacBlowfishImpl.java: Likewise.
		* gnu/javax/crypto/jce/mac/OMacAnubisImpl.java: Likewise.
		* gnu/javax/crypto/jce/mac/MacAdapter.java: Likewise.
		* gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java: Likewise.
		* gnu/javax/crypto/jce/mac/HMacTigerSpi.java: Likewise.
		* gnu/javax/crypto/jce/mac/HMacSHA512Spi.java: Likewise.
		* gnu/javax/crypto/jce/mac/HMacSHA384Spi.java: Likewise.
		* gnu/javax/crypto/jce/mac/HMacSHA256Spi.java: Likewise.
		* gnu/javax/crypto/jce/mac/HMacSHA160Spi.java: Likewise.
		* gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java: Likewise.
		* gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java: Likewise.
		* gnu/javax/crypto/jce/mac/HMacMD5Spi.java: Likewise.
		* gnu/javax/crypto/jce/mac/HMacMD4Spi.java: Likewise.
		* gnu/javax/crypto/jce/mac/HMacMD2Spi.java: Likewise.
		* gnu/javax/crypto/jce/mac/HMacHavalSpi.java: Likewise.
		* gnu/javax/crypto/jce/keyring/GnuKeyring.java: Likewise.
		* gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java: Likewise.
		* gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.java: Likewise.
		* gnu/javax/crypto/jce/cipher/TwofishSpi.java: Likewise.
		* gnu/javax/crypto/jce/cipher/TripleDESSpi.java: Likewise.
		* gnu/javax/crypto/jce/cipher/SquareSpi.java: Likewise.
		* gnu/javax/crypto/jce/cipher/SerpentSpi.java: Likewise.
		* gnu/javax/crypto/jce/cipher/RijndaelSpi.java: Likewise.
		* gnu/javax/crypto/jce/cipher/PBES2.java: Likewise.
		* gnu/javax/crypto/jce/cipher/NullCipherSpi.java: Likewise.
		* gnu/javax/crypto/jce/cipher/KhazadSpi.java: Likewise.
		* gnu/javax/crypto/jce/cipher/DESSpi.java: Likewise.
		* gnu/javax/crypto/jce/cipher/CipherAdapter.java: Likewise.
		* gnu/javax/crypto/jce/cipher/Cast5Spi.java: Likewise.
		* gnu/javax/crypto/jce/cipher/BlowfishSpi.java: Likewise.
		* gnu/javax/crypto/jce/cipher/ARCFourSpi.java: Likewise.
		* gnu/javax/crypto/jce/cipher/AnubisSpi.java: Likewise.
		* gnu/javax/crypto/jce/cipher/AESSpi.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/GnuCrypto.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/DiffieHellmanImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/GnuSasl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacTigerSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacMD4Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacHavalSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/UMac32Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacDESImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacMD2Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacCast5Impl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/MacAdapter.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacSerpentImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacKhazadImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/UHash32Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacSquareImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacMD5Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/TMMH16Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacAnubisImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacImpl.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacTwofishImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/BlowfishSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/DESSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/NullCipherSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/ARCFourSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/PBES2.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/RijndaelSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/SerpentSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/AESSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/Cast5Spi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/KhazadSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/TwofishSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/TripleDESSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/SquareSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/AnubisSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/params/DEREncodingException.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/params/DERReader.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/params/DERWriter.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/CSPRNGSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/FortunaImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/sig/DHKeyFactory.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7934&r2=1.7935



From MAILER-DAEMON Mon Jun 26 09:43:00 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FurMi-0008Ko-D3
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 09:43:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FurMg-0008I9-2u
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 09:42:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FurMf-0008HJ-Co
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 09:42:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FurMe-0008HC-Vl
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 09:42:57 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FurYX-00068g-QK
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 09:55:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FurMd-0001CY-00
	for <commit-classpath@gnu.org>; Mon, 26 Jun 2006 09:42:55 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FurMc-0001CN-23
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 13:42:55 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FurMc-0001CN-23@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Mon, 26 Jun 2006 13:42:54 +0000
Subject: [commit-cp] classpath/gnu java/security/key/rsaRSAKeyPairRa...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 13:42:58 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/26 13:42:54

Modified files:
	gnu/java/security/key/rsa: RSAKeyPairRawCodec.java 
	.              : ChangeLog 
	gnu/javax/crypto/assembly: DeflateTransformer.java 

Log message:
	2006-06-26  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/java/security/key/rsa/RSAKeyPairRawCodec.java: Remove RCS Revision.
		* gnu/javax/crypto/assembly/DeflateTransformer.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7935&r2=1.7936
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/DeflateTransformer.java?cvsroot=classpath&r1=1.2&r2=1.3



From MAILER-DAEMON Mon Jun 26 10:06:03 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Furj0-0007Zj-Uc
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 10:06:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Furiz-0007ZI-H3
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 10:06:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Furit-0007XT-Uk
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 10:06:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Furit-0007XQ-SQ
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 10:05:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Furum-0008Ko-Ta
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 10:18:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Furis-0002Qh-00
	for <commit-classpath@gnu.org>; Mon, 26 Jun 2006 10:05:54 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Furiq-0002QZ-He
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 14:05:53 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Furiq-0002QZ-He@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Mon, 26 Jun 2006 14:05:52 +0000
Subject: [commit-cp] classpath/javax/swing/plaf/basic BasicListUI.ja...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 14:06:01 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/26 14:05:52

Modified files:
	javax/swing/plaf/basic: BasicListUI.java 
	.              : ChangeLog 

Log message:
	2006-06-26  Roman Kennke  <kennke@aicas.com>
	
		* javax/swing/plaf/basic/BasicListUI.java
		(installKeyboardActions): Rewritten to fit with the
		ActionMap/InputMap architecture.
		(uninstallKeyboardActions): Implemented.
		(ListAction): Made private. Added TODO for splitting
		up this bulk Action.
		(ListAction.ListAction): New constructor. This one
		takes a cmd parameter to be installed as actionCommand.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicListUI.java?cvsroot=classpath&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7936&r2=1.7937



From MAILER-DAEMON Mon Jun 26 10:10:48 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Furnc-0001SJ-Gu
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 10:10:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Furnb-0001SE-30
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 10:10:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FurnZ-0001Rz-OB
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 10:10:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FurnZ-0001Rv-JM
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 10:10:45 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FurzS-0000Da-Pv
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 10:23:02 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FurnY-0002dQ-00
	for <commit-classpath@gnu.org>; Mon, 26 Jun 2006 10:10:44 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FurnX-0002dK-BE
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 14:10:44 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FurnX-0002dK-BE@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Mon, 26 Jun 2006 14:10:43 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JList.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 14:10:47 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/26 14:10:43

Modified files:
	.              : ChangeLog 
	javax/swing    : JList.java 

Log message:
	2006-06-26  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JList.java
		(valueIsAdjusting): Removed,
		(init): Removed initialization of valueIsAdjusting field,
		(getValueIsAdjusting): Fetch value from selection model,
		(setValueIsAdjusting): Store value in selection model.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7937&r2=1.7938
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JList.java?cvsroot=classpath&r1=1.56&r2=1.57



From MAILER-DAEMON Mon Jun 26 10:50:53 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FusQP-0004QH-DA
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 10:50:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FusQO-0004Pu-5e
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 10:50:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FusQN-0004PY-6S
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 10:50:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FusQN-0004PV-1t
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 10:50:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FuscG-0003I2-AT
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 11:03:08 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FusQL-0005D8-00
	for <commit-classpath@gnu.org>; Mon, 26 Jun 2006 10:50:49 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FusQK-0005D5-JJ
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 14:50:49 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FusQK-0005D5-JJ@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Mon, 26 Jun 2006 14:50:48 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JList.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 14:50:52 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/26 14:50:48

Modified files:
	.              : ChangeLog 
	javax/swing    : JList.java 

Log message:
	2006-06-26  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JList.java
		(init): Set default value for visibleRowCount to 8,
		(setVisibleRowCount): Fire PropertyChangeEvent when value changes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7938&r2=1.7939
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JList.java?cvsroot=classpath&r1=1.57&r2=1.58



From MAILER-DAEMON Mon Jun 26 12:05:16 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FutaO-0006Mw-LN
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 12:05:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FutaN-0006Kz-EU
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 12:05:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FutaK-0006HI-4Z
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 12:05:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FutaJ-0006H2-VD
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 12:05:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FutmE-0001dG-4M
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 12:17:30 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FutaH-0000h8-00
	for <commit-classpath@gnu.org>; Mon, 26 Jun 2006 12:05:09 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FutaH-0000h4-7A
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 16:05:09 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FutaH-0000h4-7A@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Mon, 26 Jun 2006 16:05:09 +0000
Subject: [commit-cp] classpath/gnu/javax/imageio/gif
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 16:05:15 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/26 16:05:09

New directory:
	gnu/javax/imageio/gif

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/imageio/gif/?cvsroot=classpath



From MAILER-DAEMON Mon Jun 26 12:06:34 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Futbe-00087F-AM
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 12:06:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Futbc-00084b-E2
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 12:06:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Futbb-00083m-Kz
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 12:06:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Futbb-00083e-HA
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 12:06:31 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FutnV-0001lN-Np
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 12:18:49 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Futba-0000kt-00
	for <commit-classpath@gnu.org>; Mon, 26 Jun 2006 12:06:30 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1Futba-0000kp-Lc
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 16:06:30 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Futba-0000kp-Lc@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Mon, 26 Jun 2006 16:06:30 +0000
Subject: [commit-cp] classpath javax/imageio/spiIIORegistry.java gnu...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 16:06:32 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/26 16:06:30

Modified files:
	javax/imageio/spi: IIORegistry.java 
Added files:
	gnu/javax/imageio/gif: GIFFile.java GIFImageReader.java 
	                       GIFImageReaderSpi.java GIFStream.java 

Log message:
	2006-06-26  Sven de Marothy  <sven@physto.se>
	
		* gnu/javax/imageio/gif/GIFFile.java
		* gnu/javax/imageio/gif/GIFImageReader.java
		* gnu/javax/imageio/gif/GIFImageSpi.java
		* gnu/javax/imageio/gif/GIFStream.java
		New files.
		* javax/imageio/spi/IIORegistry.java: Load new GIF decoder plugin.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/imageio/spi/IIORegistry.java?cvsroot=classpath&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/imageio/gif/GIFFile.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/imageio/gif/GIFImageReader.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/imageio/gif/GIFImageReaderSpi.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/imageio/gif/GIFStream.java?cvsroot=classpath&rev=1.1



From MAILER-DAEMON Mon Jun 26 13:14:00 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fuueu-0003r9-7Z
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 13:14:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fuuer-0003pz-AS
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 13:13:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fuuep-0003pB-Qu
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 13:13:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fuuep-0003p5-Jx
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 13:13:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fuuqk-0007km-JX
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 13:26:14 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fuueo-0004sf-00
	for <commit-classpath@gnu.org>; Mon, 26 Jun 2006 13:13:54 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1Fuuen-0004sa-Hy
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 17:13:54 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fuuen-0004sa-Hy@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Mon, 26 Jun 2006 17:13:53 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JList.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 17:13:57 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/26 17:13:53

Modified files:
	.              : ChangeLog 
	javax/swing    : JList.java 

Log message:
	2006-06-26  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JList.java
		(getNextMatch): Reimplemented to perform a circular search for the 
		matching item.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7939&r2=1.7940
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JList.java?cvsroot=classpath&r1=1.58&r2=1.59



From MAILER-DAEMON Mon Jun 26 14:47:23 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fuw7H-0001I1-3O
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 14:47:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fuw7F-0001Hm-AR
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 14:47:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fuw7D-0001Ha-0k
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 14:47:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fuw7C-0001HX-Rb
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 14:47:18 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FuwJ8-0000MD-K0
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 14:59:38 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fuw7C-0004Dz-00
	for <commit-classpath@gnu.org>; Mon, 26 Jun 2006 14:47:18 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1Fuw7B-0004Dw-AT
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 18:47:18 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fuw7B-0004Dw-AT@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Mon, 26 Jun 2006 18:47:17 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/List.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 18:47:21 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/26 18:47:17

Modified files:
	.              : ChangeLog 
	java/awt       : List.java 

Log message:
		2006-06-26  Tania Bento  <tbento@redhat.com>
	
	        * java/awt/List.java
	        (List): A list should have at least 4 visible rows.
	        (replaceItem): Should throw an ArrayIndexOutOfBoundsException,
	        not an IllegalArgumentException.
	        (makeVisible): Should not throw an IllegalArgumentException if
	        the specified index is out of range.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7940&r2=1.7941
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/List.java?cvsroot=classpath&r1=1.26&r2=1.27



From MAILER-DAEMON Mon Jun 26 16:43:12 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FuxvM-0007jS-Gp
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 16:43:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FuxvL-0007j6-R9
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 16:43:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FuxvL-0007id-27
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 16:43:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FuxvK-0007ia-Vc
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 16:43:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fuy7H-0000RC-RG
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 16:55:31 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FuxvK-0004Qa-00
	for <commit-classpath@gnu.org>; Mon, 26 Jun 2006 16:43:10 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FuxvJ-0004QW-PQ
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 20:43:10 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FuxvJ-0004QW-PQ@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Mon, 26 Jun 2006 20:43:09 +0000
Subject: [commit-cp] classpath/vm/reference/java/lang/management
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 20:43:12 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/26 20:43:09

New directory:
	vm/reference/java/lang/management

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/java/lang/management/?cvsroot=classpath



From MAILER-DAEMON Mon Jun 26 16:57:04 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fuy8m-0000x6-FA
	for mharc-commit-classpath@gnu.org; Mon, 26 Jun 2006 16:57:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fuy8k-0000vz-JC
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 16:57:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fuy8k-0000vR-18
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 16:57:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fuy8j-0000vK-KS
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 16:57:01 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FuyKg-00022J-Eb
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 17:09:22 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fuy8i-00059t-00
	for <commit-classpath@gnu.org>; Mon, 26 Jun 2006 16:57:00 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fuy8g-00059o-PR
	for commit-classpath@gnu.org; Mon, 26 Jun 2006 20:56:59 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fuy8g-00059o-PR@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Mon, 26 Jun 2006 20:56:58 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/Thread.java java/...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 20:57:02 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/26 20:56:58

Modified files:
	.              : ChangeLog 
	java/lang      : Thread.java 
	java/lang/management: ClassLoadingMXBean.java 
	                      ManagementFactory.java 
	                      OperatingSystemMXBean.java 
	                      RuntimeMXBean.java 
	vm/reference/java/lang: VMThread.java 
Added files:
	java/lang/management: ThreadInfo.java ThreadMXBean.java 
	vm/reference/java/lang/management: VMThreadInfo.java 

Log message:
	2006-06-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/Thread.java:
		(getState()): New method.
		* java/lang/management/ClassLoadingMXBean.java:
		Corrected class documentation.
		* java/lang/management/ManagementFactory.java:
		Added new temporary marked stub to get thread bean.
		* java/lang/management/OperatingSystemMXBean.java:
		Corrected class documentation.
		* java/lang/management/RuntimeMXBean.java:
		Corrected class documentation.
		* java/lang/management/ThreadInfo.java,
		* java/lang/management/ThreadMXBean.java:
		New classes.
		* vm/reference/java/lang/VMThread.java:
		(getState()): New method.
		* vm/reference/java/lang/management/VMThreadInfo.java:
		New VM class.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7941&r2=1.7942
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/Thread.java?cvsroot=classpath&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ClassLoadingMXBean.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ManagementFactory.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/OperatingSystemMXBean.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/RuntimeMXBean.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ThreadInfo.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ThreadMXBean.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/java/lang/VMThread.java?cvsroot=classpath&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/java/lang/management/VMThreadInfo.java?cvsroot=classpath&rev=1.1



From MAILER-DAEMON Tue Jun 27 04:58:42 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fv9P7-0006N0-Vm
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 04:58:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fv9P6-0006Mg-6K
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 04:58:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fv9P4-0006MU-L4
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 04:58:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fv9P4-0006MR-HN
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 04:58:38 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fv9b8-0002I7-FP
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 05:11:06 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fv9P3-00037L-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 04:58:37 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1Fv9P2-00037F-Vu
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 08:58:37 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fv9P2-00037F-Vu@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Tue, 27 Jun 2006 08:58:36 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JComponent.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 08:58:40 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/27 08:58:36

Modified files:
	.              : ChangeLog 
	javax/swing    : JComponent.java 

Log message:
	       * javax/swing/JComponent.java
	       (firePropertyChange(String,char,char)): New override method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7942&r2=1.7943
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.131&r2=1.132



From MAILER-DAEMON Tue Jun 27 08:30:28 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvCi4-0003Rx-KP
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 08:30:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvCi2-0003Rc-Ra
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 08:30:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvCi1-0003RN-Az
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 08:30:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvCi1-0003RK-6o
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 08:30:25 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvCu7-0007CU-BS
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 08:42:55 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvChx-0005na-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 08:30:21 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FvChv-0005nM-Ec
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 12:30:20 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvChv-0005nM-Ec@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Tue, 27 Jun 2006 12:30:19 +0000
Subject: [commit-cp] classpath/javax/imageio/spi IIORegistry.java Ch...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 12:30:27 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/27 12:30:19

Modified files:
	javax/imageio/spi: IIORegistry.java 
	.              : ChangeLog 

Log message:
	2006-06-27  Roman Kennke  <kennke@aicas.com>
	
		* javax/imageio/spi/IIORegistry.java
		(IIORegistry): Added BMP codec.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/imageio/spi/IIORegistry.java?cvsroot=classpath&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7943&r2=1.7944



From MAILER-DAEMON Tue Jun 27 09:38:36 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvDm0-0001WB-48
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 09:38:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvDlz-0001Vs-50
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 09:38:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvDly-0001Vg-E9
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 09:38:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvDly-0001Vd-9C
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 09:38:34 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvDy4-0004z5-Lo
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 09:51:04 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvDlv-0002ax-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 09:38:31 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FvDlu-0002ak-0U
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 13:38:31 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvDlu-0002ak-0U@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Tue, 27 Jun 2006 13:38:30 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/Component.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 13:38:35 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/27 13:38:29

Modified files:
	.              : ChangeLog 
	java/awt       : Component.java 

Log message:
	2006-06-27  David Gilbert  <david.gilbert@object-refinery.com>
	
		* java/awt/Component.java
		(minSizeSet): New field,
		(maxSize): Likewise,
		(maxSizeSet): Likewise,
		(isMaximumSizeSet): Implemented,
		(isMinimumSizeSet): Likewise,
		(isPreferredSizeSet): Likewise,
		(setMaximumSize): Likewise,
		(setMinimumSize): Likewise,
		(setPreferredSize): Likewise. 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7944&r2=1.7945
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Component.java?cvsroot=classpath&r1=1.124&r2=1.125



From MAILER-DAEMON Tue Jun 27 10:02:42 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvE9J-0000IG-QJ
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 10:02:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvE9I-0000HV-45
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 10:02:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvE9G-0000H7-Ug
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 10:02:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvE9G-0000H0-Ly
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 10:02:38 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvELN-00074z-F4
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 10:15:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvE9E-0004B4-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 10:02:36 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FvE9C-0004Av-4g
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 14:02:35 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvE9C-0004Av-4g@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Tue, 27 Jun 2006 14:02:34 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/Point.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 14:02:40 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/27 14:02:34

Modified files:
	.              : ChangeLog 
	java/awt       : Point.java 

Log message:
	2006-06-27  David Gilbert  <david.gilbert@object-refinery.com>
	
		* java/awt/Point.java
		(setLocation(double, double)): Round to nearest integer coordinates.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7945&r2=1.7946
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Point.java?cvsroot=classpath&r1=1.11&r2=1.12



From MAILER-DAEMON Tue Jun 27 10:51:41 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvEuj-0007ZG-Qm
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 10:51:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvEui-0007ZB-Px
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 10:51:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvEui-0007Yz-08
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 10:51:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvEuh-0007Yw-QN
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 10:51:39 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvF6p-0002nS-7E
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 11:04:11 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvEuh-0007cq-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 10:51:39 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FvEug-0007cl-DX
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 14:51:39 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvEug-0007cl-DX@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Tue, 27 Jun 2006 14:51:38 +0000
Subject: [commit-cp] classpath/java/awt/image BufferedImage.java Cha...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 14:51:41 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/27 14:51:38

Modified files:
	java/awt/image : BufferedImage.java 
	.              : ChangeLog 

Log message:
	2006-06-27  Roman Kennke  <kennke@aicas.com>
	
		* java/awt/image/BufferedImage.java
		(getSource): Use a fixed DirectColorModel to deliver the
		RGB pixels to the ImageConsumer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/image/BufferedImage.java?cvsroot=classpath&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7946&r2=1.7947



From MAILER-DAEMON Tue Jun 27 11:05:26 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvF82-00032x-Lf
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 11:05:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvF80-00032e-3U
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 11:05:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvF7y-00032S-Pw
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 11:05:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvF7y-00032P-L4
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 11:05:22 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvFK6-0003wO-6Y
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 11:17:54 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvF7x-0008SL-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 11:05:21 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FvF7x-0008SH-9g
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 15:05:21 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvF7x-0008SH-9g@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Tue, 27 Jun 2006 15:05:21 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/Label.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 15:05:24 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/27 15:05:21

Modified files:
	.              : ChangeLog 
	java/awt       : Label.java 

Log message:
	2006-06-27  David Gilbert  <david.gilbert@object-refinery.com>
	
		* java/awt/Label.java: Reformatted source code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7947&r2=1.7948
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Label.java?cvsroot=classpath&r1=1.21&r2=1.22



From MAILER-DAEMON Tue Jun 27 11:12:02 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvFEQ-0005Wg-GM
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 11:12:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvFEO-0005W3-DW
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 11:12:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvFEN-0005VX-7c
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 11:11:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvFEN-0005VT-2c
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 11:11:59 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvFQU-0004sX-Qm
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 11:24:30 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvFEM-0000Wm-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 11:11:58 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FvFEL-0000We-IH
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 15:11:58 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvFEL-0000We-IH@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Tue, 27 Jun 2006 15:11:57 +0000
Subject: [commit-cp] classpath/gnu/java/awt/peer/swing SwingComponen...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 15:12:00 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/27 15:11:57

Modified files:
	gnu/java/awt/peer/swing: SwingComponentPeer.java 
	.              : ChangeLog 

Log message:
	2006-06-27  Roman Kennke  <kennke@aicas.com>
	
		* gnu/java/awt/peer/swing/SwingComponentPeer.java
		(createImage): Delegate this to the parent.
		(handleEvent): Only handle PAINT/UPDATE events when the
		component is actually showing.
		(hide): Repaint the parent after hiding a component.
		(prepareImage): Have only one return point.
		(setVisible): Delegate to show() and hide().
		(createVolatileImage): Added null check to avoid NPE.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7948&r2=1.7949



From MAILER-DAEMON Tue Jun 27 11:33:54 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvFZa-0006Rl-4q
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 11:33:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvFZY-0006R7-Gn
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 11:33:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvFZX-0006QS-Pu
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 11:33:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvFZX-0006QO-H2
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 11:33:51 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvFlf-00083U-Dr
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 11:46:23 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvFZW-0001pf-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 11:33:50 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FvFZV-0001pW-TN
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 15:33:50 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvFZV-0001pW-TN@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Tue, 27 Jun 2006 15:33:49 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/Component.java jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 15:33:52 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/27 15:33:49

Modified files:
	.              : ChangeLog 
	java/awt       : Component.java Label.java 

Log message:
	2006-06-27  David Gilbert  <david.gilbert@object-refinery.com>
	
		* java/awt/Component.java
		(setName): Fire required PropertyChangeEvent,
		* java/awt/Label.java
		(getText): Removed redundant brackets,
		(generateName): New method (override),
		(nextLabelNumber): New field,
		(getUniqueLong): New method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7949&r2=1.7950
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Component.java?cvsroot=classpath&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Label.java?cvsroot=classpath&r1=1.22&r2=1.23



From MAILER-DAEMON Tue Jun 27 12:12:30 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvGAw-0001ZD-Po
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 12:12:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvGAu-0001Yj-Ps
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 12:12:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvGAt-0001YH-Fo
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 12:12:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvGAt-0001Y8-8J
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 12:12:27 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvGN1-0004nn-JW
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 12:24:59 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvGAq-0004hq-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 12:12:24 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FvGAp-0004hk-OC
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 16:12:24 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvGAp-0004hk-OC@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Tue, 27 Jun 2006 16:12:23 +0000
Subject: [commit-cp] classpath ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 16:12:29 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/27 16:12:23

Modified files:
	.              : ChangeLog 

Log message:
	2006-06-26  Sven de Marothy  <sven@physto.se>
	
		* gnu/javax/imageio/gif/GIFFile.java
		* gnu/javax/imageio/gif/GIFImageReader.java
		* gnu/javax/imageio/gif/GIFImageSpi.java
		* gnu/javax/imageio/gif/GIFStream.java
		New files.
		* javax/imageio/spi/IIORegistry.java: Load new GIF decoder plugin.
	(forgot changelog entry yesterday)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7950&r2=1.7951



From MAILER-DAEMON Tue Jun 27 14:00:09 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvHr7-0007wD-4y
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 14:00:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvHr4-0007vb-Mk
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 14:00:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvHr2-0007vP-C5
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 14:00:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvHr2-0007vM-6B
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 14:00:04 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvI3B-0007sO-CY
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 14:12:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvHr1-0002xL-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 14:00:03 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FvHr1-0002xF-23
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 18:00:03 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvHr1-0002xF-23@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Tue, 27 Jun 2006 18:00:03 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/datatransfer/Clipb...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 18:00:06 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/27 18:00:03

Modified files:
	.              : ChangeLog 
	java/awt/datatransfer: Clipboard.java DataFlavor.java 

Log message:
	       * java/awt/datatransfer/Clipboard.java (addFlavorListener): Do
	       nothing when listener is null.
	       (removeFlavorListener): Likewise.
	
	       * java/awt/datatransfer/DataFlavor.java
	       (getRepresentationClassFromMime): Renamed to
	       getRepresentationClassFromMimeThrows.
	       (isRepresentationClassInputStream): Use Class.isAssignableFrom().
	       (isRepresentationClassSerializable): Likewise.
	       (isFlavorJavaFileListType): Likewise and check primary and
	       subtype.
	       (getParameter): Parameters are separated by semi-colons.
	       (DataFlavor(Class,String,String)): Do some sanity checks.
	       (DataFlavor(String,String,ClassLoader)): Call
	       getRepresentationClassFromMimeThrows.
	       (DataFlavor(String)): Likewise.
	       (equals(DataFlavor)): Special case primary type text and charset
	       parameter.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7951&r2=1.7952
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/datatransfer/Clipboard.java?cvsroot=classpath&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/datatransfer/DataFlavor.java?cvsroot=classpath&r1=1.30&r2=1.31



From MAILER-DAEMON Tue Jun 27 14:26:58 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvIH4-0007X0-OY
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 14:26:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvIH2-0007WY-Dx
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 14:26:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvIH0-0007Uz-Bg
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 14:26:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvIH0-0007Ut-2R
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 14:26:54 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvIT9-0001WH-LA
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 14:39:27 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvIGz-0003oA-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 14:26:53 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FvIGy-0003o6-Kq
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 18:26:53 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvIGy-0003o6-Kq@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Tue, 27 Jun 2006 18:26:52 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/management/Thread...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 18:26:57 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/27 18:26:52

Modified files:
	.              : ChangeLog 
	java/lang/management: ThreadMXBean.java 

Log message:
	2006-06-27  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/management/ThreadMXBean.java:
		(getThreadInfo(long[])): Corrected return type.
		(getThreadInfo(long[], int)): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7952&r2=1.7953
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ThreadMXBean.java?cvsroot=classpath&r1=1.1&r2=1.2



From MAILER-DAEMON Tue Jun 27 14:58:55 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvIlz-00083E-3G
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 14:58:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvIly-00081Z-2O
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 14:58:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvIlw-00080X-KM
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 14:58:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvIlw-00080U-Gj
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 14:58:52 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvIy6-0004cY-9I
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 15:11:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvIlv-0006Uq-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 14:58:51 -0400
Received: from tromey by savannah.gnu.org with local (Exim 4.50)
	id 1FvIlv-0006Um-AP
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 18:58:51 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvIlv-0006Um-AP@savannah.gnu.org>
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 27 Jun 2006 18:58:51 +0000
Subject: [commit-cp] classpath ChangeLog configure.ac tools/Makefile...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 18:58:54 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tom Tromey <tromey>	06/06/27 18:58:51

Modified files:
	.              : ChangeLog configure.ac 
	tools          : Makefile.am gappletviewer.in gjarsigner.in 
	                 gkeytool.in 
Added files:
	tools          : gjar.in gnative2ascii.in gserialver.in 

Log message:
		* configure.ac: Create gjar, gnative2ascii, gserialver.
		* tools/gappletviewer.in: Quote $@.
		* tools/gkeytool.in: Likewise.
		* tools/gjarsigner.in: Likewise.
		* tools/gjar.in: New file.
		* tools/gnative2ascii.in: Likewise.
		* tools/gserialver.in: Likewise.
		* tools/Makefile.am (bin_PROGRAMS): Added gjar, gnative2ascii,
		gserialver.
		(bin_SCRIPTS): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7953&r2=1.7954
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&r1=1.164&r2=1.165
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/Makefile.am?cvsroot=classpath&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gappletviewer.in?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gjarsigner.in?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gkeytool.in?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gjar.in?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnative2ascii.in?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gserialver.in?cvsroot=classpath&rev=1.1



From MAILER-DAEMON Tue Jun 27 15:59:19 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvJiQ-00079C-VM
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 15:59:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvJiP-00077p-Hb
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 15:59:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvJiO-00075f-7J
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 15:59:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvJiO-00075Y-3J
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 15:59:16 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvJuY-0001yA-Dp
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 16:11:50 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvJiN-0001LR-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 15:59:15 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1FvJiM-0001LN-5n
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 19:59:15 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvJiM-0001LN-5n@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Tue, 27 Jun 2006 19:59:14 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/Component.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 19:59:17 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/27 19:59:14

Modified files:
	.              : ChangeLog 
	java/awt       : Component.java 

Log message:
		2006-06-27  Tania Bento  <tbento@redhat.com>
	
	        * java/awt/Component.java
	        (setComponentOrientation): NPE should not be thrown.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7954&r2=1.7955
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Component.java?cvsroot=classpath&r1=1.126&r2=1.127



From MAILER-DAEMON Tue Jun 27 16:01:58 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvJl0-0007vr-6S
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 16:01:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvJky-0007vY-Cg
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 16:01:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvJkw-0007ug-In
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 16:01:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvJkw-0007uV-BY
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 16:01:54 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvJx6-00029P-2X
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 16:14:28 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvJkv-0001Uc-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 16:01:53 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FvJku-0001UW-72
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 20:01:52 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvJku-0001UW-72@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Tue, 27 Jun 2006 20:01:52 +0000
Subject: [commit-cp] classpath ChangeLog NEWS configure.ac doc/vmint...
	[generics-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 20:01:56 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		generics-branch
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/27 20:01:52

Modified files:
	.              : ChangeLog NEWS configure.ac 
	doc            : vmintegration.texinfo 
	examples/gnu/classpath/examples/swing: Demo.java 
	gnu/java/awt/java2d: AbstractGraphics2D.java 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 
	                       ComponentGraphics.java 
	                       FreetypeGlyphVector.java 
	                       GtkCheckboxPeer.java GtkLabelPeer.java 
	                       GtkToolkit.java 
	gnu/java/awt/peer/qt: QtGraphics.java QtToolkit.java 
	gnu/java/awt/peer/swing: SwingComponentPeer.java 
	gnu/java/lang/management: RuntimeMXBeanImpl.java 
	gnu/java/security: Properties.java Registry.java 
	gnu/java/security/hash: BaseHash.java HashFactory.java 
	                        Haval.java IMessageDigest.java MD2.java 
	                        MD4.java MD5.java RipeMD128.java 
	                        RipeMD160.java Sha160.java Sha256.java 
	                        Sha384.java Sha512.java Tiger.java 
	                        Whirlpool.java 
	gnu/java/security/jce/hash: HavalSpi.java MD2Spi.java 
	                            MD4Spi.java MD5Spi.java 
	                            MessageDigestAdapter.java 
	                            RipeMD128Spi.java RipeMD160Spi.java 
	                            Sha160Spi.java Sha256Spi.java 
	                            Sha384Spi.java Sha512Spi.java 
	                            TigerSpi.java WhirlpoolSpi.java 
	gnu/java/security/jce/prng: HavalRandomSpi.java 
	                            MD2RandomSpi.java MD4RandomSpi.java 
	                            MD5RandomSpi.java 
	                            RipeMD128RandomSpi.java 
	                            RipeMD160RandomSpi.java 
	                            SecureRandomAdapter.java 
	                            Sha160RandomSpi.java 
	                            Sha256RandomSpi.java 
	                            Sha384RandomSpi.java 
	                            Sha512RandomSpi.java 
	                            TigerRandomSpi.java 
	                            WhirlpoolRandomSpi.java 
	gnu/java/security/jce/sig: DSSKeyFactory.java 
	                           DSSKeyPairGeneratorSpi.java 
	                           DSSParameters.java 
	                           DSSRawSignatureSpi.java 
	                           EncodedKeyFactory.java 
	                           KeyPairGeneratorAdapter.java 
	                           RSAKeyFactory.java 
	                           RSAKeyPairGeneratorSpi.java 
	                           RSAPSSRawSignatureSpi.java 
	                           SignatureAdapter.java 
	gnu/java/security/key: IKeyPairCodec.java IKeyPairGenerator.java 
	                       KeyPairCodecFactory.java 
	                       KeyPairGeneratorFactory.java 
	gnu/java/security/key/dss: DSSKey.java DSSKeyPairGenerator.java 
	                           DSSKeyPairPKCS8Codec.java 
	                           DSSKeyPairRawCodec.java 
	                           DSSKeyPairX509Codec.java 
	                           DSSPrivateKey.java DSSPublicKey.java 
	                           FIPS186.java 
	gnu/java/security/key/rsa: GnuRSAKey.java GnuRSAPrivateKey.java 
	                           GnuRSAPublicKey.java 
	                           RSAKeyPairGenerator.java 
	                           RSAKeyPairPKCS8Codec.java 
	                           RSAKeyPairRawCodec.java 
	                           RSAKeyPairX509Codec.java 
	gnu/java/security/pkcs: PKCS7SignedData.java SignerInfo.java 
	gnu/java/security/prng: BasePRNG.java EntropySource.java 
	                        IRandom.java LimitReachedException.java 
	                        MDGenerator.java PRNGFactory.java 
	                        RandomEvent.java 
	                        RandomEventListener.java 
	gnu/java/security/provider: Gnu.java 
	                            PKIXCertPathValidatorImpl.java 
	                            X509CertificateFactory.java 
	gnu/java/security/sig: BaseSignature.java ISignature.java 
	                       ISignatureCodec.java 
	                       SignatureFactory.java 
	gnu/java/security/sig/dss: DSSSignature.java 
	                           DSSSignatureRawCodec.java 
	gnu/java/security/sig/rsa: EME_PKCS1_V1_5.java 
	                           EMSA_PKCS1_V1_5.java EMSA_PSS.java 
	                           RSA.java RSAPKCS1V1_5Signature.java 
	                           RSAPSSSignature.java 
	                           RSAPSSSignatureRawCodec.java 
	gnu/java/security/util: Base64.java ExpirableObject.java 
	                        PRNG.java Sequence.java SimpleList.java 
	                        Util.java 
	gnu/java/security/x509: X509CRL.java X509CRLEntry.java 
	                        X509Certificate.java 
	gnu/java/security/x509/ext: Extension.java GeneralNames.java 
	gnu/javax/crypto/assembly: Assembly.java Cascade.java 
	                           CascadeStage.java 
	                           CascadeTransformer.java 
	                           DeflateTransformer.java 
	                           Direction.java 
	                           LoopbackTransformer.java 
	                           ModeStage.java Operation.java 
	                           PaddingTransformer.java Stage.java 
	                           Transformer.java 
	                           TransformerException.java 
	gnu/javax/crypto/cipher: Anubis.java BaseCipher.java 
	                         Blowfish.java Cast5.java 
	                         CipherFactory.java DES.java 
	                         IBlockCipher.java IBlockCipherSpi.java 
	                         Khazad.java NullCipher.java 
	                         Rijndael.java Serpent.java Square.java 
	                         TripleDES.java Twofish.java 
	                         WeakKeyException.java 
	gnu/javax/crypto/jce: DiffieHellmanImpl.java GnuCrypto.java 
	                      GnuSasl.java PBKDF2SecretKeyFactory.java 
	gnu/javax/crypto/jce/cipher: AESSpi.java ARCFourSpi.java 
	                             AnubisSpi.java BlowfishSpi.java 
	                             Cast5Spi.java CipherAdapter.java 
	                             DESSpi.java KhazadSpi.java 
	                             NullCipherSpi.java PBES2.java 
	                             RijndaelSpi.java SerpentSpi.java 
	                             SquareSpi.java TripleDESSpi.java 
	                             TwofishSpi.java 
	gnu/javax/crypto/jce/key: AnubisKeyGeneratorImpl.java 
	                          AnubisSecretKeyFactoryImpl.java 
	                          BlowfishKeyGeneratorImpl.java 
	                          BlowfishSecretKeyFactoryImpl.java 
	                          Cast5KeyGeneratorImpl.java 
	                          Cast5SecretKeyFactoryImpl.java 
	                          DESKeyGeneratorImpl.java 
	                          DESSecretKeyFactoryImpl.java 
	                          DESedeSecretKeyFactoryImpl.java 
	                          KhazadKeyGeneratorImpl.java 
	                          KhazadSecretKeyFactoryImpl.java 
	                          RijndaelKeyGeneratorImpl.java 
	                          RijndaelSecretKeyFactoryImpl.java 
	                          SecretKeyFactoryImpl.java 
	                          SecretKeyGeneratorImpl.java 
	                          SerpentKeyGeneratorImpl.java 
	                          SerpentSecretKeyFactoryImpl.java 
	                          SquareKeyGeneratorImpl.java 
	                          SquareSecretKeyFactoryImpl.java 
	                          TripleDESKeyGeneratorImpl.java 
	                          TwofishKeyGeneratorImpl.java 
	                          TwofishSecretKeyFactoryImpl.java 
	gnu/javax/crypto/jce/keyring: GnuKeyring.java 
	gnu/javax/crypto/jce/mac: HMacHavalSpi.java HMacMD2Spi.java 
	                          HMacMD4Spi.java HMacMD5Spi.java 
	                          HMacRipeMD128Spi.java 
	                          HMacRipeMD160Spi.java 
	                          HMacSHA160Spi.java HMacSHA256Spi.java 
	                          HMacSHA384Spi.java HMacSHA512Spi.java 
	                          HMacTigerSpi.java 
	                          HMacWhirlpoolSpi.java MacAdapter.java 
	                          OMacAnubisImpl.java 
	                          OMacBlowfishImpl.java 
	                          OMacCast5Impl.java OMacDESImpl.java 
	                          OMacImpl.java OMacKhazadImpl.java 
	                          OMacRijndaelImpl.java 
	                          OMacSerpentImpl.java 
	                          OMacSquareImpl.java 
	                          OMacTripleDESImpl.java 
	                          OMacTwofishImpl.java TMMH16Spi.java 
	                          UHash32Spi.java UMac32Spi.java 
	gnu/javax/crypto/jce/params: BlockCipherParameters.java 
	                             DEREncodingException.java 
	                             DERReader.java DERWriter.java 
	gnu/javax/crypto/jce/prng: ARCFourRandomSpi.java CSPRNGSpi.java 
	                           FortunaImpl.java ICMRandomSpi.java 
	                           UMacRandomSpi.java 
	gnu/javax/crypto/jce/sig: DHKeyFactory.java 
	                          DHKeyPairGeneratorSpi.java 
	gnu/javax/crypto/jce/spec: BlockCipherParameterSpec.java 
	                           TMMHParameterSpec.java 
	                           UMac32ParameterSpec.java 
	gnu/javax/crypto/key/dh: GnuDHKeyPairGenerator.java RFC2631.java 
	gnu/javax/crypto/key/srp6: SRPAlgorithm.java 
	                           SRPKeyPairGenerator.java 
	gnu/javax/crypto/keyring: AuthenticatedEntry.java 
	                          EncryptedEntry.java Entry.java 
	                          EnvelopeEntry.java 
	                          GnuPrivateKeyring.java 
	                          GnuPublicKeyring.java 
	                          PasswordAuthenticatedEntry.java 
	                          PasswordEncryptedEntry.java 
	                          PasswordProtectedEntry.java 
	gnu/javax/crypto/mac: OMAC.java UHash32.java UMac32.java 
	gnu/javax/crypto/mode: BaseMode.java EAX.java 
	gnu/javax/crypto/pad: BasePad.java PKCS1_V1_5.java PKCS7.java 
	                      TBC.java 
	gnu/javax/crypto/prng: CSPRNG.java ICMGenerator.java 
	                       UMacGenerator.java 
	gnu/javax/crypto/sasl: SaslInputStream.java 
	                       SaslOutputStream.java 
	gnu/javax/crypto/sasl/srp: KDF.java SRPClient.java 
	                           SRPServer.java 
	gnu/javax/net/ssl/provider: KeyPool.java 
	gnu/javax/security/auth/callback: ConsoleCallbackHandler.java 
	gnu/javax/security/auth/login: ConfigFileParser.java 
	                               ConfigFileTokenizer.java 
	                               GnuConfiguration.java 
	include        : Makefile.am 
	                 gnu_java_awt_peer_gtk_ComponentGraphics.h 
	                 gnu_java_awt_peer_gtk_GtkLabelPeer.h 
	java/awt       : Component.java Container.java 
	                 GridBagConstraints.java GridBagLayout.java 
	                 Insets.java Label.java List.java Point.java 
	                 TextField.java Toolkit.java 
	java/awt/datatransfer: Clipboard.java DataFlavor.java 
	java/awt/event : KeyEvent.java 
	java/awt/font  : FontRenderContext.java LineBreakMeasurer.java 
	                 TextLayout.java TextMeasurer.java 
	java/awt/image : BufferedImage.java 
	java/lang      : Thread.java 
	java/lang/management: ManagementFactory.java 
	                      OperatingSystemMXBean.java 
	                      RuntimeMXBean.java 
	java/net       : URL.java 
	java/rmi/server: UID.java 
	java/security/cert: X509CertSelector.java 
	java/text      : AttributedString.java 
	java/util/logging: LogManager.java 
	javax/imageio/spi: IIORegistry.java 
	javax/management: DynamicMBean.java 
	javax/swing    : AbstractButton.java 
	                 DefaultListSelectionModel.java JComponent.java 
	                 JInternalFrame.java JLabel.java 
	                 JLayeredPane.java JList.java JMenu.java 
	                 JSplitPane.java RepaintManager.java 
	                 SizeSequence.java UIManager.java 
	javax/swing/plaf: IconUIResource.java 
	javax/swing/plaf/basic: BasicButtonListener.java 
	                        BasicButtonUI.java 
	                        BasicGraphicsUtils.java 
	                        BasicInternalFrameUI.java 
	                        BasicLabelUI.java BasicListUI.java 
	                        BasicMenuItemUI.java BasicMenuUI.java 
	                        BasicPopupMenuUI.java 
	                        BasicTextFieldUI.java BasicTextUI.java 
	                        SharedUIDefaults.java 
	javax/swing/plaf/metal: MetalUtils.java 
	javax/swing/text: AbstractDocument.java DefaultCaret.java 
	                  GapContent.java JTextComponent.java 
	                  PlainDocument.java 
	javax/swing/text/rtf: RTFParser.java RTFScanner.java 
	lib            : Makefile.am 
	native/jni     : Makefile.am 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_ComponentGraphics.c 
	                     gnu_java_awt_peer_gtk_GtkLabelPeer.c 
	                     gnu_java_awt_peer_gtk_GtkWindowPeer.c 
	native/plugin  : Makefile.am 
	scripts        : check_jni_methods.sh 
	tools          : .cvsignore 
	tools/gnu/classpath/tools/getopt: Parser.java 
	vm/reference/java/lang: VMThread.java 
Added files:
	examples/gnu/classpath/examples/java2d: J2dBenchmark.java 
	                                        J2dBenchmarkGUI.java 
	                                        JNIOverhead.java 
	gnu/java/lang/management: ClassLoadingMXBeanImpl.java 
	gnu/java/security: .cvsignore Configuration.java.in 
	gnu/java/util/prefs: GConfBasedFactory.java 
	                     GConfBasedPreferences.java 
	gnu/java/util/prefs/gconf: GConfNativePeer.java 
	gnu/javax/imageio/gif: GIFFile.java GIFImageReader.java 
	                       GIFImageReaderSpi.java GIFStream.java 
	include        : gnu_java_util_prefs_gconf_GConfNativePeer.h 
	java/lang/management: ClassLoadingMXBean.java ThreadInfo.java 
	                      ThreadMXBean.java 
	java/util/logging: LoggingMXBean.java 
	javax/management: MBeanFeatureInfo.java 
	native/jni/gconf-peer: .cvsignore GConfNativePeer.c Makefile.am 
	vm/reference/gnu/java/lang/management: 
	                                       VMClassLoadingMXBeanImpl.java 
	vm/reference/java/lang/management: VMThreadInfo.java 

Log message:
	2006-06-27  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* Merge of HEAD --> generics-branch for 2006/06/16
		to 2006/06/27.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.276&r2=1.2386.2.277
http://cvs.savannah.gnu.org/viewcvs/classpath/NEWS?cvsroot=classpath&only_with_tag=generics-branch&r1=1.47.2.30&r2=1.47.2.31
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&only_with_tag=generics-branch&r1=1.43.2.38&r2=1.43.2.39
http://cvs.savannah.gnu.org/viewcvs/classpath/doc/vmintegration.texinfo?cvsroot=classpath&only_with_tag=generics-branch&r1=1.12.2.9&r2=1.12.2.10
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/java2d/J2dBenchmark.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/java2d/JNIOverhead.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/examples/gnu/classpath/examples/swing/Demo.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.20&r2=1.1.2.21
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.2.5&r2=1.3.2.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.19.2.2&r2=1.19.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.13.2.2&r2=1.13.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.6.2.1&r2=1.6.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.18.2.5&r2=1.18.2.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkLabelPeer.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.18.2.7&r2=1.18.2.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.54.2.15&r2=1.54.2.16
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/qt/QtGraphics.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/qt/QtToolkit.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.4.3&r2=1.2.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/lang/management/RuntimeMXBeanImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/lang/management/ClassLoadingMXBeanImpl.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/Properties.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/Registry.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.3&r2=1.4.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/.cvsignore?cvsroot=classpath&only_with_tag=generics-branch&rev=1.4.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/Configuration.java.in?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/BaseHash.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/HashFactory.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Haval.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/IMessageDigest.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/MD2.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/MD4.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/MD5.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/RipeMD128.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/RipeMD160.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Sha160.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Sha256.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Sha384.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Sha512.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Tiger.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/hash/Whirlpool.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.4&r2=1.1.4.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/HavalSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/MD2Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/MD4Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/MD5Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/MessageDigestAdapter.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/RipeMD128Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/RipeMD160Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/Sha160Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/Sha256Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/Sha384Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/Sha512Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/TigerSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/hash/WhirlpoolSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/HavalRandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/MD2RandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/MD4RandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/MD5RandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/RipeMD128RandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/RipeMD160RandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/SecureRandomAdapter.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/Sha160RandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/Sha256RandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/Sha384RandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/Sha512RandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/TigerRandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/DSSKeyFactory.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/DSSParameters.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/DSSRawSignatureSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/EncodedKeyFactory.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.5.2.3&r2=1.5.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/RSAKeyFactory.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/SignatureAdapter.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/IKeyPairCodec.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/IKeyPairGenerator.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/KeyPairCodecFactory.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/KeyPairGeneratorFactory.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKey.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.4&r2=1.4.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.2&r2=1.4.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.3&r2=1.4.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKeyPairRawCodec.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSKeyPairX509Codec.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSPrivateKey.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.4&r2=1.2.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/DSSPublicKey.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/dss/FIPS186.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/GnuRSAKey.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.2.4&r2=1.3.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/GnuRSAPublicKey.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.4&r2=1.4.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/pkcs/PKCS7SignedData.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/pkcs/SignerInfo.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/BasePRNG.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/EntropySource.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/IRandom.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/LimitReachedException.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/MDGenerator.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/PRNGFactory.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/RandomEvent.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/prng/RandomEventListener.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/provider/Gnu.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.5.2.8&r2=1.5.2.9
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/provider/X509CertificateFactory.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/BaseSignature.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/ISignature.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/ISignatureCodec.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/SignatureFactory.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/dss/DSSSignature.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/dss/DSSSignatureRawCodec.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/RSA.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/Base64.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/ExpirableObject.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/PRNG.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/Sequence.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/SimpleList.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/Util.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/X509CRL.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/X509CRLEntry.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/X509Certificate.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.2.6&r2=1.3.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/ext/Extension.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/ext/GeneralNames.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/util/prefs/GConfBasedFactory.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/util/prefs/GConfBasedPreferences.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/util/prefs/gconf/GConfNativePeer.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Assembly.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Cascade.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/CascadeStage.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/CascadeTransformer.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/DeflateTransformer.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Direction.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/LoopbackTransformer.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/ModeStage.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Operation.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/PaddingTransformer.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Stage.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/Transformer.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/TransformerException.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Anubis.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/BaseCipher.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Blowfish.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Cast5.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/CipherFactory.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/DES.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/IBlockCipher.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Khazad.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/NullCipher.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Rijndael.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Serpent.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Square.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/TripleDES.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Twofish.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/WeakKeyException.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/DiffieHellmanImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/GnuCrypto.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.1&r2=1.4.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/GnuSasl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/AESSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/ARCFourSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/AnubisSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/BlowfishSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/Cast5Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/DESSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/KhazadSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/NullCipherSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/PBES2.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/RijndaelSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/SerpentSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/SquareSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/TripleDESSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/TwofishSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.4&r2=1.1.4.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacHavalSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacMD2Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacMD4Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacMD5Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacTigerSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/MacAdapter.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.4.2&r2=1.2.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacAnubisImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacCast5Impl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacDESImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacKhazadImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacSerpentImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacSquareImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/OMacTwofishImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/TMMH16Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/UHash32Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/mac/UMac32Spi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/params/DEREncodingException.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/params/DERReader.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/params/DERWriter.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/CSPRNGSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/FortunaImpl.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/sig/DHKeyFactory.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.3&r2=1.4.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/dh/RFC2631.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/srp6/SRPAlgorithm.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/EncryptedEntry.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/Entry.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/GnuPrivateKeyring.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.4&r2=1.1.4.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/GnuPublicKeyring.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.4&r2=1.1.4.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PasswordProtectedEntry.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mac/OMAC.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mac/UHash32.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mac/UMac32.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mode/BaseMode.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mode/EAX.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/BasePad.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/PKCS7.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/pad/TBC.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/prng/CSPRNG.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/prng/ICMGenerator.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/prng/UMacGenerator.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/SaslInputStream.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/srp/KDF.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/imageio/gif/GIFFile.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/imageio/gif/GIFImageReader.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/imageio/gif/GIFImageReaderSpi.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/imageio/gif/GIFStream.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/KeyPool.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/login/ConfigFileParser.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/login/GnuConfiguration.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/include/Makefile.am?cvsroot=classpath&only_with_tag=generics-branch&r1=1.27.2.18&r2=1.27.2.19
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h?cvsroot=classpath&only_with_tag=generics-branch&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h?cvsroot=classpath&only_with_tag=generics-branch&r1=1.6.2.3&r2=1.6.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_util_prefs_gconf_GConfNativePeer.h?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Component.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.38.2.29&r2=1.38.2.30
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Container.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.37.2.24&r2=1.37.2.25
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/GridBagConstraints.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.5.2.2&r2=1.5.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/GridBagLayout.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.15.2.8&r2=1.15.2.9
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Insets.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.6.2.3&r2=1.6.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Label.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.12.2.7&r2=1.12.2.8
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/List.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.18.2.7&r2=1.18.2.8
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Point.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.7.2.4&r2=1.7.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/TextField.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.12.2.6&r2=1.12.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Toolkit.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.25.2.13&r2=1.25.2.14
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/datatransfer/Clipboard.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.6.2.3&r2=1.6.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/datatransfer/DataFlavor.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.20.2.10&r2=1.20.2.11
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/event/KeyEvent.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.10.2.4&r2=1.10.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/FontRenderContext.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/LineBreakMeasurer.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/TextLayout.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.6&r2=1.2.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/TextMeasurer.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/image/BufferedImage.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.8.2.8&r2=1.8.2.9
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/Thread.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.8.2.18&r2=1.8.2.19
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ManagementFactory.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/OperatingSystemMXBean.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/RuntimeMXBean.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ClassLoadingMXBean.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ThreadInfo.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/management/ThreadMXBean.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/java/net/URL.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.35.2.13&r2=1.35.2.14
http://cvs.savannah.gnu.org/viewcvs/classpath/java/rmi/server/UID.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.5&r2=1.2.2.6
http://cvs.savannah.gnu.org/viewcvs/classpath/java/security/cert/X509CertSelector.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.7&r2=1.4.2.8
http://cvs.savannah.gnu.org/viewcvs/classpath/java/text/AttributedString.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.8.2.5&r2=1.8.2.6
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/logging/LogManager.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.9.2.8&r2=1.9.2.9
http://cvs.savannah.gnu.org/viewcvs/classpath/java/util/logging/LoggingMXBean.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/imageio/spi/IIORegistry.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.6&r2=1.4.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/DynamicMBean.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/management/MBeanFeatureInfo.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/AbstractButton.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.17.2.17&r2=1.17.2.18
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/DefaultListSelectionModel.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.7.2.11&r2=1.7.2.12
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.20.2.29&r2=1.20.2.30
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JInternalFrame.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.6.2.14&r2=1.6.2.15
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JLabel.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.12.2.11&r2=1.12.2.12
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JLayeredPane.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.13.2.15&r2=1.13.2.16
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JList.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.16.2.20&r2=1.16.2.21
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JMenu.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.8.2.14&r2=1.8.2.15
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JSplitPane.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.10&r2=1.4.2.11
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/RepaintManager.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.6.2.19&r2=1.6.2.20
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/SizeSequence.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/UIManager.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.15.2.15&r2=1.15.2.16
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/IconUIResource.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.5.2.3&r2=1.5.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicButtonListener.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.6&r2=1.4.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicButtonUI.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.12.2.12&r2=1.12.2.13
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.9.2.6&r2=1.9.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.15&r2=1.4.2.16
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicLabelUI.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.10.2.7&r2=1.10.2.8
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicListUI.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.9.2.14&r2=1.9.2.15
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.7.2.13&r2=1.7.2.14
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicMenuUI.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.5.2.9&r2=1.5.2.10
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.9&r2=1.4.2.10
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTextFieldUI.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTextUI.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.10.2.24&r2=1.10.2.25
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/SharedUIDefaults.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/metal/MetalUtils.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.7&r2=1.2.2.8
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/AbstractDocument.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.9.2.20&r2=1.9.2.21
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/DefaultCaret.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.7.2.20&r2=1.7.2.21
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/GapContent.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.5.2.20&r2=1.5.2.21
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/JTextComponent.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.13.2.20&r2=1.13.2.21
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/PlainDocument.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.10&r2=1.4.2.11
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/rtf/RTFParser.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/rtf/RTFScanner.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/Makefile.am?cvsroot=classpath&only_with_tag=generics-branch&r1=1.63.2.26&r2=1.63.2.27
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/Makefile.am?cvsroot=classpath&only_with_tag=generics-branch&r1=1.10.2.5&r2=1.10.2.6
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gconf-peer/.cvsignore?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gconf-peer/GConfNativePeer.c?cvsroot=classpath&only_with_tag=generics-branch&rev=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gconf-peer/Makefile.am?cvsroot=classpath&only_with_tag=generics-branch&rev=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c?cvsroot=classpath&only_with_tag=generics-branch&r1=1.16.2.1&r2=1.16.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c?cvsroot=classpath&only_with_tag=generics-branch&r1=1.11.2.4&r2=1.11.2.5
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c?cvsroot=classpath&only_with_tag=generics-branch&r1=1.31.2.15&r2=1.31.2.16
http://cvs.savannah.gnu.org/viewcvs/classpath/native/plugin/Makefile.am?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/scripts/check_jni_methods.sh?cvsroot=classpath&only_with_tag=generics-branch&r1=1.4.2.6&r2=1.4.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/.cvsignore?cvsroot=classpath&only_with_tag=generics-branch&r1=1.3.4.5&r2=1.3.4.6
http://cvs.savannah.gnu.org/viewcvs/classpath/tools/gnu/classpath/tools/getopt/Parser.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/java/lang/VMThread.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.6&r2=1.2.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/java/lang/management/VMThreadInfo.java?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1



From MAILER-DAEMON Tue Jun 27 17:57:35 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvLYt-0000by-Qe
	for mharc-commit-classpath@gnu.org; Tue, 27 Jun 2006 17:57:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvLYs-0000bY-GN
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 17:57:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvLYq-0000a7-DS
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 17:57:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvLYq-0000a4-89
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 17:57:32 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvLl1-0003Rn-PV
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 18:10:07 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvLYo-00008a-00
	for <commit-classpath@gnu.org>; Tue, 27 Jun 2006 17:57:30 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FvLYo-00008X-NP
	for commit-classpath@gnu.org; Tue, 27 Jun 2006 21:57:30 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvLYo-00008X-NP@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Tue, 27 Jun 2006 21:57:30 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/Thread.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 21:57:34 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/27 21:57:30

Modified files:
	.              : ChangeLog 
	java/lang      : Thread.java 

Log message:
	2006-06-27  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/Thread.java:
		(getAllStackTraces()): Implemented.
		(getStackTrace()): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7955&r2=1.7956
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/Thread.java?cvsroot=classpath&r1=1.25&r2=1.26



From MAILER-DAEMON Wed Jun 28 05:42:34 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvWZ8-0001sU-Hg
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 05:42:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvWZ6-0001rv-Ak
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 05:42:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvWZ4-0001rW-Ua
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 05:42:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvWZ4-0001rT-Pu
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 05:42:30 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvWlN-0000mi-7Q
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 05:55:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvWZ3-000796-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 05:42:29 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FvWZ3-000792-Gj
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 09:42:29 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvWZ3-000792-Gj@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Wed, 28 Jun 2006 09:42:29 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/table/DefaultTa...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 09:42:32 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/28 09:42:29

Modified files:
	.              : ChangeLog 
	javax/swing/table: DefaultTableColumnModel.java 

Log message:
	2006-06-28  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/table/DefaultTableColumnModel.java
		(changeEvent): Don't initialize yet, removed FIXME,
		(fireColumnModelChanged): Initialize changeEvent if necessary.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7956&r2=1.7957
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/table/DefaultTableColumnModel.java?cvsroot=classpath&r1=1.18&r2=1.19



From MAILER-DAEMON Wed Jun 28 07:17:02 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvY2Y-0002X0-PT
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 07:17:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvY2X-0002Wk-7p
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 07:17:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvY2W-0002WQ-Ae
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 07:17:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvY2W-0002WN-4Q
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 07:17:00 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvYEp-0000C5-IA
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 07:29:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvY2R-0000ju-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 07:16:55 -0400
Received: from raif by savannah.gnu.org with local (Exim 4.50)
	id 1FvY2Q-0000jo-Bm
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 11:16:55 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvY2Q-0000jo-Bm@savannah.gnu.org>
From: "Raif S. Naffah" <raif@swiftdsl.com.au>
Date: Wed, 28 Jun 2006 11:16:54 +0000
Subject: [commit-cp] classpath/gnu/javax/crypto jce/GnuCrypto.java j...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 11:17:01 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Raif S. Naffah <raif>	06/06/28 11:16:54

Modified files:
	gnu/javax/crypto/jce: GnuCrypto.java DiffieHellmanImpl.java 
	gnu/javax/crypto/key/dh: GnuDHKey.java GnuDHPublicKey.java 
	                         DHKeyPairX509Codec.java 
	                         GnuDHPrivateKey.java 
	                         DHKeyPairPKCS8Codec.java 
	gnu/javax/crypto/jce/params: BlockCipherParameters.java 
	.              : ChangeLog 
	gnu/javax/crypto/jce/cipher: CipherAdapter.java 

Log message:
	2006-06-28  Raif S. Naffah  <raif@swiftdsl.com.au>
	
		* gnu/javax/crypto/key/dh/GnuDHPublicKey.java (str): New field.
		(toString): New method.
		* gnu/javax/crypto/key/dh/GnuDHPrivateKey.java (str): New field.
		(toString): New method.
		* gnu/javax/crypto/key/dh/GnuDHKey.java (str): New field.
		(toString): New method.
		* gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.java (encodePrivateKey):
		Handle case when Q is null.
		(decodePrivateKey): Likewise.
		* gnu/javax/crypto/key/dh/DHKeyPairX509Codec.java (encodePublicKey):
		Likewise.
		(decodePublicKey): Likewise.
		* gnu/javax/crypto/jce/GnuCrypto.java (run): Added AlgorithmParameters
		aliases for all block ciphers.
		* gnu/javax/crypto/jce/DiffieHellmanImpl.java (result): Changed to byte[].
		(engineDoPhase): Compute fully the shared secret.
		(checkState): New method.
		(reset): Likewise.
		(engineGenerateSecret()): Reset key-agreement before returning.
		(engineGenerateSecret(byte[],int)): Check for short-buffer.
		Reset key-agreement before returning.
		(engineGenerateSecret(String)): Reset key-agreement before returning.
		(engineInit(Key,SecureRandom)): Call reset() before returning.
		* gnu/javax/crypto/jce/params/BlockCipherParameters.java (log): New field.
		(engineInit): Replace printing to System.out with conditional logging.
		* gnu/javax/crypto/jce/cipher/CipherAdapter.java (engineInitHandler):
		When the key-size is not specified, attempt best effort to find a suitable
		value among those advertised by the cipher before setting it to the length
		of provided key material.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/GnuCrypto.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/DiffieHellmanImpl.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/dh/GnuDHKey.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/dh/GnuDHPublicKey.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7957&r2=1.7958
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java?cvsroot=classpath&r1=1.6&r2=1.7



From MAILER-DAEMON Wed Jun 28 08:58:46 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvZd0-0003bw-5N
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 08:58:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvZcy-0003Zx-GB
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 08:58:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvZcx-0003ZW-DI
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 08:58:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvZcx-0003ZS-A8
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 08:58:43 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvZpH-0007XY-HT
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 09:11:27 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvZcv-00008k-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 08:58:41 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FvZcu-00008Z-Sx
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 12:58:41 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvZcu-00008Z-Sx@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Wed, 28 Jun 2006 12:58:40 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JComponent.java...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 12:58:44 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/28 12:58:40

Modified files:
	.              : ChangeLog 
	javax/swing    : JComponent.java JLabel.java 

Log message:
	2006-06-28  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JComponent.java
		(componentPopupMenu): New field,
		(inheritsPopupMenu): New field,
		(getInheritsPopupMenu): Implemented,
		(setInheritsPopupMenu): Likewise,
		(getComponentPopupMenu): Likewise,
		(setComponentPopupMenu): Likewise,
		* javax/swing/JLabel.java
		(JLabel(String, Icon, int)): Set inheritsPopupMenu to true.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7958&r2=1.7959
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.132&r2=1.133
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JLabel.java?cvsroot=classpath&r1=1.40&r2=1.41



From MAILER-DAEMON Wed Jun 28 10:13:47 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fvanb-000615-Iy
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 10:13:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fvana-0005ye-Ac
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 10:13:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvanY-0005xI-QL
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 10:13:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvanY-0005wn-CM
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 10:13:44 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fvazt-0006FO-Fs
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 10:26:29 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvanW-0005hA-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 10:13:42 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FvanU-0005h3-LP
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 14:13:41 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvanU-0005h3-LP@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Wed, 28 Jun 2006 14:13:40 +0000
Subject: [commit-cp] classpath ChangeLog java/beans/VetoableChangeSu...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 14:13:46 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/28 14:13:40

Modified files:
	.              : ChangeLog 
	java/beans     : VetoableChangeSupport.java 
	javax/swing    : JComponent.java 

Log message:
	2006-06-28  David Gilbert  <david.gilbert@object-refinery.com>
	
		* java/beans/VetoableChangeSupport.java
		(addVetoableChangeListener(VetoableChangeListener)): Do nothing for
		null listener,
		(addVetoableChangeListener(String, VetoableChangeListener)): Do nothing
		for null property name and/or listener,
		* javax/swing/JComponent.java
		(getListeners): Handle VetoableChangeListener.class as a special case,
		(getVetoableChangeListeners): Fetch these from the 
		vetoableChangeSupport object.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7959&r2=1.7960
http://cvs.savannah.gnu.org/viewcvs/classpath/java/beans/VetoableChangeSupport.java?cvsroot=classpath&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.133&r2=1.134



From MAILER-DAEMON Wed Jun 28 11:03:04 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvbZI-0007nw-2Q
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 11:03:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvbZG-0007mz-HK
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 11:03:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvbZG-0007mf-1k
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 11:03:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvbZF-0007mU-Rr
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 11:03:01 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fvbla-0001tk-Rb
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 11:15:46 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvbZE-0000s1-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 11:03:00 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FvbZD-0000rv-SZ
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 15:03:00 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvbZD-0000rv-SZ@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Wed, 28 Jun 2006 15:02:59 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JComponent.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 15:03:02 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/28 15:02:59

Modified files:
	.              : ChangeLog 
	javax/swing    : JComponent.java 

Log message:
	2006-06-28  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JComponent.java
		(verifyInputWhenFocusTarget): Initialise to true.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7960&r2=1.7961
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.134&r2=1.135



From MAILER-DAEMON Wed Jun 28 12:25:47 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvcrL-0006iL-5s
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 12:25:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvcrJ-0006i5-6I
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 12:25:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvcrG-0006hX-9F
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 12:25:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvcrF-0006hU-VN
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 12:25:42 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fvd3b-0005i2-U4
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 12:38:28 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvcrE-0003l3-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 12:25:40 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FvcrE-0003kz-BW
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 16:25:40 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvcrE-0003kz-BW@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Wed, 28 Jun 2006 16:25:40 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JComponent.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 16:25:45 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/28 16:25:40

Modified files:
	.              : ChangeLog 
	javax/swing    : JComponent.java 

Log message:
	2006-06-28  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JComponent.java
		(getRegisteredKeyStrokes): Implemented.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7961&r2=1.7962
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.135&r2=1.136



From MAILER-DAEMON Wed Jun 28 14:28:38 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvemE-0002ZA-L9
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 14:28:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvemD-0002Ye-PE
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 14:28:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvemB-0002YM-CC
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 14:28:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvemB-0002YJ-74
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 14:28:35 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FveyY-0000rK-Qd
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 14:41:22 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvemA-0008A7-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 14:28:34 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1Fvem9-0008A4-TI
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 18:28:34 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fvem9-0008A4-TI@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Wed, 28 Jun 2006 18:28:33 +0000
Subject: [commit-cp] classpath/gnu/java/net/local LocalSocket.java C...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 18:28:37 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/28 18:28:33

Modified files:
	gnu/java/net/local: LocalSocket.java 
	.              : ChangeLog 

Log message:
	2006-06-28  Roman Kennke  <kennke@aicas.com>
	
		* gnu/java/net/local/LocalSocket.java
		(setSoTimeout): Don't throw exception and ignore request.
		(getSoTimeout): Don't throw exception and always return 0.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/net/local/LocalSocket.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7962&r2=1.7963



From MAILER-DAEMON Wed Jun 28 15:47:48 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fvg0q-0003B0-IP
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 15:47:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fvg0p-0003An-BB
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 15:47:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fvg0o-0003Aa-5x
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 15:47:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fvg0o-0003AX-0G
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 15:47:46 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvgDC-0007gc-68
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 16:00:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fvg0l-0003U8-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 15:47:43 -0400
Received: from andreast by savannah.gnu.org with local (Exim 4.50)
	id 1Fvg0k-0003U5-NV
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:47:43 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fvg0k-0003U5-NV@savannah.gnu.org>
From: Andreas Tobler <toa@pop.agri.ch>
Date: Wed, 28 Jun 2006 19:47:42 +0000
Subject: [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 19:47:47 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andreas Tobler <andreast>	06/06/28 19:47:42

Modified files:
	.              : ChangeLog 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_GtkImage.c 
	gnu/java/awt/peer/gtk: CairoSurface.java 

Log message:
	2006-06-28  Andreas Tobler  <a.tobler@schweiz.ch>
	
		* gnu/java/awt/peer/gtk/CairoSurface.java: Swap the data from the
		GdkPixbuf correctly on big endian systems. Fix a typo in the little
		endian swapping code.
	
		* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
		(Java_gnu_java_awt_peer_gtk_GtkImage_getPixels): Swap the pixeldata
		without alpha information correctly on big endian systems.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7963&r2=1.7964
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c?cvsroot=classpath&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoSurface.java?cvsroot=classpath&r1=1.10&r2=1.11



From MAILER-DAEMON Wed Jun 28 16:10:31 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvgMp-0001Kj-9l
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 16:10:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvgMn-0001KB-32
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 16:10:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvgMm-0001Jp-7m
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 16:10:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvgMl-0001Ji-QR
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 16:10:27 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvgZA-0000ku-Dg
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 16:23:16 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvgMl-0003oq-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 16:10:27 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1FvgMk-0003on-5T
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:10:27 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvgMk-0003on-5T@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Wed, 28 Jun 2006 20:10:26 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/Thread.java vm/re...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 20:10:29 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/28 20:10:26

Modified files:
	.              : ChangeLog 
	java/lang      : Thread.java 
	vm/reference/java/lang: VMThread.java 

Log message:
	2006-06-28  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/Thread.java:
		(Thread(ThreadGroup,Runnable,String,long)): Update
		state.
		(Thread(VMThread,String,int,boolean)): Likewise.
		(join(long,int)): Likewise.
		(resume()): Likewise.
		(sleep(long,int)): Likewise.
		(start()): Likewise.
		(stop()): Likewise.
		(suspend()): Likewise.
		(die()): Likewise.
		(getState()): Return either state or use VMThread.
		* java/lang/VMThread.java:
		(getState()): Added default implementation to return
		thread.state

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7964&r2=1.7965
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/Thread.java?cvsroot=classpath&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/java/lang/VMThread.java?cvsroot=classpath&r1=1.12&r2=1.13



From MAILER-DAEMON Wed Jun 28 18:56:39 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fvixb-0001yv-KA
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 18:56:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fvixa-0001xr-BV
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 18:56:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvixZ-0001x5-Sd
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 18:56:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvixZ-0001wp-NV
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 18:56:37 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fvj9z-0001LK-Pu
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:09:27 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvixZ-0004Iw-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 18:56:37 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FvixY-0004It-TP
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 22:56:37 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvixY-0004It-TP@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Wed, 28 Jun 2006 22:56:36 +0000
Subject: [commit-cp] classpath ChangeLog-ssl-nio java/security/Signa...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 22:56:38 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl-nio-branch
Changes by:	Casey Marshall <rsdio>	06/06/28 22:56:36

Modified files:
	.              : ChangeLog-ssl-nio 
	java/security  : Signature.java SignatureSpi.java 

Log message:
	2006-06-28  Casey Marshall  <csm@gnu.org>
	
		* java/security/Signature.java (update): new method.
		* java/security/SignatureSpi.java (engineUpdate): new method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/classpath/java/security/Signature.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.15.2.4&r2=1.15.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/java/security/SignatureSpi.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.7.2.5&r2=1.7.2.5.2.1



From MAILER-DAEMON Wed Jun 28 19:04:21 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fvj53-0005J5-FZ
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 19:04:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fvj52-0005In-0v
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:04:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fvj51-0005IN-BA
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:04:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fvj51-0005IF-7S
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:04:19 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvjHR-00026l-AE
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:17:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fvj50-0004Of-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 19:04:18 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1Fvj50-0004Oc-Bt
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 23:04:18 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fvj50-0004Oc-Bt@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Wed, 28 Jun 2006 23:04:18 +0000
Subject: [commit-cp] classpath ChangeLog-ssl-nio gnu/classpath/debug...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 23:04:20 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl-nio-branch
Changes by:	Casey Marshall <rsdio>	06/06/28 23:04:18

Modified files:
	.              : ChangeLog-ssl-nio 
	gnu/classpath/debug: SystemLogger.java 

Log message:
	2006-06-28  Casey Marshall  <csm@gnu.org>
	
		* gnu/classpath/debug/SystemLogger.java: extend Logger.
		(SYSTEM): declare as instance of SystemLogger; set it to such an
		instance.
		(<clinit>): removed debug lines.
		(<init>): new method.
		(logv): new method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/debug/SystemLogger.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=1.1.2.1.2.1



From MAILER-DAEMON Wed Jun 28 19:07:47 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fvj8N-0005rw-AZ
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 19:07:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fvj8L-0005rG-6d
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:07:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fvj8K-0005qv-GI
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:07:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fvj8K-0005qq-Bz
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:07:44 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvjKk-0002K3-G8
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:20:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fvj8J-0004R9-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 19:07:43 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1Fvj8J-0004R6-Fw
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 23:07:43 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fvj8J-0004R6-Fw@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Wed, 28 Jun 2006 23:07:43 +0000
Subject: [commit-cp] classpath ChangeLog-ssl-nio gnu/java/io/ByteBuf...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 23:07:45 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl-nio-branch
Changes by:	Casey Marshall <rsdio>	06/06/28 23:07:43

Modified files:
	.              : ChangeLog-ssl-nio 
Added files:
	gnu/java/io    : ByteBufferOutputStream.java 

Log message:
	2006-06-28  Casey Marshall  <csm@gnu.org>
	
		* gnu/java/io/ByteBufferOutputStream.java: new file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.7&r2=1.1.2.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/io/ByteBufferOutputStream.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1



From MAILER-DAEMON Wed Jun 28 19:14:03 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvjER-00018S-PR
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 19:14:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvjEQ-00018N-Lr
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:14:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvjEP-000186-HA
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:14:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvjEP-000182-EU
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:14:01 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvjQp-0002mS-Ub
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:26:52 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvjEP-0004Vz-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 19:14:01 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FvjEO-0004Vw-Sa
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 23:14:01 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvjEO-0004Vw-Sa@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Wed, 28 Jun 2006 23:14:00 +0000
Subject: [commit-cp] classpath ChangeLog-ssl-nio gnu/java/security/a...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 23:14:03 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl-nio-branch
Changes by:	Casey Marshall <rsdio>	06/06/28 23:14:00

Modified files:
	.              : ChangeLog-ssl-nio 
	gnu/java/security/action: GetSecurityPropertyAction.java 
Added files:
	gnu/java/security: Requires.java 

Log message:
	2006-06-28  Casey Marshall  <csm@gnu.org>
	
		* gnu/java/security/Requires.java: new annotation.
		* gnu/java/security/action/GetSecurityPropertyAction.java:
		implement PrivilegedAction<String>.
		(run): return String.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.8&r2=1.1.2.9
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/Requires.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/action/GetSecurityPropertyAction.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.2.2.3&r2=1.2.2.3.2.1



From MAILER-DAEMON Wed Jun 28 19:17:43 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvjHy-0001wI-Gt
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 19:17:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvjHw-0001vk-SG
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:17:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvjHw-0001vM-0P
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:17:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvjHv-0001vJ-RF
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:17:39 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvjUM-0002xZ-DX
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:30:30 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvjHv-0004ZZ-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 19:17:39 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FvjHv-0004ZW-AR
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 23:17:39 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvjHv-0004ZW-AR@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Wed, 28 Jun 2006 23:17:39 +0000
Subject: [commit-cp] classpath .classpath [ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 23:17:41 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl-nio-branch
Changes by:	Casey Marshall <rsdio>	06/06/28 23:17:39

Modified files:
	.              : .classpath 

Log message:
	Updating for new build rules.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/.classpath?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.6.2.1&r2=1.1.2.6.2.2



From MAILER-DAEMON Wed Jun 28 20:02:43 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvjzX-0001X1-76
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 20:02:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvjzV-0001Ws-LF
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:02:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvjzV-0001Wg-7o
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:02:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvjzV-0001Wd-3R
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:02:41 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fvjge-0004Bd-UK
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 19:43:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvjUD-0004oO-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 19:30:21 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FvjUD-0004oL-MX
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 23:30:21 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvjUD-0004oL-MX@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Wed, 28 Jun 2006 23:30:21 +0000
Subject: [commit-cp] classpath ChangeLog-ssl-nio gnu/javax/net/ssl/P...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jun 2006 00:02:42 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl-nio-branch
Changes by:	Casey Marshall <rsdio>	06/06/28 23:30:21

Modified files:
	.              : ChangeLog-ssl-nio 
	gnu/javax/net/ssl: PrivateCredentials.java Session.java 
Added files:
	gnu/javax/net/ssl: AbstractSessionContext.java 
Removed files:
	gnu/javax/net/ssl: SessionStore.java 

Log message:
	2006-06-28  Casey Marshall  <csm@gnu.org>
	
		* gnu/javax/net/ssl/AbstractSessionContext.java: renamed from
		`SessionStore.' Implement SessionContext.
		* gnu/javax/net/ssl/PrivateCredentials.java: genericize
		collections.
		* gnu/javax/net/ssl/Session.java (packetBufferSize): new field.
		(values): genericize.
		(random): make transient.
		(truncatedMac, context): new fields.
		(getLocalPrincipal, getPacketBufferSize, getPeerPrincipal)
		(getSessionContext): implement.
		(isTruncatedMac): new method.
		(repair, privateData, setPrivateData): new abstract methods.
		(PrivateData.serialVersionUID): new constant.
		* gnu/javax/net/ssl/SessionStore.java: renamed to
		`AbstractSessionContext.'

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.9&r2=1.1.2.10
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/PrivateCredentials.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1&r2=1.1.4.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/Session.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/AbstractSessionContext.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/SessionStore.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=0



From MAILER-DAEMON Wed Jun 28 20:17:40 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvkE0-0007XT-LI
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 20:17:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvkDy-0007WA-CO
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:17:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvkDw-0007V1-Va
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:17:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvkDw-0007Ux-7A
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:17:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvkQL-0007FK-Jn
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:30:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvkDr-0006ZK-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 20:17:31 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FvkDq-0006ZG-A6
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 00:17:30 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvkDq-0006ZG-A6@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Thu, 29 Jun 2006 00:17:30 +0000
Subject: [commit-cp] classpath ChangeLog-ssl-nio gnu/javax/net/ssl/p...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jun 2006 00:17:38 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl-nio-branch
Changes by:	Casey Marshall <rsdio>	06/06/29 00:17:30

Modified files:
	.              : ChangeLog-ssl-nio 
	gnu/javax/net/ssl/provider: AbstractHandshake.java 
	                            AlertException.java Certificate.java 
	                            CertificateRequest.java 
	                            CipherSuite.java 
	                            CipherSuiteList.java 
	                            CipheredStruct.java ClientHello.java 
	                            ClientHelloV2.java 
	                            ClientKeyExchange.java 
	                            Constructed.java Finished.java 
	                            Handshake.java 
	                            InputSecurityParameters.java 
	                            Jessie.java MacAlgorithm.java 
	                            OutputSecurityParameters.java 
	                            ProtocolVersion.java Random.java 
	                            SSLEngineImpl.java 
	                            ServerDHParams.java 
	                            ServerHandshake.java 
	                            ServerHello.java 
	                            ServerKeyExchange.java 
	                            SessionImpl.java Signature.java 
	                            X509KeyManagerFactory.java 
	                            X509TrustManagerFactory.java 
Added files:
	gnu/javax/net/ssl/provider: Builder.java CertificateBuilder.java 
	                            CertificateRequestBuilder.java 
	                            ServerHelloBuilder.java 

Log message:
	2006-06-28  Casey Marshall  <csm@gnu.org>
	
		* gnu/javax/net/ssl/provider/AbstractHandshake.java: implement
		numerous "common" methods in server and client handshakes.
		* gnu/javax/net/ssl/provider/AlertException.java: made public; add
		cause constructors.
		* gnu/javax/net/ssl/provider/Builder.java: new file.
		* gnu/javax/net/ssl/provider/Certificate.java: make subclassable.
		* gnu/javax/net/ssl/provider/CertificateBuilder.java: new file.
		* gnu/javax/net/ssl/provider/CertificateRequest.java: make
		subclassable.
		* gnu/javax/net/ssl/provider/CertificateRequestBuilder.java: new
		file.
		* gnu/javax/net/ssl/provider/CipherSuite.java: remove dependence
		on protocol version.
		* gnu/javax/net/ssl/provider/ClientHello.java (hasExtensions): new
		method.
		* gnu/javax/net/ssl/provider/ClientHelloV2.java (cipherSpecs):
		genericize collections.
		* gnu/javax/net/ssl/provider/ClientKeyExchange.java: make version
		argument explicit, instead of implied by the cipher suite.
		* gnu/javax/net/ssl/provider/Constructed.java: expand JavaDocs.
		* gnu/javax/net/ssl/provider/Finished.java: accept TLS 1.1 version
		numbers, too.
		* gnu/javax/net/ssl/provider/Handshake.java: make version
		explicit, instead of implied by the cipher suite.
		* gnu/javax/net/ssl/provider/InputSecurityParameters.java: made
		public.
		(suite): removed.
		(session): new field (replaces/encapsulates `suite').
		(<init>): made public; take a SessionImpl, not a CipherSuite.
		(decrypt, decrypt, decrypt): add support for growable buffers AND
		a fixed-size array of buffers (we use the former internally; the
		latter is used to implement the scatter/gather model of
		SSLEngine.
		* gnu/javax/net/ssl/provider/Jessie.java: update algorithms.
		* gnu/javax/net/ssl/provider/MacAlgorithm.java: just specify
		NULL/MD5/SHA, not version-specific algorithms.
		* gnu/javax/net/ssl/provider/OutputSecurityParameters.java:
		replace suite with session; support scatter/gather operation.
		* gnu/javax/net/ssl/provider/ProtocolVersion.java: implement
		Comparable<ProtocolVersion>.
		* gnu/javax/net/ssl/provider/Random.java: implement Builder.
		(buffer): new method.
		* gnu/javax/net/ssl/provider/SSLContextImpl.java: new file.
		* gnu/javax/net/ssl/provider/SSLEngineImpl.java: numerous changes;
		largely implemented now.
		* gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.java: new file.
		* gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.java: new file.
		* gnu/javax/net/ssl/provider/ServerDHParams.java: implement
		Builder.
		(<init>): new constructor that takes known parameters.
		(buffer): new method.
		* gnu/javax/net/ssl/provider/ServerHandshake.java: numerous
		changes; largely implemented now.
		* gnu/javax/net/ssl/provider/ServerHello.java: make subclassable.
		* gnu/javax/net/ssl/provider/ServerHelloBuilder.java: new file.
		* gnu/javax/net/ssl/provider/ServerKeyExchange.java: make
		subclassable.
		* gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.java: new
		file.
		* gnu/javax/net/ssl/provider/SessionImpl.java: expanded.
		* gnu/javax/net/ssl/provider/Signature.java: implement Builder.
		(<init>): new method, that takes a pre-computed signature.
		(buffer): new method.
		* gnu/javax/net/ssl/provider/SimpleSessionContext.java: new file.
		* gnu/javax/net/ssl/provider/X509KeyManagerFactory.java:
		genericize Collections usage.
		(Manager): extend X509ExtendedKeyManager; genericize fields.
		(Manager.chooseEngineClientAlias): new method.
		(Manager.chooseEngineServerAlias): new method.
		* gnu/javax/net/ssl/provider/X509TrustManagerFactory.java (sep):
		new constant; use it instead of constantly calling getProperty.
		(init): genericize lists.
		(Manager.trusted): removed.
		(Manager.anchors): new field (replacement for above).
		(<init>): handle changes to fields.
		(getAcceptedIssuers): use `anchors.toArray().'
		(checkTrusted): use a PKIX CertPathVerifier.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.10&r2=1.1.2.11
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/AbstractHandshake.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/AlertException.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/Certificate.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/CertificateRequest.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/CipherSuite.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/CipherSuiteList.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/CipheredStruct.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ClientHello.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.2&r2=1.1.4.1.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ClientHelloV2.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ClientKeyExchange.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/Constructed.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/Finished.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/Handshake.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/InputSecurityParameters.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/Jessie.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1&r2=1.1.4.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/MacAlgorithm.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ProtocolVersion.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/Random.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/SSLEngineImpl.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerDHParams.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1&r2=1.1.4.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerHandshake.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerHello.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.2&r2=1.1.4.1.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerKeyExchange.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/SessionImpl.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/Signature.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.1&r2=1.1.4.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1&r2=1.1.4.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/X509TrustManagerFactory.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1&r2=1.1.4.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/Builder.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/CertificateBuilder.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerHelloBuilder.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1



From MAILER-DAEMON Wed Jun 28 20:34:31 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvkUI-000575-Vv
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 20:34:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvkUH-000570-5w
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:34:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvkUF-00056k-RW
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:34:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvkUF-00056h-Lt
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:34:27 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fvkgg-0000Pm-Iz
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:47:18 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvkUE-0006sm-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 20:34:26 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FvkUD-0006sj-L0
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 00:34:25 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvkUD-0006sj-L0@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Thu, 29 Jun 2006 00:34:25 +0000
Subject: [commit-cp] classpath ChangeLog-ssl-nio gnu/javax/crypto/ke...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jun 2006 00:34:29 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl-nio-branch
Changes by:	Casey Marshall <rsdio>	06/06/29 00:34:25

Modified files:
	.              : ChangeLog-ssl-nio 
Added files:
	gnu/javax/crypto/key: GnuPBEKey.java 

Log message:
	2006-06-28  Casey Marshall  <csm@gnu.org>
	
		* gnu/javax/crypto/key/GnuPBEKey.java: new file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.11&r2=1.1.2.12
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/key/GnuPBEKey.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1



From MAILER-DAEMON Wed Jun 28 20:39:00 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvkYd-0006qc-Up
	for mharc-commit-classpath@gnu.org; Wed, 28 Jun 2006 20:38:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvkYc-0006pk-8o
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:38:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvkYa-0006pY-S4
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:38:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvkYa-0006pV-Ms
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:38:56 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fvkl1-0000gN-Ij
	for commit-classpath@gnu.org; Wed, 28 Jun 2006 20:51:47 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvkYZ-0007li-00
	for <commit-classpath@gnu.org>; Wed, 28 Jun 2006 20:38:55 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FvkYZ-0007lb-NB
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 00:38:55 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvkYZ-0007lb-NB@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Thu, 29 Jun 2006 00:38:55 +0000
Subject: [commit-cp] classpath ChangeLog-ssl-nio jessie-tests/testCe...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jun 2006 00:38:58 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl-nio-branch
Changes by:	Casey Marshall <rsdio>	06/06/29 00:38:55

Modified files:
	.              : ChangeLog-ssl-nio 
	jessie-tests   : testCertificate.java testServerHello.java 
	                 testServerKeyExchange.java 

Log message:
	2006-06-28  Casey Marshall  <csm@gnu.org>
	
		* jessie-tests/testCertificate.java: update for Builder
		interface and API changes.
		* jessie-tests/testServerHello.java: likewise.
		* jessie-tests/testServerKeyExchange.java: likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.12&r2=1.1.2.13
http://cvs.savannah.gnu.org/viewcvs/classpath/jessie-tests/testCertificate.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/classpath/jessie-tests/testServerHello.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/classpath/jessie-tests/testServerKeyExchange.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=1.1.2.2



From MAILER-DAEMON Thu Jun 29 05:02:58 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvsQM-0005Yx-Rt
	for mharc-commit-classpath@gnu.org; Thu, 29 Jun 2006 05:02:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvsQM-0005Ya-0C
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 05:02:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvsQL-0005Xe-7h
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 05:02:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvsQL-0005XW-3W
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 05:02:57 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fvscq-0001yZ-TH
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 05:15:53 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvsQF-0002Xh-00
	for <commit-classpath@gnu.org>; Thu, 29 Jun 2006 05:02:51 -0400
Received: from gbenson by savannah.gnu.org with local (Exim 4.50)
	id 1FvsQE-0002Xe-Nq
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 09:02:51 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvsQE-0002Xe-Nq@savannah.gnu.org>
From: Gary Benson <gbenson@redhat.com>
Date: Thu, 29 Jun 2006 09:02:50 +0000
Subject: [commit-cp] classpath ChangeLog java/io/FilePermission.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jun 2006 09:02:58 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Gary Benson <gbenson>	06/06/29 09:02:50

Modified files:
	.              : ChangeLog 
	java/io        : FilePermission.java 

Log message:
	2006-06-29  Gary Benson  <gbenson@redhat.com>
	
		* java/io/FilePermission.java (implies): Work when path is "/".

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7965&r2=1.7966
http://cvs.savannah.gnu.org/viewcvs/classpath/java/io/FilePermission.java?cvsroot=classpath&r1=1.21&r2=1.22



From MAILER-DAEMON Thu Jun 29 06:00:01 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvtJZ-0006oJ-N7
	for mharc-commit-classpath@gnu.org; Thu, 29 Jun 2006 06:00:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvtJY-0006o7-DH
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 06:00:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvtJX-0006nv-Qm
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 06:00:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvtJX-0006ns-LG
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 05:59:59 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvtW3-0006TF-Ua
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 06:12:56 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvtJW-0006I0-00
	for <commit-classpath@gnu.org>; Thu, 29 Jun 2006 05:59:58 -0400
Received: from gbenson by savannah.gnu.org with local (Exim 4.50)
	id 1FvtJV-0006Hu-GX
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 09:59:58 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvtJV-0006Hu-GX@savannah.gnu.org>
From: Gary Benson <gbenson@redhat.com>
Date: Thu, 29 Jun 2006 09:59:57 +0000
Subject: [commit-cp] classpath ChangeLog java/io/File.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jun 2006 10:00:01 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Gary Benson <gbenson>	06/06/29 09:59:57

Modified files:
	.              : ChangeLog 
	java/io        : File.java 

Log message:
	2006-06-29  Gary Benson  <gbenson@redhat.com>
	
		* java/io/File.java (listRoots): Merge security checks from libgcj.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7966&r2=1.7967
http://cvs.savannah.gnu.org/viewcvs/classpath/java/io/File.java?cvsroot=classpath&r1=1.64&r2=1.65



From MAILER-DAEMON Thu Jun 29 10:15:36 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvxIu-0006eh-8p
	for mharc-commit-classpath@gnu.org; Thu, 29 Jun 2006 10:15:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvxIs-0006eZ-6x
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 10:15:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvxIr-0006eN-NO
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 10:15:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvxIr-0006eK-IY
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 10:15:33 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvxVQ-0004N1-HJ
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 10:28:32 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvxIk-0005bY-00
	for <commit-classpath@gnu.org>; Thu, 29 Jun 2006 10:15:26 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1FvxIk-0005bS-5c
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 14:15:26 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvxIk-0005bS-5c@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Thu, 29 Jun 2006 14:15:26 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/Container.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jun 2006 14:15:34 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/29 14:15:25

Modified files:
	.              : ChangeLog 
	java/awt       : Container.java 

Log message:
		2006-06-27  Tania Bento  <tbento@redhat.com>
	
	        * java/awt/Container.java
	        (applyComponentOrientation): Implemented method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7967&r2=1.7968
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Container.java?cvsroot=classpath&r1=1.94&r2=1.95



From MAILER-DAEMON Thu Jun 29 10:31:29 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvxYG-0004Hy-Sv
	for mharc-commit-classpath@gnu.org; Thu, 29 Jun 2006 10:31:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvxYE-0004Gq-S1
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 10:31:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvxYD-0004GO-3U
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 10:31:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvxYC-0004GL-V2
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 10:31:24 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fvxkl-0005mH-1j
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 10:44:23 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvxYA-0006IU-00
	for <commit-classpath@gnu.org>; Thu, 29 Jun 2006 10:31:22 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1FvxY9-0006IN-6L
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 14:31:22 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvxY9-0006IN-6L@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Thu, 29 Jun 2006 14:31:21 +0000
Subject: [commit-cp] classpath ChangeLog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jun 2006 14:31:27 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/29 14:31:21

Modified files:
	.              : ChangeLog 

Log message:
		2006-06-29  Tania Bento  <tbento@redhat.com>
	
	        * java/awt/Container.java
	        (applyComponentOrientation): Implemented method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7968&r2=1.7969



From MAILER-DAEMON Thu Jun 29 10:46:07 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvxmR-0004so-Gq
	for mharc-commit-classpath@gnu.org; Thu, 29 Jun 2006 10:46:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvxmP-0004qC-Mz
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 10:46:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvxmN-0004nC-L6
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 10:46:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvxmN-0004n4-Ft
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 10:46:03 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fvxyw-0006wx-HP
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 10:59:02 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvxmK-0008D1-00
	for <commit-classpath@gnu.org>; Thu, 29 Jun 2006 10:46:00 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FvxmJ-0008Cu-8a
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 14:46:00 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvxmJ-0008Cu-8a@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Thu, 29 Jun 2006 14:45:59 +0000
Subject: [commit-cp] classpath ChangeLog javax/swing/JComponent.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jun 2006 14:46:06 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/29 14:45:59

Modified files:
	.              : ChangeLog 
	javax/swing    : JComponent.java 

Log message:
	2006-06-29  David Gilbert  <david.gilbert@object-refinery.com>
	
		* javax/swing/JComponent.java
		(JComponent()): Initialize the locale here, not the default locale,
		(getDefaultLocale): If null, return Locale.getDefault(),
		(setDefaultLocale): Added API docs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7969&r2=1.7970
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.136&r2=1.137



From MAILER-DAEMON Thu Jun 29 11:10:39 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvyAB-0003dE-7M
	for mharc-commit-classpath@gnu.org; Thu, 29 Jun 2006 11:10:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvyA9-0003bm-Ij
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 11:10:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvyA8-0003bZ-7H
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 11:10:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvyA8-0003bW-1t
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 11:10:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvyMh-0001mC-FL
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 11:23:35 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvyA7-0001BS-00
	for <commit-classpath@gnu.org>; Thu, 29 Jun 2006 11:10:35 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FvyA6-0001BO-PY
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 15:10:35 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvyA6-0001BO-PY@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Thu, 29 Jun 2006 15:10:34 +0000
Subject: [commit-cp] classpath/gnu/java/awt/peer/x
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jun 2006 15:10:37 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/29 15:10:34

New directory:
	gnu/java/awt/peer/x

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/?cvsroot=classpath



From MAILER-DAEMON Thu Jun 29 11:16:01 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FvyFN-0002wX-69
	for mharc-commit-classpath@gnu.org; Thu, 29 Jun 2006 11:16:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FvyFL-0002vl-K9
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 11:15:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FvyFK-0002vN-PL
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 11:15:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FvyFK-0002vK-Ky
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 11:15:58 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FvyRu-0002Cq-3d
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 11:28:58 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FvyFJ-0001dW-00
	for <commit-classpath@gnu.org>; Thu, 29 Jun 2006 11:15:57 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FvyFI-0001dM-5H
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 15:15:57 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FvyFI-0001dM-5H@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Thu, 29 Jun 2006 15:15:56 +0000
Subject: [commit-cp] classpath configure.ac ChangeLog lib/standard.o...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jun 2006 15:15:59 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/29 15:15:56

Modified files:
	.              : configure.ac ChangeLog 
Added files:
	lib            : standard.omit.in 
	gnu/java/awt/peer/x: GLGraphics.java ImageConverter.java 
	                     KeyboardMapping.java XEventPump.java 
	                     XFontPeer.java XFontPeer2.java 
	                     XFramePeer.java XGraphics.java 
	                     XGraphics2D.java 
	                     XGraphicsConfiguration.java 
	                     XGraphicsDevice.java 
	                     XGraphicsEnvironment.java XImage.java 
	                     XLightweightPeer.java XToolkit.java 
	                     XWindowPeer.java fonts.properties 
Removed files:
	lib            : standard.omit 

Log message:
	2006-06-29  Roman Kennke  <kennke@aicas.com>
	
		* gnu/java/awt/peer/x/GLGraphics.java,
		* gnu/java/awt/peer/x/ImageConverter.java,
		* gnu/java/awt/peer/x/KeyboardMapping.java,
		* gnu/java/awt/peer/x/XEventPump.java,
		* gnu/java/awt/peer/x/XFontPeer.java,
		* gnu/java/awt/peer/x/XFontPeer2.java,
		* gnu/java/awt/peer/x/XFramePeer.java,
		* gnu/java/awt/peer/x/XGraphics.java,
		* gnu/java/awt/peer/x/XGraphics2D.java,
		* gnu/java/awt/peer/x/XGraphicsConfiguration.java,
		* gnu/java/awt/peer/x/XGraphicsDevice.java,
		* gnu/java/awt/peer/x/XGraphicsEnvironment.java,
		* gnu/java/awt/peer/x/XImage.java,
		* gnu/java/awt/peer/x/XLightweightPeer.java,
		* gnu/java/awt/peer/x/XToolkit.java,
		* gnu/java/awt/peer/x/XWindowPeer.java,
		* gnu/java/awt/peer/x/fonts.properties: New files.
		* lib/standard.omit: Removed.
		* lib/standard.omit.in: Added.
		* configure.ac: Added configure option --with-escher. Added some
		configury for omitting gnu.java.awt.peer.x package when
		this option is not specified.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&r1=1.165&r2=1.166
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7970&r2=1.7971
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/standard.omit.in?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/standard.omit?cvsroot=classpath&r1=1.44&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/GLGraphics.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/ImageConverter.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/KeyboardMapping.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XEventPump.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XFontPeer.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XFontPeer2.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XFramePeer.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XGraphics.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XGraphics2D.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XGraphicsConfiguration.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XGraphicsDevice.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XGraphicsEnvironment.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XImage.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XLightweightPeer.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XToolkit.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XWindowPeer.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/fonts.properties?cvsroot=classpath&rev=1.1



From MAILER-DAEMON Thu Jun 29 16:44:50 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fw3Na-0005BG-1c
	for mharc-commit-classpath@gnu.org; Thu, 29 Jun 2006 16:44:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fw3NZ-0005BA-8S
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 16:44:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fw3NW-0005Ay-ST
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 16:44:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fw3NW-0005Av-OM
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 16:44:46 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fw3a9-0004V9-H1
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 16:57:49 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fw3NW-0003aV-00
	for <commit-classpath@gnu.org>; Thu, 29 Jun 2006 16:44:46 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fw3NU-0003aL-RI
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 20:44:45 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fw3NU-0003aL-RI@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Thu, 29 Jun 2006 20:44:44 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/Thread.java vm/re...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jun 2006 20:44:49 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/29 20:44:44

Modified files:
	.              : ChangeLog 
	java/lang      : Thread.java 
	vm/reference/java/lang: VMThread.java 

Log message:
	2006-06-29  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
		* java/lang/Thread.java,
		* java/lang/VMThread.java:
		Reverted patch from 2006-06-28.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7971&r2=1.7972
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/Thread.java?cvsroot=classpath&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/classpath/vm/reference/java/lang/VMThread.java?cvsroot=classpath&r1=1.13&r2=1.14



From MAILER-DAEMON Thu Jun 29 17:00:33 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Fw3cn-0003Ib-EM
	for mharc-commit-classpath@gnu.org; Thu, 29 Jun 2006 17:00:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Fw3cl-0003I2-Gy
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 17:00:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Fw3ck-0003Hn-Tr
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 17:00:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Fw3ck-0003Hk-Mt
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 17:00:30 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1Fw3pN-0005Y1-CM
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 17:13:33 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1Fw3cj-0004E2-00
	for <commit-classpath@gnu.org>; Thu, 29 Jun 2006 17:00:29 -0400
Received: from gnu_andrew by savannah.gnu.org with local (Exim 4.50)
	id 1Fw3ci-0004Dy-Hk
	for commit-classpath@gnu.org; Thu, 29 Jun 2006 21:00:29 +0000
To: commit-classpath@gnu.org
Message-Id: <E1Fw3ci-0004Dy-Hk@savannah.gnu.org>
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Thu, 29 Jun 2006 21:00:28 +0000
Subject: [commit-cp] classpath ChangeLog java/lang/Thread.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jun 2006 21:00:31 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Andrew John Hughes <gnu_andrew>	06/06/29 21:00:28

Modified files:
	.              : ChangeLog 
	java/lang      : Thread.java 

Log message:
	2006-06-29  Jeroen Frijters <jeroen@sumatra.nl>
	
		* java/lang/Thread.java:
		(getState()): Handle case of no VMThread
		correctly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7972&r2=1.7973
http://cvs.savannah.gnu.org/viewcvs/classpath/java/lang/Thread.java?cvsroot=classpath&r1=1.28&r2=1.29



From MAILER-DAEMON Fri Jun 30 02:32:47 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FwCYZ-0005wM-JJ
	for mharc-commit-classpath@gnu.org; Fri, 30 Jun 2006 02:32:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FwCYX-0005u5-OB
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 02:32:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FwCYW-0005sP-G3
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 02:32:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FwCYW-0005s1-4m
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 02:32:44 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FwClE-0002Fp-HI
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 02:45:52 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FwCYV-0001hy-00
	for <commit-classpath@gnu.org>; Fri, 30 Jun 2006 02:32:43 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FwCYU-0001hq-OR
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 06:32:43 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FwCYU-0001hq-OR@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Fri, 30 Jun 2006 06:32:42 +0000
Subject: [commit-cp] classpath/gnu/javax/net/ssl/provider ServerKeyE...
	[ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2006 06:32:46 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl-nio-branch
Changes by:	Casey Marshall <rsdio>	06/06/30 06:32:42

Added files:
	gnu/javax/net/ssl/provider: ServerKeyExchangeBuilder.java 
	                            SimpleSessionContext.java 
	                            SSLContextImpl.java 
	                            SSLv3HMacMD5Impl.java 
	                            SSLv3HMacSHAImpl.java 

Log message:
	Missed files from previous checkin.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/SimpleSessionContext.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/SSLContextImpl.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1



From MAILER-DAEMON Fri Jun 30 03:15:50 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FwDEE-0004V1-SU
	for mharc-commit-classpath@gnu.org; Fri, 30 Jun 2006 03:15:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FwDED-0004Ue-Nr
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 03:15:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FwDED-0004UK-8H
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 03:15:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FwDED-0004UH-0Y
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 03:15:49 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FwDQv-0005Fx-Mb
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 03:28:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FwDEC-0003An-00
	for <commit-classpath@gnu.org>; Fri, 30 Jun 2006 03:15:48 -0400
Received: from rsdio by savannah.gnu.org with local (Exim 4.50)
	id 1FwDEB-0003Aj-LD
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 07:15:47 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FwDEB-0003Aj-LD@savannah.gnu.org>
From: Casey Marshall <csm@gnu.org>
Date: Fri, 30 Jun 2006 07:15:47 +0000
Subject: [commit-cp] classpath/lib standard.omit [ssl-nio-branch]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2006 07:15:50 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Branch:		ssl-nio-branch
Changes by:	Casey Marshall <rsdio>	06/06/30 07:15:47

Modified files:
	lib            : standard.omit 

Log message:
	Adding obsolete Jessie files to standard.omit; the branch should be
	buildable now outside of Eclipse (but with the batch compiler
	installed as ecj, of course).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/standard.omit?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.39.2.3&r2=1.39.2.3.2.1



From MAILER-DAEMON Fri Jun 30 05:32:26 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FwFMQ-00034G-Sr
	for mharc-commit-classpath@gnu.org; Fri, 30 Jun 2006 05:32:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FwFMP-000345-AL
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 05:32:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FwFMN-00032X-Or
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 05:32:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FwFMN-00032R-IK
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 05:32:23 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FwFZ7-0007aG-L3
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 05:45:33 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FwFMM-0000iO-00
	for <commit-classpath@gnu.org>; Fri, 30 Jun 2006 05:32:22 -0400
Received: from trebligd by savannah.gnu.org with local (Exim 4.50)
	id 1FwFML-0000iG-AX
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 09:32:22 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FwFML-0000iG-AX@savannah.gnu.org>
From: David Gilbert <david.gilbert@object-refinery.com>
Date: Fri, 30 Jun 2006 09:32:21 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/TextComponent.java...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2006 09:32:25 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	David Gilbert <trebligd>	06/06/30 09:32:21

Modified files:
	.              : ChangeLog 
	java/awt       : TextComponent.java TextField.java 
	javax/swing    : JComponent.java 

Log message:
	2006-06-30  David Gilbert  <david.gilbert@object-refinery.com>
	
		* java/awt/TextComponent.java: Reformatted source code,
		* java/awt/TextField.java: Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7973&r2=1.7974
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/TextComponent.java?cvsroot=classpath&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/TextField.java?cvsroot=classpath&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JComponent.java?cvsroot=classpath&r1=1.137&r2=1.138



From MAILER-DAEMON Fri Jun 30 06:27:39 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FwGDr-0003wf-5c
	for mharc-commit-classpath@gnu.org; Fri, 30 Jun 2006 06:27:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FwGDo-0003tj-UP
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 06:27:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FwGDn-0003rO-Ia
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 06:27:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FwGDn-0003rC-C0
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 06:27:35 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FwGQX-0003MO-Ua
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 06:40:46 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FwGDm-0002qt-00
	for <commit-classpath@gnu.org>; Fri, 30 Jun 2006 06:27:34 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FwGDl-0002qn-5w
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 10:27:34 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FwGDl-0002qn-5w@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Fri, 30 Jun 2006 10:27:33 +0000
Subject: [commit-cp] classpath configure.ac ChangeLog lib/Makefile.am
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2006 10:27:37 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/30 10:27:33

Modified files:
	.              : configure.ac ChangeLog 
	lib            : Makefile.am 

Log message:
	2006-06-30  Roman Kennke  <kennke@aicas.com>
	
		* lib/Makefile.am: Added Escher dir/jar to classpath when
		requested.
		* configure.ac: Moved handling of standard.omit to a place
		where it actually gets executed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&r1=1.166&r2=1.167
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7974&r2=1.7975
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/Makefile.am?cvsroot=classpath&r1=1.120&r2=1.121



From MAILER-DAEMON Fri Jun 30 07:39:22 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FwHLG-0005gu-Aw
	for mharc-commit-classpath@gnu.org; Fri, 30 Jun 2006 07:39:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FwHLE-0005gp-6o
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 07:39:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FwHLB-0005gc-TA
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 07:39:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FwHLB-0005gZ-OR
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 07:39:17 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FwHXx-00013F-6b
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 07:52:29 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FwHLA-0006OF-00
	for <commit-classpath@gnu.org>; Fri, 30 Jun 2006 07:39:16 -0400
Received: from mark by savannah.gnu.org with local (Exim 4.50)
	id 1FwHL9-0006O6-DT
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 11:39:16 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FwHL9-0006O6-DT@savannah.gnu.org>
From: Mark Wielaard <mark@klomp.org>
Date: Fri, 30 Jun 2006 11:39:15 +0000
Subject: [commit-cp] classpath ChangeLog configure.ac lib/Makefile.a...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2006 11:39:20 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Mark Wielaard <mark>	06/06/30 11:39:15

Modified files:
	.              : ChangeLog configure.ac 
	lib            : Makefile.am gen-classlist.sh.in 
	                 standard.omit.in 

Log message:
	       * configure.ac: Move standard.omit creation after dirs are created.
	       Cat standard.omit.in from srcdir. Make exclude regex more explicit.
	       * lib/Makefile.am (EXTRA_DIST): Add standard.omit.in.
	       (clean-local): Remove standard.omit.
	       * lib/gen-classlist.sh.in: Use omit file in build dir.
	       * lib/standard.omit.in: Make exclude regex more explicit.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7975&r2=1.7976
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&r1=1.167&r2=1.168
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/Makefile.am?cvsroot=classpath&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/gen-classlist.sh.in?cvsroot=classpath&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/standard.omit.in?cvsroot=classpath&r1=1.1&r2=1.2



From MAILER-DAEMON Fri Jun 30 10:47:22 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FwKHC-0000pR-QR
	for mharc-commit-classpath@gnu.org; Fri, 30 Jun 2006 10:47:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FwKHB-0000pJ-7V
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 10:47:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FwKHA-0000p5-IG
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 10:47:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FwKHA-0000p2-Eo
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 10:47:20 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FwKTx-0008Ma-K4
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 11:00:33 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FwKH9-0005lD-00
	for <commit-classpath@gnu.org>; Fri, 30 Jun 2006 10:47:19 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FwKH7-0005lA-MY
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 14:47:19 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FwKH7-0005lA-MY@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Fri, 30 Jun 2006 14:47:17 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/GtkCh...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2006 14:47:21 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/30 14:47:17

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: GtkCheckboxPeer.java 
	include        : Makefile.am 
	                 gnu_java_awt_peer_gtk_GtkCheckboxPeer.h 
	native/jni/gtk-peer: Makefile.am 
	                     gnu_java_awt_peer_gtk_GtkCheckboxPeer.c 
Removed files:
	gnu/java/awt/peer/gtk: GtkCheckboxGroupPeer.java 
	include        : gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h 
	native/jni/gtk-peer: 
	                     gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.c 

Log message:
	2006-06-30  Lillian Angel  <langel@redhat.com>
	            Tom Fitzsimmons <fitzsim@redhat.com>
	
	        * gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java: Removed class.
	        * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java:
	        Added current_group, groupMap fields. Added definitions for
	        new native functions.
	        (create): Removed FIXME. Added code to create the check button or
	        radio button when appropriate. Updated groupMap to contain
	        pointer to the newly created group.
	        (setCheckboxGroup): Added code to handle all cases. Removing
	        a button from a group, adding a button to a group, or changing the
	        group of a button.
	        (dispose): Changed to call super.
	        * include/Makefile.am: Removed reference to
	        gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h.
	        * include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h: Removed file.
	        * include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h: Added definitions
	        for new functions.
	        * native/jni/gtk-peer/Makefile.am: Removed reference to
	        gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.c.
	        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.c:
	        Removed file.
	        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_combobox_get_widget):
	        Renamed to checkbox_get_widget.
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_connectSignals):
	        Changed to use checkbox_get_widget.
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeSetCheckboxGroup):
	        Removed.
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkWidgetModifyFont):
	        Changed to use checkbox_get_widget.
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkButtonSetLabel):
	        Likewise.
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_createCheckButton):
	        New function. Creates checkbutton without a group.
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_createRadioButton):
	        Creates a radio button in a group, using groupPointer. If groupPointer
	        is 0, then a new group is created.
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_addToGroup): Adds the
	        check button to a group, using groupPointer. A radio button is created
	        in its place. If groupPointer is 0, then a new group is created.
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_removeFromGroup): The
	        radio button is removed from the group. A check button is created in
	        its place.
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_switchToGroup): The
	        radio button is moved to a new group.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7976&r2=1.7977
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java?cvsroot=classpath&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java?cvsroot=classpath&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/include/Makefile.am?cvsroot=classpath&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h?cvsroot=classpath&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h?cvsroot=classpath&r1=1.5&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/Makefile.am?cvsroot=classpath&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c?cvsroot=classpath&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.c?cvsroot=classpath&r1=1.6&r2=0



From MAILER-DAEMON Fri Jun 30 13:39:21 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FwMxd-0005Kt-20
	for mharc-commit-classpath@gnu.org; Fri, 30 Jun 2006 13:39:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FwMxb-0005KC-1t
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 13:39:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FwMxa-0005K0-BE
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 13:39:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FwMxa-0005Jx-5h
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 13:39:18 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FwNAP-0008LY-3Y
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 13:52:33 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FwMxY-0004TG-00
	for <commit-classpath@gnu.org>; Fri, 30 Jun 2006 13:39:16 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FwMxX-0004TD-31
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 17:39:16 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FwMxX-0004TD-31@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Fri, 30 Jun 2006 17:39:15 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/Cairo...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2006 17:39:19 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/30 17:39:15

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: CairoGraphics2D.java 

Log message:
	2006-06-30  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/peer/gtk/CairoGraphics2D.java:
		(drawGlyphVector): Don't draw empty vectors.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7977&r2=1.7978
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.28&r2=1.29



From MAILER-DAEMON Fri Jun 30 14:20:13 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FwNbB-00019G-Bj
	for mharc-commit-classpath@gnu.org; Fri, 30 Jun 2006 14:20:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FwNb9-00019A-MN
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 14:20:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FwNb8-00018y-1h
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 14:20:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FwNb7-00018v-Sd
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 14:20:09 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FwNnx-0003xj-9y
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 14:33:25 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FwNb6-00058j-00
	for <commit-classpath@gnu.org>; Fri, 30 Jun 2006 14:20:08 -0400
Received: from smarothy by savannah.gnu.org with local (Exim 4.50)
	id 1FwNb5-00058e-0Q
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 18:20:08 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FwNb5-00058e-0Q@savannah.gnu.org>
From: Sven de Marothy <sven@physto.se>
Date: Fri, 30 Jun 2006 18:20:07 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/ClasspathToolk...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2006 18:20:11 -0000

CVSROOT:	/sources/classpath
Module name:	classpath
Changes by:	Sven de Marothy <smarothy>	06/06/30 18:20:06

Modified files:
	.              : ChangeLog 
	gnu/java/awt   : ClasspathToolkit.java 
	gnu/java/awt/peer/gtk: GtkToolkit.java 
	gnu/java/awt/peer/qt: QtToolkit.java 
	gnu/java/awt/peer/x: XToolkit.java 
Removed files:
	gnu/java/awt/peer: ClasspathTextLayoutPeer.java 
	gnu/java/awt/peer/gtk: GdkTextLayout.java 

Log message:
	2006-06-30  Sven de Marothy  <sven@physto.se>
	
		* gnu/java/awt/ClasspathToolkit.java,
		* gnu/java/awt/peer/x/XToolkit.java,
		* gnu/java/awt/peer/qt/QtToolkit.java,
		* gnu/java/awt/peer/gtk/GtkToolkit.java,
		Remove ClasspathTextLayoutPeer.
		* gnu/java/awt/peer/gtk/GdkTextLayout.java,
		* gnu/java/awt/peer/ClasspathTextLayoutPeer,
		Files removed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7978&r2=1.7979
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/ClasspathToolkit.java?cvsroot=classpath&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/ClasspathTextLayoutPeer.java?cvsroot=classpath&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java?cvsroot=classpath&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java?cvsroot=classpath&r1=1.10&r2=0
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/qt/QtToolkit.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/x/XToolkit.java?cvsroot=classpath&r1=1.1&r2=1.2



From MAILER-DAEMON Fri Jun 30 15:28:27 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FwOfD-0005t7-KK
	for mharc-commit-classpath@gnu.org; Fri, 30 Jun 2006 15:28:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FwOfC-0005t2-Hc
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 15:28:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FwOfA-0005sd-2R
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 15:28:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FwOf9-0005sU-RU
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 15:28:23 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FwOrz-0000xi-S0
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 15:41:39 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FwOf9-0008D5-00
	for <commit-classpath@gnu.org>; Fri, 30 Jun 2006 15:28:23 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FwOf8-0008Cz-5P
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 19:28:23 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FwOf8-0008Cz-5P@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Fri, 30 Jun 2006 19:28:22 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/GtkCh...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2006 19:28:26 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/30 19:28:22

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: GtkCheckboxPeer.java 
	include        : gnu_java_awt_peer_gtk_GtkCheckboxPeer.h 
	native/jni/gtk-peer: gnu_java_awt_peer_gtk_GtkCheckboxPeer.c 

Log message:
	2006-06-30  Lillian Angel  <langel@redhat.com>
	
	        * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java:
	        Changed all return values of native functions to void.
	        (create): Changed function to be syncronized. Removed
	        call to put value in groupMap, this is now done from
	        the native code.
	        (setState): Changed function to be syncronized.
	        (setLabel): Changed function to be syncronized.
	        (setCheckboxGroup): Changed function to be syncronized. Removed
	        call to put value in groupMap, this is now done from
	        the native code.
	        (postItemEvent): Changed function to be syncronized.
	        (addToGroupMap): New function. Called by native code to add
	        new value to the group.
	        (dispose): Changed function to be syncronized.
	        * include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h: Updated
	        all functions.
	        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
	        (cp_gtk_checkbox_init_jni): Added code to link to
	        java function.
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_createRadioButton):
	        Changed return value to void. Added call
	        to java function to set pointer in groupMap.
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_addtoGroup): Likewise. Also,
	        changed check to an assert. Also, removed call to set/del pointer.
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_removeFromGroup):
	        Likewise. Also, added check to determine if native_group should be
	        set to NULL.
	        (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_switchToGroup): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7979&r2=1.7980
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java?cvsroot=classpath&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h?cvsroot=classpath&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c?cvsroot=classpath&r1=1.26&r2=1.27



From MAILER-DAEMON Fri Jun 30 15:54:23 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FwP4J-0003QX-Jr
	for mharc-commit-classpath@gnu.org; Fri, 30 Jun 2006 15:54:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FwP4H-0003Ph-JE
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 15:54:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FwP4H-0003PN-0T
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 15:54:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FwP4G-0003PF-Qu
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 15:54:20 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FwPH7-00035U-0S
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 16:07:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FwP4G-00029k-00
	for <commit-classpath@gnu.org>; Fri, 30 Jun 2006 15:54:20 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FwP4E-00029e-U1
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 19:54:20 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FwP4E-00029e-U1@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Fri, 30 Jun 2006 19:54:18 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/GtkCh...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2006 19:54:21 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/30 19:54:18

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: GtkCheckboxPeer.java 

Log message:
	2006-06-30  Lillian Angel  <langel@redhat.com>
	
	        * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
	        (create): Changed to be non-syncronized.
	        (setLabel): Likewise.
	        (setCheckboxGroup): Likewise.
	        (addToGroupMap): Likewise. Added synchronized block around
	        code.
	        (dispose): Changed to be non-syncronized.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7980&r2=1.7981
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java?cvsroot=classpath&r1=1.27&r2=1.28



From MAILER-DAEMON Fri Jun 30 16:03:10 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FwPCo-0007R9-6i
	for mharc-commit-classpath@gnu.org; Fri, 30 Jun 2006 16:03:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FwPCm-0007ML-5s
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 16:03:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FwPCl-0007K5-7h
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 16:03:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FwPCl-0007Ju-3b
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 16:03:07 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FwPPb-0003cJ-BI
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 16:16:23 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FwPCk-0002Vq-00
	for <commit-classpath@gnu.org>; Fri, 30 Jun 2006 16:03:06 -0400
Received: from langel by savannah.gnu.org with local (Exim 4.50)
	id 1FwPCj-0002Vm-0U
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 20:03:06 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FwPCj-0002Vm-0U@savannah.gnu.org>
From: Lillian Angel <langel@redhat.com>
Date: Fri, 30 Jun 2006 20:03:05 +0000
Subject: [commit-cp] classpath ChangeLog gnu/java/awt/peer/gtk/GtkCh...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2006 20:03:08 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Lillian Angel <langel>	06/06/30 20:03:05

Modified files:
	.              : ChangeLog 
	gnu/java/awt/peer/gtk: GtkCheckboxPeer.java 

Log message:
	2006-06-30  Lillian Angel  <langel@redhat.com>
	
	        * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
	        (create): Added synchronized block around groupMap.get calls.
	        (setCheckboxGroup): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7981&r2=1.7982
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java?cvsroot=classpath&r1=1.28&r2=1.29



From MAILER-DAEMON Fri Jun 30 16:43:32 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FwPps-0001np-CQ
	for mharc-commit-classpath@gnu.org; Fri, 30 Jun 2006 16:43:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FwPpr-0001n2-Dl
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 16:43:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FwPpq-0001lk-Fi
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 16:43:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FwPpq-0001la-9X
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 16:43:30 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FwQ2g-0006Jh-Vy
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 16:56:47 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FwPpp-0005IQ-00
	for <commit-classpath@gnu.org>; Fri, 30 Jun 2006 16:43:29 -0400
Received: from tbento by savannah.gnu.org with local (Exim 4.50)
	id 1FwPpn-0005IJ-Ox
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 20:43:29 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FwPpn-0005IJ-Ox@savannah.gnu.org>
From: Tania Bento <tbento@redhat.com>
Date: Fri, 30 Jun 2006 20:43:27 +0000
Subject: [commit-cp] classpath ChangeLog java/awt/TextArea.java java...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2006 20:43:31 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Tania Bento <tbento>	06/06/30 20:43:27

Modified files:
	.              : ChangeLog 
	java/awt       : TextArea.java TextComponent.java Component.java 

Log message:
		2006-06-30  Tania Bento  <tbento@redhat.com>
	
	        * java/awt/TextArea.java
	        (TextArea(String, int, int, int)): No longer throws
	        IllegalArgumentException if rows, columns, or scrollbarVisibility
	        values are invalid.
	        (TextArea(String, int, int, int)): If rows or columns are < 0,
	        they get set to 0.  If scrollbarVisibility is < 0 or > 4, it
	        gets set to the default value of 0 (SCROLLBARS_BOTH).
	         (appendText): Added case when peer = null.
	        (insertText): Added case when peer == null.
	        (replaceText): Added case when peer == null.
	        * java/awt/TextComponent.java
	        (TextComponent(String)): If text == null, set it to "".

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7982&r2=1.7983
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/TextArea.java?cvsroot=classpath&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/TextComponent.java?cvsroot=classpath&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/Component.java?cvsroot=classpath&r1=1.127&r2=1.128



From MAILER-DAEMON Fri Jun 30 19:19:34 2006
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1FwSGs-0004UI-0L
	for mharc-commit-classpath@gnu.org; Fri, 30 Jun 2006 19:19:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FwSGq-0004U8-A2
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 19:19:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FwSGo-0004To-T8
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 19:19:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FwSGo-0004Tk-Nz
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 19:19:30 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FwSTh-0007tH-2W
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 19:32:49 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian))
	id 1FwSGo-0002wQ-00
	for <commit-classpath@gnu.org>; Fri, 30 Jun 2006 19:19:30 -0400
Received: from rabbit78 by savannah.gnu.org with local (Exim 4.50)
	id 1FwSGn-0002wN-73
	for commit-classpath@gnu.org; Fri, 30 Jun 2006 23:19:30 +0000
To: commit-classpath@gnu.org
Message-Id: <E1FwSGn-0002wN-73@savannah.gnu.org>
From: Roman Kennke <roman@kennke.org>
Date: Fri, 30 Jun 2006 23:19:29 +0000
Subject: [commit-cp] classpath/gnu/java/awt/java2d AbstractGraphics2...
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: classpath-patches@gnu.org
List-Id: "Automatic administrative message \(CVS, bugs,
	regressions\)." <commit-classpath.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2006 23:19:32 -0000

CVSROOT:	/cvsroot/classpath
Module name:	classpath
Changes by:	Roman Kennke <rabbit78>	06/06/30 23:19:29

Modified files:
	gnu/java/awt/java2d: AbstractGraphics2D.java 
	.              : ChangeLog 

Log message:
	2006-07-01  Roman Kennke  <kennke@aicas.com>
	
		* gnu/java/awt/java2d/AbstractGraphics2D.java
		(transform): Make field protected.
		(getDestinationRaster): Provide default implementation for
		previously abstract method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java?cvsroot=classpath&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7983&r2=1.7984



