From MAILER-DAEMON Sat Jan 03 15:40:56 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AcsZp-0006eT-2U
	for mharc-classpath@gnu.org; Sat, 03 Jan 2004 15:40:53 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AcsZK-00068I-7P
	for classpath@gnu.org; Sat, 03 Jan 2004 15:40:22 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AcsYi-0005fD-MN
	for classpath@gnu.org; Sat, 03 Jan 2004 15:40:16 -0500
Received: from [62.108.28.95] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AcsYh-0005dq-Lm
	for classpath@gnu.org; Sat, 03 Jan 2004 15:39:43 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1Acqg6-0001q4-00
	for <classpath@gnu.org>; Sat, 03 Jan 2004 19:39:14 +0100
From: Mark Wielaard <mark@klomp.org>
To: classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-CzgnS4bMlgkO7TaqSDdy"
Message-Id: <1073155168.22620.95.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sat, 03 Jan 2004 19:39:28 +0100
Subject: The status of Classpath (in brief)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jan 2004 20:40:37 -0000


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

Hi Gang,

People contact me from time to time with questions about the status of
GNU Classpath and how they can help. I don't have a good story yet, but
below is an one example of something that I send quickly before going on
vacation. I am back now btw :)

Hope to make this into a more standard reply and/or webpage describing
the effort. If you have any comments and/or suggestions to make it more
clear, please yell.

Cheers,

Mark

> RMS asked to me contact with you about implement the free Java class
> libs. I would like to know the current status of your project.
> Could you send me a brief explanation?

[...]

GNU Classpath creates a free alternative for the core libraries that
come with what Sun calls the J2SE. But GNU Classpath is only the library
implementation. It provides the core libraries mostly written in the
java language and offers a VM interface for integrations into larger
development environments and were possible a C/JNI implementation for
POSIX like systems to interface with the rest of the system.

It does not offer a compiler (for which we use GNU Compiler for Java -
gcj and/or Jikes). It also doesn't offer a runtime environment for which
we again rely on gcj, which can both do traditional byte-code
interpretation and compile programs written in the java programming
language to native code (portable to lots of architectures since gcj is
a GCC frontend). The native code compilation of gcj does give us a nice
advantage over the traditional proprietary java implementations since it
produces code which runs very fast without the need for interpretation
or just in time compilation of byte-code.

Other free runtime environment/compiler and research projects which
build upon classpath (excluding any proprietary projects, which are free
to build upon GNU Classpath under certain conditions, but which we won't
promote to others) are listed at our homepage under:
http://www.gnu.org/software/classpath/stories.html

The most notable one is the kaffe project <http://www.kaffe.org/> which
is a complete development environment for programs written in the java
language distributed under the GPL which comes with its own compiler,
tools, byte code interpreter and just in time compiler. It used to come
with its own implementation of the core libraries but since the
beginning of this year they are slowly converting it to build upon GNU
Classpath. The libgcj and kaffe hackers are nowadays the biggest
contributors to GNU Classpath.

A couple of projects around GNU Classpath will meet at the Fosdem
conference in Brussels, Belgium on 21/22 February to discuss how they
can work together better and what the free software community at large
needs to liberate some of the free software programs written in the java
language. (we will also have a meeting with some Debian developers which
are currently unable to support lots of free software [or rather open
source] programs which are written in the java language, distributed
under free software licenses, but depending on proprietary runtimes and
libraries which prevent them from being distributed in a useful manner.)

GNU Classpath currently has fairly complete implementations for the
following packages: java.beans, java.io, java.lang, java.math, java.net,
java.rmi, java.security, java.sql, java.text, java.util, java.util.jar,
java.util.zip.

The following packages are in a less complete state and need more work
before we can claim that they are useful for developers: java.applet,
java.awt, java.util.prefs, java.util.logging, java.nio, java.applet and
javax.print. And some (minimal) parts of javax.swing. Please ask on the
GNU Classpath mailinglist <mailto:classpath@gnu.org> for more detailed
status and who is working on what.

Some additional tools are bundled in the cp-tools project (javap, gjdoc,
serialver). And some additional libraries are developed by the GNU
ClasspathX project (javax.mail, javax.xml, javax.servlet, etc). The GNU
Crypto project provides a javax.crypto implementation on top of its own
crypto library and the Jessie project provides some javax.net.ssl
classes. We are busy importing the gnu.regex packages for
java.util.regexp support.

A (incomplete) task list is currently hosted at:
http://www.reali.ch/~reali/classpath/tasks.html
(Savannah does not let us update out webpages yet, it will move to
http://www.gnu.org/software/classpath/ soon.)

These tasks range from writing simple tests (for example to check that
all equals, hashcode or serializable implementations work according to
specification), creating tools for jar file and keystore manipulation,
creating documentation for undocumented classes, writing a guide on
using free compilers and runtimes like gcj and kaffe for new projects,
till creating larger missing standard libraries like javax.imageio or
javax.swing.text and subpackages or specialized classes that need lots
of expertise like java.awt.geom.Area, which requires someone with lots
of numerical computation and computational geometry expertise.

For a general overview of what GNU Classpath is missing at the moment
compared to some other proprietary closed source JDK libraries. see:
http://japi.sab39.org/htmlout/h-jdk14-classpath.html

Currently we create a snapshot release of GNU Classpath every three
months to show our progress. These snapshot releases are then
incorporated in the various runtime/development environments. We are
currently at snaphot release 0.07. The stated goal for GNU Classpath 1.0
has always been at least as complete as 1.1, including documentation,
test-suites and a stable API for integration into the different
compilers and execution environments that build upon it. But in practice
we are driven by what people actually use or want to use. So while we
find the documentation, tests and the Abstract Window Toolkit (java.awt)
support not yet 1.0 material you will find support for lots of 1.4
extensions for the various packages or even complete new packages like
java.nio and java.util.logging in the current GNU Classpath snapshot
releases. Much is driven by the desire of people to run the larger free
software frameworks like JBoss, Eclipse and some of the Apache Jakarta
tools. Most of which now just work on VMs based on GNU Classpath.

AWT support is progressing nicely and is the last real code deficiency
for declaring 1.0 status (there is work on different backends of which
the GTK+ one is the most important, we also hope to provide a ncurses
one). But tests and documentation are still not 1.0 material. Tests are
organised in the Mauve project <http://sources.redhat.com/mauve/>. There
is fairly complete API documentation describing each class and method in
GNU Classpath. But except for the Hacker Guide and VM Integration Guide
we don't have any good "overview" or "this is how you use the libraries"
documentation. This is important to have before declaring 1.0 because it
will show what can really be done with the free implementations.
Nowadays people depends descriptions of the proprietary implementations
which often leads to more "semi-free" programs that don't work on a
completely free system because they will use features which are not
available yet in GNU Classpath.

> I think a free JFC implementation is indispensable for any Java
> application development. JFC has 5 APIs: AWT, SWING, Accessibility,
> 2D, Drag&Drop. (RMS asked me to help the free SWING development).
> Pls tell me your progress on these APIs or other packages you have
> done.

We haven't been focusing very much on JFC classes for GNU Classpath 1.0
since we first wanted to provide a minimal, but complete, core
implementation that could be used by free software developers.
But there has been some work by individuals on the various parts.

AWT was something which we wanted to support for 1.0 and this is
progressing nicely since Red Hat has made it a priority to complete this
part of the library. So there are actually a couple of hackers now
working on completing it. We also have a fairly nice test-suite based on
the Wonka visual test-engine that helps a lot seeing where any remaining
bugs are. Thomas Fitzsimmons <mailto:fitzsim@redhat.com> is the most
active developer on this package and the GTK+ peers. He probably has a
good overview of what works and what still needs work.

SWING consists mainly of stub classes. It was probably a mistake to keep
them around so long since they mainly don't work. There are some
subpackages which are implemented and documented almost completely
though (notably javax.swing.border and javax.swing.undo which were done
by Sascha Brawer <mailto:brawer@dandelis.ch>). Graydon Hoare
<mailto:graydon@pobox.com> has been working a bit on the widget and
event framework and he did get a simple JButton working so some of the
foundation classes do work.

2D has been the project that Graydon Hoare <mailto:graydon@pobox.com>
has been working hard on the last couple of months. He is creating a 2D
graphics environment on top of existing free software libraries like
Pango, Cairo, ft2 and freetype. Some of his progress can be seen at:
<http://people.redhat.com/graydon/native-java2d-aug28-2003.png>
Sascha Brawer <mailto:brawer@dandelis.ch> has been working on the
geometry classes and works on an alternative font library.=20

Accessibility interfaces are complete in javax.accessibility, but need
to be hooked up to the various parts of the rest of the system and in
particular to the GTK+ peers. I don't believe anybody is actively
working on that at the moment. Eric Blake <mailto:ebb9@email.byu.edu>
was the last person doing work on this, but he hasn't been active for a
while.

Drag&Drop has some parts implemented in java.awt.dnd[.peer] but these
are mainly stubs at the moment. Michael Koch <mailto:konqueror@gmx.de>
would be the person to tell you more about this part.

I think the simplest (and most fun) way to contribute for people is by
looking at the free software java applications they already use and/or
want to use with the free VMs that use GNU Classpath like gcj, kaffe,
kissme, sablevm or ikvm.net, etc. One thing that really boosted the
confidence in our library implementation was when people tried (and
succeeded!) in getting for example Eclipse <http://www.eclipse.org/>
working with gcj, kaffe and ikvm. Testing whether free applications run
correctly on a free system gives people a very concrete goal to achieve.

Good places to start are the Kaffe application page and the gcj RHUG
project:
http://www.kaffe.org/compatibility_applications.shtml
http://sources.redhat.com/rhug/

Both have examples of what and how to get things working and have
contact addresses and mailing-lists that can be contacted when people
want more information or to offer help adding libraries and applications
to the collection. If more things work for these projects we can be a
bit more confident that the GNU Classpath libraries (that both gcj and
kaffe use) works correctly. And any bugs or deficiencies found in this
way are clues what is the most important to fix first.

One of the Debian developers who has been very active and who maintains
a couple of free applications that cannot be packaged currently for
Debian main because they depend on parts of Swing is Arnaud Vandyck
<mailto:avdyck@debian.org>. He can probably give a list of what he
thinks are important free programs that are currently trapped because
they use Swing.

I will be offline for the next week so please follow up to the GNU
classpath mailinglist <mailto:classpath@gnu.org> or to any of the
individuals mentioned above if you want faster replies.

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

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

iD8DBQA/9wxfxVhZCJWr9QwRAmA9AJ0SL0frMN5ia9EnnaI0RbHgkRJzWACfaZcw
46hLxwwL3QXcjHqSr2f4otI=
=uy+n
-----END PGP SIGNATURE-----

--=-CzgnS4bMlgkO7TaqSDdy--




From MAILER-DAEMON Sat Jan 03 20:52:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AcxQG-0004yv-QN
	for mharc-classpath@gnu.org; Sat, 03 Jan 2004 20:51:20 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AcxPm-0004fk-5A
	for classpath@gnu.org; Sat, 03 Jan 2004 20:50:50 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AcxMz-0003W6-DI
	for classpath@gnu.org; Sat, 03 Jan 2004 20:48:28 -0500
Received: from [216.102.199.253] (helo=bothner.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AcxLS-0002z4-OY
	for classpath@gnu.org; Sat, 03 Jan 2004 20:46:23 -0500
Received: from bothner.com (eureka.bothner.com [192.168.1.9])
	by bothner.com (8.12.10/8.12.10) with ESMTP id i040jpiR017682;
	Sat, 3 Jan 2004 16:45:51 -0800
Message-ID: <3FF761D7.8050200@bothner.com>
Date: Sat, 03 Jan 2004 16:44:07 -0800
From: Per Bothner <per@bothner.com>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4.1) Gecko/20031030
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: java-patches@gcc.gnu.org, classpath@gnu.org
Content-Type: multipart/mixed; boundary="------------090604000500000201000107"
Cc: 
Subject: PATCH for Date.parse
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jan 2004 01:51:18 -0000

This is a multi-part message in MIME format.
--------------090604000500000201000107
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

One of the Kawa tests was failing because our implementation of
Date.parse was buggy.  A sensible person might have changed the
testcase (since it was just to test calling static Java methods from 
Scheme).
Alas, I'm not a sensible person, so I fixed Date.java instead.  There were
a number of problems with it.  There are almost certainly still bugs in it,
but now it shouldn't fail quite so easily.

I checked the attached patch into libjava.
It should also go into Classpath.

I also have a Mauve test case.
-- 
        --Per Bothner

> per@bothner.com   http://per.bothner.com/



--------------090604000500000201000107
Content-Type: text/plain;
 name="Date.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Date.patch"

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

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

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

--------------090604000500000201000107--




From MAILER-DAEMON Sun Jan 04 15:45:26 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdF7l-000314-8M
	for mharc-classpath@gnu.org; Sun, 04 Jan 2004 15:45:25 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdF7e-0002vs-MS
	for classpath@gnu.org; Sun, 04 Jan 2004 15:45:18 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdF72-0002N9-TG
	for classpath@gnu.org; Sun, 04 Jan 2004 15:45:13 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AdF72-0002D9-Jh
	for classpath@gnu.org; Sun, 04 Jan 2004 15:44:40 -0500
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AdE7R-0005G3-W2
	for classpath@gnu.org; Sun, 04 Jan 2004 14:41:02 -0500
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1AdE6v-0002mI-00
	for <classpath@gnu.org>; Sun, 04 Jan 2004 20:40:29 +0100
Received: from mpiat2304.ag2.mpi-sb.mpg.de
	([139.19.20.93] helo=kaffe.org ident=topic)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AdE6u-0002m8-00
	for <classpath@gnu.org>; Sun, 04 Jan 2004 20:40:28 +0100
Message-ID: <3FF86C2C.2000108@kaffe.org>
Date: Sun, 04 Jan 2004 20:40:28 +0100
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.3) Gecko/20030312
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: GNU Classpath <classpath@gnu.org>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: by AMaViS perl-11
Subject: Java Runtime Matrix for UserLinux
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jan 2004 20:45:21 -0000

Hi all,

I've started a java runtime matrix in the UserLinux wiki, that will 
serve as the foundation for their decision which runtime to pick. So if 
you feel like having your runtime as the default java runtime in 
UserLinux, please consider filling in the blanks for your project. If 
you don't please remove it from the matrix.

You can find the matrix here: 
http://cgi.userlinux.com/cgi-bin/wiki.pl?Java_Runtime_Matrix

cheers,
dalibor topic




From MAILER-DAEMON Sun Jan 04 17:55:30 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdH9d-0002BF-Tc
	for mharc-classpath@gnu.org; Sun, 04 Jan 2004 17:55:29 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdH9Y-00025R-LN
	for classpath@gnu.org; Sun, 04 Jan 2004 17:55:24 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdH8q-0001WL-82
	for classpath@gnu.org; Sun, 04 Jan 2004 17:55:13 -0500
Received: from [139.165.32.78] (helo=serv09.segi.ulg.ac.be)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdH8p-0001Su-5k
	for classpath@gnu.org; Sun, 04 Jan 2004 17:54:39 -0500
Received: (qmail 605 invoked by uid 504); 4 Jan 2004 22:53:08 +0100
Received: from arnaud@ressource-toi.org by serv09.segi.ulg.ac.be by uid 501
	with qmail-scanner-1.16 
	(clamscan: 0.60. spamassassin: 2.55.  Clear:. 
	Processed in 0.296309 secs); 04 Jan 2004 21:53:08 -0000
Received: from unknown (HELO vbstefi60.fapse.ulg.ac.be) ([139.165.77.140])
	(envelope-sender <arnaud@ressource-toi.org>)
	by serv09.segi.ulg.ac.be (qmail-ldap-1.03) with SMTP
	for <classpath@gnu.org>; 4 Jan 2004 22:53:07 +0100
Received: from arnaud by vbstefi60.fapse.ulg.ac.be with local (Exim 3.35 #1
	(Debian)) id 1AdGEA-0006u3-00
	for <classpath@gnu.org>; Sun, 04 Jan 2004 22:56:06 +0100
To: classpath@gnu.org
From: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
Message-Id: <E1AdGEA-0006u3-00@vbstefi60.fapse.ulg.ac.be>
Sender: Arnaud Vandyck <arnaud@vbstefi60.fapse.ulg.ac.be>
Date: Sun, 04 Jan 2004 22:56:06 +0100
Subject: T E S T Do not respond
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jan 2004 22:55:28 -0000

Sorry, just a test



From MAILER-DAEMON Sun Jan 04 18:47:59 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdHxp-00059n-Qj
	for mharc-classpath@gnu.org; Sun, 04 Jan 2004 18:47:21 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdHxT-0004pu-4M
	for classpath@gnu.org; Sun, 04 Jan 2004 18:46:59 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdHwY-0003fk-Di
	for classpath@gnu.org; Sun, 04 Jan 2004 18:46:34 -0500
Received: from [139.165.32.78] (helo=serv09.segi.ulg.ac.be)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdHwX-0003ei-7D
	for classpath@gnu.org; Sun, 04 Jan 2004 18:46:01 -0500
Received: (qmail 2143 invoked by uid 504); 4 Jan 2004 23:44:31 +0100
Received: from arnaud.vandyck@ulg.ac.be by serv09.segi.ulg.ac.be by uid 501
	with qmail-scanner-1.16 
	(clamscan: 0.60. spamassassin: 2.55.  Clear:. 
	Processed in 0.326502 secs); 04 Jan 2004 22:44:31 -0000
Received: from unknown (HELO localhost) ([139.165.201.34])
	(envelope-sender <arnaud.vandyck@ulg.ac.be>)
	by serv09.segi.ulg.ac.be (qmail-ldap-1.03) with SMTP
	for <classpath@gnu.org>; 4 Jan 2004 23:44:31 +0100
Received: from arnaud by localhost with local (Exim 4.30) id 1AdGyw-0004ey-RK
	for classpath@gnu.org; Sun, 04 Jan 2004 23:44:26 +0100
To: classpath@gnu.org
References: <E1AdGEA-0006u3-00@vbstefi60.fapse.ulg.ac.be>
From: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
X-Face: >U]gI'=hKRtZE@~Svh"mU,aS"">yCT*dBkVAFl'!]!&k@R8fEr{-)Ql6{xhuXKb+!>}x;
	^2ck7Ytr'EABxt~)3q?AO}$:wwSva.$uNN9x.w4+uVmMMSB1~EbJgo|9E0yQXONuM'~c*20^
Date: Sun, 04 Jan 2004 23:44:26 +0100
In-Reply-To: <E1AdGEA-0006u3-00@vbstefi60.fapse.ulg.ac.be> (Arnaud Vandyck's
	message of "Sun, 04 Jan 2004 22:56:06 +0100")
Message-ID: <87ad53z645.fsf@oz.fapse.ulg.ac.be>
User-Agent: Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
Subject: Re: T E S T Do not respond
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jan 2004 23:47:15 -0000

Arnaud Vandyck <arnaud.vandyck@ulg.ac.be> writes:

> Sorry, just a test

I hope it's correct now...

And sorry again for the noise ;)

-- 
Arnaud



From MAILER-DAEMON Sun Jan 04 19:23:53 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdIXA-0003za-Oc
	for mharc-classpath@gnu.org; Sun, 04 Jan 2004 19:23:52 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdIX7-0003yO-Hp
	for classpath@gnu.org; Sun, 04 Jan 2004 19:23:49 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdIUO-0002Ye-Pk
	for classpath@gnu.org; Sun, 04 Jan 2004 19:21:33 -0500
Received: from [203.12.22.20] (helo=power.connexus.net.au)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AdIS6-0007vn-J1
	for classpath@gnu.org; Sun, 04 Jan 2004 19:18:38 -0500
Received: from dholmeslaptop (dholmes.dltech.com.au [203.222.72.2])
	by power.connexus.net.au (8.12.4/8.11.6) with SMTP id i04N9XEs015833;
	Mon, 5 Jan 2004 10:09:35 +1100 (EST)
	(envelope-from dholmes@dltech.com.au)
XAntiVirus: This e-mail has been scanned for viruses via the Connexus Internet
	Service
From: "David Holmes" <dholmes@dltech.com.au>
To: "Mark Wielaard" <mark@klomp.org>, <classpath@gnu.org>
Date: Mon, 5 Jan 2004 09:15:32 +1000
Message-ID: <NFBBKALFDCPFIDBNKAPCAEMDDLAA.dholmes@dltech.com.au>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: 7bit
X-Priority: 3 (Normal)
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook IMO, Build 9.0.6604 (9.0.2911.0)
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1165
In-Reply-To: <1073155168.22620.95.camel@elsschot.wildebeest.org>
Importance: Normal
Cc: 
Subject: RE: The status of Classpath (in brief)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2004 00:23:50 -0000

Mark,

My only comment is that a stated goal of "at least as complete as 1.1"
is no longer adequate. The Java platform is a moving target and 1.5 is
on the horizon. I recognise that there are too many packages to make a
blanket statement of support - otherwise we'll be at 1.6 or 1.7 before
Classpath 1.0 can get out the door. Perhaps it is time to look at
breaking Classpath down into package subsets and aim for 1.2
compatibility for the "core" packages (lang, util, ???) and define
other packages independently of the core eg nio must obviously aim for
1.4 compatability.

I suspect that the above doesn't actually require many code updates as
I think much of the core is already around 1.4 (maybe enough that 1.3
could be the stated level for the core?).

Regards,
David Holmes




From MAILER-DAEMON Mon Jan 05 01:10:35 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdNwh-0003po-2j
	for mharc-classpath@gnu.org; Mon, 05 Jan 2004 01:10:35 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdNvm-0003CH-Cb
	for classpath@gnu.org; Mon, 05 Jan 2004 01:09:38 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdNqI-0000w9-VS
	for classpath@gnu.org; Mon, 05 Jan 2004 01:04:32 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AdNiC-0006wm-DT
	for classpath@gnu.org; Mon, 05 Jan 2004 00:55:36 -0500
Received: from [24.25.9.100] (helo=ms-smtp-01-eri0.southeast.rr.com)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AdMki-00073t-4u
	for classpath@gnu.org; Sun, 04 Jan 2004 23:54:08 -0500
Received: from [10.0.0.2] (rdu57-9-048.nc.rr.com [66.57.9.48])
	by ms-smtp-01-eri0.southeast.rr.com (8.12.10/8.12.7) with ESMTP id
	i054rxHG019228; Sun, 4 Jan 2004 23:54:02 -0500 (EST)
From: "C. Brian Jones" <cbj@gnu.org>
To: David Holmes <dholmes@dltech.com.au>
In-Reply-To: <NFBBKALFDCPFIDBNKAPCAEMDDLAA.dholmes@dltech.com.au>
References: <NFBBKALFDCPFIDBNKAPCAEMDDLAA.dholmes@dltech.com.au>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-e2KaRGsXeMMouBM0mJMo"
Message-Id: <1073278438.3286.36.camel@lyta.haphazard.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-7) 
Date: Sun, 04 Jan 2004 23:53:59 -0500
X-Virus-Scanned: Symantec AntiVirus Scan Engine
Cc: classpath@gnu.org
Subject: RE: The status of Classpath (in brief)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: cbj@gnu.org
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2004 06:10:33 -0000


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

On Sun, 2004-01-04 at 18:15, David Holmes wrote:
> Mark,
>=20
> My only comment is that a stated goal of "at least as complete as 1.1"
> is no longer adequate. The Java platform is a moving target and 1.5 is
> on the horizon. I recognise that there are too many packages to make a
> blanket statement of support - otherwise we'll be at 1.6 or 1.7 before
> Classpath 1.0 can get out the door. Perhaps it is time to look at
> breaking Classpath down into package subsets and aim for 1.2
> compatibility for the "core" packages (lang, util, ???) and define
> other packages independently of the core eg nio must obviously aim for
> 1.4 compatability.
>=20
> I suspect that the above doesn't actually require many code updates as
> I think much of the core is already around 1.4 (maybe enough that 1.3
> could be the stated level for the core?).

I think changing the 1.0 goals at this point would delay the release of
1.0 and any subsequent releases containing the 1.2, 1.3, or 1.4
compatibility you mention.  With the exception of Swing and Java 2D it
seems as though those releases would follow quickly on the heels of 1.0.

--=20
Brian Jones <cbj@gnu.org>

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

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

iD8DBQA/+O3mcEcmdY33uzYRAo+UAJ9ZWYzj0MTrYRNU8uaxqDfSFfbz+gCdEkrA
M1qvuIrJFGKdu3sWsVGaibw=
=i/d1
-----END PGP SIGNATURE-----

--=-e2KaRGsXeMMouBM0mJMo--




From MAILER-DAEMON Mon Jan 05 01:13:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdNzC-0005Ov-TP
	for mharc-classpath@gnu.org; Mon, 05 Jan 2004 01:13:10 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdNz8-0005Ih-C3
	for classpath@gnu.org; Mon, 05 Jan 2004 01:13:06 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdNvP-0002v7-F9
	for classpath@gnu.org; Mon, 05 Jan 2004 01:09:47 -0500
Received: from [132.208.30.45] (helo=gadek.homelinux.org)
	by monty-python.gnu.org with esmtp (TLSv1:RC4-SHA:128) (Exim 4.24)
	id 1AdNvO-0002sT-0s
	for classpath@gnu.org; Mon, 05 Jan 2004 01:09:14 -0500
Received: from localhost ([127.0.0.1])
	by gadek.homelinux.org with esmtp (Exim 4.30)
	id 1AdMyV-0007S8-Fv; Mon, 05 Jan 2004 00:08:23 -0500
From: "Grzegorz B. Prokopski" <gadek@debian.org>
To: David Holmes <dholmes@dltech.com.au>
In-Reply-To: <NFBBKALFDCPFIDBNKAPCAEMDDLAA.dholmes@dltech.com.au>
References: <NFBBKALFDCPFIDBNKAPCAEMDDLAA.dholmes@dltech.com.au>
Content-Type: text/plain; charset=iso-8859-2
Organization: Debian GNU/Linux http://www.debian.org
Message-Id: <1073279301.1117.145.camel@gadek.homelinux.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Mon, 05 Jan 2004 00:08:22 -0500
Content-Transfer-Encoding: quoted-printable
Sender: mail <mail@gadek.homelinux.org>
Cc: Mark Wielaard <mark@klomp.org>, GNU Classpath <classpath@gnu.org>
Subject: RE: The status of Classpath (in brief)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2004 06:13:09 -0000

W li=B6cie z nie, 04-01-2004, godz. 18:15, David Holmes pisze:=20
> My only comment is that a stated goal of "at least as complete as 1.1"
> is no longer adequate. The Java platform is a moving target and 1.5 is
> on the horizon.

As Mark has mentioned somewhere it'd probably be the topic of one of
the discussions during FOSDEM.

Personally, I think that GNU Classpath to Sun's "standards" is in
similar situation as Wine to MS API. The smart question is:
what the Wine guys have set as their 1.0 (or 0.9) goals? [0]

Taking Wine as an example - things like:
* testing suite
* compatibility list for _applications_
* no grave bugs ;-) [or having them known/documented]
* documentation
come to mind. (speaking from memory of Wine-devel discussions)

For GNU CP the question that arises the most often is:
toward which version is it heading?
And Mark's answer is right (in another part of his essay):
none - GNU CP is driven by what is needed for the _applications_
(which people want and make possible to run).

Of course running an app requires JVM with certain features. But by
"being able to run an app" I understand that given correct support from
a JVM - it is possible to run an app with GNU CP and this JVM.

So it might be not bad idea to declare a set of _apps_ as (part of)
1.0 goals. And I also think that it would be more substantial than
"80% or 1.2 compatibility" or sth. - which doesn't mean much, really.
And people would be able to take a look at ex. website and check what
they *actually* can expect to run.

Damn, I was to keep this proposal till FOSDEM ! *g* ;-) [1]

Cheers,

					Grzegorz B. Prokopski

[0] http://www.winehq.org/site/todo_lists (this is list for 0.9, I
couldn't find the list for 1.0 ATM - they must have hidden it ;-)
[1] Obviously I don't claim prior art on the idea. It's a joke.
--=20
Grzegorz B. Prokopski <gadek@debian.org>
Debian GNU/Linux      http://www.debian.org
SableVM - LGPLed JVM  http://www.sablevm.org




From MAILER-DAEMON Mon Jan 05 01:19:46 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdO5a-00009W-5D
	for mharc-classpath@gnu.org; Mon, 05 Jan 2004 01:19:46 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdO5W-00008L-31
	for classpath@gnu.org; Mon, 05 Jan 2004 01:19:42 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdO4u-0008LW-Go
	for classpath@gnu.org; Mon, 05 Jan 2004 01:19:36 -0500
Received: from [64.4.37.91] (helo=hotmail.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdO4u-0008KC-0Y
	for classpath@gnu.org; Mon, 05 Jan 2004 01:19:04 -0500
Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC;
	Sun, 4 Jan 2004 21:17:31 -0800
Received: from 80.177.127.218 by by10fd.bay10.hotmail.msn.com with HTTP;
	Mon, 05 Jan 2004 05:17:30 GMT
X-Originating-IP: [80.177.127.218]
X-Originating-Email: [robert_lougher@hotmail.com]
X-Sender: robert_lougher@hotmail.com
From: "Robert Lougher" <robert_lougher@hotmail.com>
To: classpath@gnu.org
Bcc: 
Date: Mon, 05 Jan 2004 05:17:30 +0000
Mime-Version: 1.0
Content-Type: text/plain; format=flowed
Message-ID: <BAY10-F916mNh4R2b6M0001b3a9@hotmail.com>
X-OriginalArrivalTime: 05 Jan 2004 05:17:31.0218 (UTC)
	FILETIME=[38022B20:01C3D34B]
Subject: RE: Java Runtime Matrix for UserLinux
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2004 06:19:44 -0000




----Original Message Follows----
From: Dalibor Topic <robilad@kaffe.org>
To: GNU Classpath <classpath@gnu.org>
Subject: Java Runtime Matrix for UserLinux
Date: Sun, 04 Jan 2004 20:40:28 +0100

Hi all,

I've started a java runtime matrix in the UserLinux wiki, that will serve as 
the foundation for their decision which runtime to pick. So if you feel like 
having your runtime as the default java runtime in UserLinux, please 
consider filling in the blanks for your project. If you don't please remove 
it from the matrix.

You can find the matrix here: 
http://cgi.userlinux.com/cgi-bin/wiki.pl?Java_Runtime_Matrix

cheers,
dalibor topic



_______________________________________________
Classpath mailing list
Classpath@gnu.org
http://mail.gnu.org/mailman/listinfo/classpath

_________________________________________________________________
Send a funky MSN Messenger Christmas card http://www.msn.co.uk/christmascard




From MAILER-DAEMON Mon Jan 05 01:35:25 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdOKf-0002CH-Sf
	for mharc-classpath@gnu.org; Mon, 05 Jan 2004 01:35:21 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdOK1-0001JW-RU
	for classpath@gnu.org; Mon, 05 Jan 2004 01:34:41 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdOJH-0008Sr-NX
	for classpath@gnu.org; Mon, 05 Jan 2004 01:34:28 -0500
Received: from [64.4.37.100] (helo=hotmail.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdOGz-00069R-FI
	for classpath@gnu.org; Mon, 05 Jan 2004 01:31:33 -0500
Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC;
	Sun, 4 Jan 2004 21:30:05 -0800
Received: from 80.177.127.218 by by10fd.bay10.hotmail.msn.com with HTTP;
	Mon, 05 Jan 2004 05:30:05 GMT
X-Originating-IP: [80.177.127.218]
X-Originating-Email: [robert_lougher@hotmail.com]
X-Sender: robert_lougher@hotmail.com
From: "Robert Lougher" <robert_lougher@hotmail.com>
To: classpath@gnu.org
Bcc: 
Date: Mon, 05 Jan 2004 05:30:05 +0000
Mime-Version: 1.0
Content-Type: text/plain; format=flowed
Message-ID: <BAY10-F100hejFlxDqj0003179d@hotmail.com>
X-OriginalArrivalTime: 05 Jan 2004 05:30:05.0564 (UTC)
	FILETIME=[F9A23BC0:01C3D34C]
Subject: RE: Java Runtime Matrix for UserLinux
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2004 06:35:00 -0000

Hi,

Sorry for the empty post - first day back into work tomorrow :)  What I 
meant to say:

Any reasons for missing out JamVM (http::/jamvm.sourceforge.net)?  It's been 
using Classpath since 1.0.0 (12-Mar-2003).  Quite a few people are using it 
successfully, and I think a number of people on this list have given it a 
test.

Thanks,

Rob.

----Original Message Follows----
From: Dalibor Topic <robilad@kaffe.org>
To: GNU Classpath <classpath@gnu.org>
Subject: Java Runtime Matrix for UserLinux
Date: Sun, 04 Jan 2004 20:40:28 +0100

Hi all,

I've started a java runtime matrix in the UserLinux wiki, that will serve as 
the foundation for their decision which runtime to pick. So if you feel like 
having your runtime as the default java runtime in UserLinux, please 
consider filling in the blanks for your project. If you don't please remove 
it from the matrix.

You can find the matrix here: 
http://cgi.userlinux.com/cgi-bin/wiki.pl?Java_Runtime_Matrix

cheers,
dalibor topic



_______________________________________________
Classpath mailing list
Classpath@gnu.org
http://mail.gnu.org/mailman/listinfo/classpath

_________________________________________________________________
Express yourself with cool new emoticons http://www.msn.co.uk/specials/myemo




From MAILER-DAEMON Mon Jan 05 06:21:15 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdSnK-0007BZ-Fn
	for mharc-classpath@gnu.org; Mon, 05 Jan 2004 06:21:14 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdSn9-00077x-BR
	for classpath@gnu.org; Mon, 05 Jan 2004 06:21:03 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdSma-0006w3-8p
	for classpath@gnu.org; Mon, 05 Jan 2004 06:20:59 -0500
Received: from [139.165.32.78] (helo=serv09.segi.ulg.ac.be)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdSmZ-0006va-Dd
	for classpath@gnu.org; Mon, 05 Jan 2004 06:20:27 -0500
Received: (qmail 2553 invoked by uid 504); 5 Jan 2004 11:18:58 +0100
Received: from arnaud.vandyck@ulg.ac.be by serv09.segi.ulg.ac.be by uid 501
	with qmail-scanner-1.16 
	(clamscan: 0.60. spamassassin: 2.55.  Clear:. 
	Processed in 0.297013 secs); 05 Jan 2004 10:18:58 -0000
Received: from unknown (HELO localhost) ([139.165.77.198])
	(envelope-sender <arnaud.vandyck@ulg.ac.be>)
	by serv09.segi.ulg.ac.be (qmail-ldap-1.03) with SMTP
	for <classpath@gnu.org>; 5 Jan 2004 11:18:58 +0100
Received: from arnaud by localhost with local (Exim 4.30) id 1AdRp2-0001UI-SR
	for classpath@gnu.org; Mon, 05 Jan 2004 11:18:56 +0100
To: GNU Classpath <classpath@gnu.org>
References: <NFBBKALFDCPFIDBNKAPCAEMDDLAA.dholmes@dltech.com.au>
	<1073279301.1117.145.camel@gadek.homelinux.org>
From: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
X-Face: >U]gI'=hKRtZE@~Svh"mU,aS"">yCT*dBkVAFl'!]!&k@R8fEr{-)Ql6{xhuXKb+!>}x;
	^2ck7Ytr'EABxt~)3q?AO}$:wwSva.$uNN9x.w4+uVmMMSB1~EbJgo|9E0yQXONuM'~c*20^
Date: Mon, 05 Jan 2004 11:18:56 +0100
In-Reply-To: <1073279301.1117.145.camel@gadek.homelinux.org> (Grzegorz B.
	Prokopski's message of "Mon, 05 Jan 2004 00:08:22 -0500")
Message-ID: <87u13aitpr.fsf@oz.fapse.ulg.ac.be>
User-Agent: Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Sender: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
Subject: Re: The status of Classpath (in brief)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2004 11:21:05 -0000

"Grzegorz B. Prokopski" <gadek@debian.org> writes:

> W li=C5=9Bcie z nie, 04-01-2004, godz. 18:15, David Holmes pisze:=20
>> My only comment is that a stated goal of "at least as complete as 1.1"
>> is no longer adequate. The Java platform is a moving target and 1.5 is
>> on the horizon.
>
> As Mark has mentioned somewhere it'd probably be the topic of one of
> the discussions during FOSDEM.

[...]

> For GNU CP the question that arises the most often is:
> toward which version is it heading?
> And Mark's answer is right (in another part of his essay):
> none - GNU CP is driven by what is needed for the _applications_
> (which people want and make possible to run).

This is a goal but it does not prevent us to work on different parts of
the project. I think it means everyone who has the skills should better
help in these areas.

If anything precise is needed, those who are developing AWT and other
packages that need to be complete to go to 1.0 can maybe ask here for
some help. (not me, I lost my x server! :'()

Cheers ;)

--=20
Arnaud



From MAILER-DAEMON Mon Jan 05 11:44:16 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdXpv-0007c9-Nt
	for mharc-classpath@gnu.org; Mon, 05 Jan 2004 11:44:15 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdXpq-0007ax-5v
	for classpath@gnu.org; Mon, 05 Jan 2004 11:44:10 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdXit-0006B2-BW
	for classpath@gnu.org; Mon, 05 Jan 2004 11:37:36 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AdXis-00062I-RH
	for classpath@gnu.org; Mon, 05 Jan 2004 11:36:58 -0500
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AdWky-0006VE-2w
	for classpath@gnu.org; Mon, 05 Jan 2004 10:35:04 -0500
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1AdWkw-0007oZ-00
	for <classpath@gnu.org>; Mon, 05 Jan 2004 16:35:02 +0100
Received: from mpiat2304.ag2.mpi-sb.mpg.de
	([139.19.20.93] helo=kaffe.org ident=topic)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AdWku-0007oC-00; Mon, 05 Jan 2004 16:35:00 +0100
Message-ID: <3FF98424.6060401@kaffe.org>
Date: Mon, 05 Jan 2004 16:35:00 +0100
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.3) Gecko/20030312
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Robert Lougher <robert_lougher@hotmail.com>
References: <BAY10-F100hejFlxDqj0003179d@hotmail.com>
In-Reply-To: <BAY10-F100hejFlxDqj0003179d@hotmail.com>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: by AMaViS perl-11
Cc: classpath@gnu.org
Subject: Re: Java Runtime Matrix for UserLinux
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2004 16:44:11 -0000

Hi Rob,

Robert Lougher wrote:
> Hi,
> 
> Sorry for the empty post - first day back into work tomorrow :)  What I 
> meant to say:
> 
> Any reasons for missing out JamVM (http::/jamvm.sourceforge.net)?  It's 
> been using Classpath since 1.0.0 (12-Mar-2003).  Quite a few people are 
> using it successfully, and I think a number of people on this list have 
> given it a test.

I've only heard good comments about JamVM from people who tried it, so 
I'm sorry I missed out on it. I didn't find it on the Classpath link 
sucess stories list. It's fixed now in the UserLinux wiki.

So if you submit a path for the website, it won't happen next time around ;)

Oh, and you can always do what SableVM developers did, and create your 
own wiki page describing your VM in more detail than a pale comparison 
matrix can do ;)

cheers,
dalibor topic




From MAILER-DAEMON Mon Jan 05 17:17:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Add29-0000D8-1E
	for mharc-classpath@gnu.org; Mon, 05 Jan 2004 17:17:13 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Add0c-00004M-98
	for classpath@gnu.org; Mon, 05 Jan 2004 17:15:38 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Add04-00003Y-3h
	for classpath@gnu.org; Mon, 05 Jan 2004 17:15:35 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Add03-00003T-5J
	for classpath@gnu.org; Mon, 05 Jan 2004 17:15:03 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id OAA03818;
	Mon, 5 Jan 2004 14:13:27 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 849BE4F8245; Mon,  5 Jan 2004 14:05:36 -0700 (MST)
To: Mark Wielaard <mark@klomp.org>
References: <200312261829.21777.konqueror@gmx.de>
	<1072460429.23020.164.camel@elsschot.wildebeest.org>
	<20031226180432.GA6669@mail.konqueror.de>
	<1072558797.844.156.camel@localhost>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: World War Three can be averted by adherence to a strictly enforced
	dress code!
Date: 05 Jan 2004 14:05:36 -0700
In-Reply-To: <1072558797.844.156.camel@localhost>
Message-ID: <873cau14yn.fsf@fleche.redhat.com>
Lines: 17
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Classpath <classpath@gnu.org>
Subject: Re: FYI: Patch: java.awt.image.PixelGrabber
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2004 22:15:39 -0000

>>>>> "Mark" == Mark Wielaard <mark@klomp.org> writes:

Mark> Lets keep asserts out of Classpath sources for now since by default not
Mark> all compilers support it. But I do like to see them in the future if we
Mark> can actually use them more then in one or two spots.

Personally I'd like to see us push the envelope a little and allow
`assert'.

The lurking issue here is choosing a source language version.  For API
coverage it is ok to do what we've been doing, namely not pick a
version and let things float toward the latest release.  This doesn't
work too well for the source version though.

This is going to bite us big time when generics are introduced.

Tom



From MAILER-DAEMON Mon Jan 05 20:59:35 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdgVA-0003Vs-Bn
	for mharc-classpath@gnu.org; Mon, 05 Jan 2004 20:59:24 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdgS9-0000s1-Ad
	for classpath@gnu.org; Mon, 05 Jan 2004 20:56:17 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdgRa-0000Ye-6e
	for classpath@gnu.org; Mon, 05 Jan 2004 20:56:14 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AdgRY-0000XO-Md
	for classpath@gnu.org; Mon, 05 Jan 2004 20:55:40 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AdfQl-0002eR-R7
	for classpath@gnu.org; Mon, 05 Jan 2004 19:50:47 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i060ofA14637
	for <classpath@gnu.org>; Mon, 5 Jan 2004 19:50:41 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i060oeE02930
	for <classpath@gnu.org>; Mon, 5 Jan 2004 19:50:40 -0500
Received: from tortoise.toronto.redhat.com (tortoise.toronto.redhat.com
	[172.16.14.92])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i060oelJ026607
	for <classpath@gnu.org>; Mon, 5 Jan 2004 19:50:40 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-yK+6HpzU2be+3rCNh7SB"
Message-Id: <1073350239.19693.47.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Mon, 05 Jan 2004 19:50:40 -0500
Subject: Patch: merge GTK peers from libgcj to Classpath
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 01:56:19 -0000


--=-yK+6HpzU2be+3rCNh7SB
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hello,

This patch merges into Classpath the improvements made to libgcj's GTK
peers since the savannah break-in.

OK to commit?

Tom

2004-01-05  Fernando Nasser  <fnasser@redhat.com>

	* gnu/java/awt/peer/gtk/GtkListPeer.java (handleEvent): Fix generation
	of ActionEvents for mouse double-clicks.

2004-01-05  Fernando Nasser  <fnasser@redhat.com>

	* java/awt/Choice.java (add): Leave posting of ItemEvents to peer.
	(insert): Ditto.
	(remove): Ditto.  Also, Check for valid argument.
	(removeAll): Use peer interface method.
	* gnu/java/awt/peer/gtk/GtkChoicePeer.java (nativeAdd): New name for
	native add function.
	(nativeRemove): New name for native remove function.
	(getHistory): New native function.
	(constructor): Generate ItemEvent.
	(add): Ditto, if selection is changed.
	(remove): Ditto, ditto.
	(removeAll): Add implementation.
	(handleEvent): Remove.  Dead code.
	(choicePostItemEvent): Add comment.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
	(Java_gnu_java_awt_peer_gtk_GtkChoicePeer_append): Add comments.
	(Java_gnu_java_awt_peer_gtk_GtkChoicePeer_add): Rename to...
	(Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeAdd): New name.  Add
	comments and fix condition to change selection.
	(Java_gnu_java_awt_peer_gtk_GtkChoicePeer_remove): Rename to...
	(Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeRemove): New name.  Add
	remove all capability.
	(Java_gnu_java_awt_peer_gtk_GtkChoicePeer_getHistory): New function.
	(item_activate): Add cast to remove compiler warning.

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

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
	(pre_event_handler): Set all insets to 0 when a Configure event
	is received for a GtkPlug.

	* gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
	(create(int, int)): New method.
	(create): Call new create method.
	(gtkScrolledWindowNew, gtkScrolledWindowSetSize): Remove
	methods.
	(childResized): Remove native implementation.  Implement in
	Java.
	(getHScrollbarHeight, getVScrollbarWidth): Call
	gtk_widget_size_request to get scrollbar dimensions.
	* java/awt/ScrollPane.java (getViewportSize): Reimplement.  Only
	call getVScrollbarWidth and getHScrollbarHeight when vertical
	and horizontal scrollbars respectively are needed.
	(doLayout): Enlarge child if it is smaller than the viewport.

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(getPreferredSize): Call preferredSize.
	(preferredSize): Call gtkWidgetGetPreferredDimensions.
	(getMinimumSize): Call minimumSize.
	(minimumSize): Call gtkWidgetGetPreferredDimensions.
	(gtkWidgetGetDimensions): Return the peer widget's current size
	request.
	(gtkWidgetGetPreferredDimensions): Return the peer widget's
	natural size request.

2004-01-05  Fernando Nasser  <fnasser@redhat.com>

	* gnu/java/awt/peer/gtk/GtkChoicePeer.java (postItemEvent): Rename to...
	(choicePostItemEvent): Change signature to more specific String object.
	* java/awt/Choice.java (add): Generate ItemEvent for the first item
	added.
	(insert): Generate ItemEvent if insertion caused
	selection to change.
	(remove): Generate ItemEvent if removal cause selection to change.
	(removeAll): Change algorithm to prevent generation of ItemEvents.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
	(connect_choice_item_selectable_hook): Change argument type.
	Fix argument value.
	Make sure resources are feed by registering callback.
	(Java_gnu_java_awt_peer_gtk_GtkChoicePeer_append): Adjust call to the
	above function.
	(Java_gnu_java_awt_peer_gtk_GtkChoicePeer_add): Ditto.
	(item_activate): Ditto.
	(Java_gnu_java_awt_peer_gtk_GtkChoicePeer_remove): Destroy removed
	menuitem.
	(item_removed): New function.  Free resources.
	* jni/gtk-peer/gtkpeer.h (item_event_hook_info): Change member type and
	name.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
	(Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit): Obtain MethodID for
	choicePostItemEvent.

2004-01-05  Kim Ho  <kho@redhat.com>

	Fix for Checkbox states.
	* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java:
	(currentState): New field.
	(nativeCreate): Add initial state parameter.
	(create): Changed to reflect new parameter.
	(setState): Fire only on changed states.
	(postItemEvent): Fire only on changed states. Also change the 
	Java Checkbox to reflect new state.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c:
	(nativeCreate): Add parameter and set active state.

2004-01-05  Fernando Nasser  <fnasser@redhat.com>

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (awt_event_handler):
	Most coded moved to pre_event_handler, with the modifications
	mentioned below.
	(pre_event_handler): New function.  Called on the Gtk "event" signal.
	Do not retrieve the jobject from the window property as it is already
	available as user data in the signal.
	Do not try and find the grab widget as it is already done by Gtk at
	this point.
	Do not search for Window ancestor as Gtk already sends the signal to it.
	Do not meddle with the activation state of peer widgets on each
	key press or release.
	Add CList to the special handling when looking for the focused widget.
	* jni/gtk-peer/gtkpeer.h: Add declaration for pre_event_handler.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (connectJObject):
	New function.
	(connectSignals): New function.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c (connectHooks):
	Rename to...
	(connectSignals): New name.  Get rid of NewGlobalRef call.
	Use g_signal_connect instead of deprecated gtk_signal_connect.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
	(connect_choice_item_selectable_hook): Use g_signal_connect instead of
	deprecated gtk_signal_connect.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState): Ditto.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks): Remove
	function.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject): New
	function.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals): New
	function.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks): Remove
	function.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject): New
	function.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks): Remove
	function.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject): New
	function.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals): New
	function.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_old_create): Remove dead
	code.
	(item_select): Remove indirection.
	(item_unselect): Ditto.
	(connect_selectable_hook): Folded into connectSignals.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks): Remove
	function.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject): New
	function.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals): New
	function.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c: Ditto.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks): Remove
	function.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals): New
	function.
	* gnu/java/awt/peer/gtk/GtkComponentPeer.java: Declare  and call
	connectJObject and connectSignals instead of connectHooks.
	* gnu/java/awt/peer/gtk/GtkButtonPeer.java: Declare connectJObject and
	connectSignals.
	* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java: Declare connectSignals
	and not connectHooks.
	* gnu/java/awt/peer/gtk/GtkTextComponentPeer.java: Ditto.
	* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java: Declare connectJObject
	and not connectHooks.
	* gnu/java/awt/peer/gtk/GtkListPeer.java: Declare connectJObject and
	connectSignals instead of connectHooks.
	* gnu/java/awt/peer/gtk/GtkPanelPeer.java: Ditto.
	* gnu/java/awt/peer/gtk/GtkScrollbarPeer.java: Ditto.
	* gnu/java/awt/peer/gtk/GtkWindowPeer.java: Ditto. 


--=-yK+6HpzU2be+3rCNh7SB
Content-Disposition: attachment; filename=classpath-peer-merge.patch
Content-Type: text/x-patch; name=classpath-peer-merge.patch; charset=
Content-Transfer-Encoding: 7bit

Index: gnu/java/awt/peer/GLightweightPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/GLightweightPeer.java,v
retrieving revision 1.1
diff -u -r1.1 GLightweightPeer.java
--- gnu/java/awt/peer/GLightweightPeer.java	22 Aug 2003 15:37:14 -0000	1.1
+++ gnu/java/awt/peer/GLightweightPeer.java	6 Jan 2004 00:36:56 -0000
@@ -239,7 +239,7 @@
 
   public void setBackground(Color color) {}
 
-  public void setBounds(int x, int y, int width, int height) { }
+  public void setBounds(int x, int y, int width, int height) {}
 
   public void setCursor(Cursor cursor) {}
 
Index: gnu/java/awt/peer/gtk/GtkButtonPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkButtonPeer.java,v
retrieving revision 1.24
diff -u -r1.24 GtkButtonPeer.java
--- gnu/java/awt/peer/gtk/GtkButtonPeer.java	9 Oct 2003 00:34:16 -0000	1.24
+++ gnu/java/awt/peer/gtk/GtkButtonPeer.java	6 Jan 2004 00:36:56 -0000
@@ -50,6 +50,8 @@
     implements ButtonPeer
 {
   native void create ();
+  public native void connectJObject ();
+  public native void connectSignals ();
 
   native void gtkSetFont(String name, int style, int size);
   native void gtkWidgetSetForeground (int red, int green, int blue);
Index: gnu/java/awt/peer/gtk/GtkCanvasPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkCanvasPeer.java,v
retrieving revision 1.13
diff -u -r1.13 GtkCanvasPeer.java
--- gnu/java/awt/peer/gtk/GtkCanvasPeer.java	9 Jul 2003 10:25:34 -0000	1.13
+++ gnu/java/awt/peer/gtk/GtkCanvasPeer.java	6 Jan 2004 00:36:56 -0000
@@ -56,6 +56,9 @@
 
   public Graphics getGraphics ()
   {
+    if (GtkToolkit.useGraphics2D ())
+      return new GdkGraphics2D (this);
+    else
     return new GdkGraphics (this);
   }
 
Index: gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,v
retrieving revision 1.14
diff -u -r1.14 GtkCheckboxPeer.java
--- gnu/java/awt/peer/gtk/GtkCheckboxPeer.java	9 Jul 2003 10:25:34 -0000	1.14
+++ gnu/java/awt/peer/gtk/GtkCheckboxPeer.java	6 Jan 2004 00:36:56 -0000
@@ -1,5 +1,5 @@
 /* GtkCheckboxPeer.java -- Implements CheckboxPeer with GTK
-   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,10 +48,13 @@
 {
   // Group from last time it was set.
   public GtkCheckboxGroupPeer old_group;
+  // The current state of the GTK checkbox.
+  private boolean currentState;  
 
-  public native void nativeCreate (GtkCheckboxGroupPeer group);
+  public native void nativeCreate (GtkCheckboxGroupPeer group,
+                                   boolean state);
   public native void nativeSetCheckboxGroup (GtkCheckboxGroupPeer group);
-  public native void connectHooks ();
+  public native void connectSignals ();
 
   public GtkCheckboxPeer (Checkbox c)
   {
@@ -66,12 +69,14 @@
   {
     CheckboxGroup g = ((Checkbox) awtComponent).getCheckboxGroup ();
     old_group = GtkCheckboxGroupPeer.getCheckboxGroupPeer (g);
-    nativeCreate (old_group);
+    currentState = ((Checkbox)awtComponent).getState();
+    nativeCreate (old_group, currentState);
   }
 
   public void setState (boolean state)
   {
-    set ("active", state);
+    if (currentState != state)
+      set ("active", state);
   }
 
   public void setLabel (String label)
@@ -103,7 +108,19 @@
   // need information that we have.
   public void postItemEvent (Object item, int stateChange)
   {
-    super.postItemEvent (awtComponent, stateChange);
+    Checkbox currentCheckBox = ((Checkbox)awtComponent);
+    // A firing of the event is only desired if the state has changed due to a 
+    // button press. The currentCheckBox's state must be different from the 
+    // one that the stateChange is changing to. 
+    // stateChange = 1 if it goes from false -> true
+    // stateChange = 2 if it goes from true -> false
+    if (( !currentCheckBox.getState() && stateChange == 1)
+        || (currentCheckBox.getState() && stateChange == 2))
+    {
+      super.postItemEvent (awtComponent, stateChange);
+      currentState = !currentCheckBox.getState();
+      currentCheckBox.setState(currentState);
+    }
   }
 
   public void dispose ()
Index: gnu/java/awt/peer/gtk/GtkChoicePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkChoicePeer.java,v
retrieving revision 1.14
diff -u -r1.14 GtkChoicePeer.java
--- gnu/java/awt/peer/gtk/GtkChoicePeer.java	9 Jul 2003 10:25:34 -0000	1.14
+++ gnu/java/awt/peer/gtk/GtkChoicePeer.java	6 Jan 2004 00:36:56 -0000
@@ -84,10 +84,10 @@
   }
   */
 
-  protected void postItemEvent (Object item, int stateChange)
+  protected void choicePostItemEvent (String label, int stateChange)
   {
     if (stateChange == ItemEvent.SELECTED)
-      ((Choice) awtComponent).select ((String) item);
-    super.postItemEvent (item, stateChange);
+      ((Choice) awtComponent).select (label);
+    super.postItemEvent (label, stateChange);
   }
 }
Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.55
diff -u -r1.55 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java	2 Dec 2003 19:42:10 -0000	1.55
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java	6 Jan 2004 00:36:56 -0000
@@ -48,6 +48,7 @@
 import java.awt.FontMetrics;
 import java.awt.Frame;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.GraphicsConfiguration;
 import java.awt.Image;
 import java.awt.Insets;
@@ -83,8 +84,9 @@
   native int[] gtkWidgetGetForeground ();
   native int[] gtkWidgetGetBackground ();
   native void gtkWidgetSetVisible (boolean b);
-  native void gtkWidgetGetDimensions(int[] dim);
-  native void gtkWidgetGetLocationOnScreen(int[] point);
+  native void gtkWidgetGetDimensions (int[] dim);
+  native void gtkWidgetGetPreferredDimensions (int[] dim);
+  native void gtkWidgetGetLocationOnScreen (int[] point);
   native void gtkWidgetSetCursor (int type);
   native void gtkWidgetSetBackground (int red, int green, int blue);
   native void gtkWidgetSetForeground (int red, int green, int blue);
@@ -99,7 +101,8 @@
     insets = new Insets (0, 0, 0, 0);
   }
 
-  native void connectHooks ();
+  native void connectJObject ();
+  native void connectSignals ();
 
   protected GtkComponentPeer (Component awtComponent)
   {
@@ -114,7 +117,8 @@
       getArgs (awtComponent, args);
       args.setArgs (this);
 
-      connectHooks ();
+      connectJObject ();
+      connectSignals ();
 
       if (awtComponent.getForeground () != null)
 	setForeground (awtComponent.getForeground ());
@@ -146,7 +150,16 @@
 
   public Image createImage (int width, int height)
   {
-    GdkGraphics g = new GdkGraphics (width, height);
+    Graphics g;
+    if (GtkToolkit.useGraphics2D ())
+      {
+        Graphics2D g2 = new GdkGraphics2D (width, height);
+        g2.setBackground (getBackground ());
+        g = g2;
+      }
+    else
+      g = new GdkGraphics (width, height);
+
     return new GtkOffScreenImage (null, g, width, height);
   }
 
@@ -184,18 +197,12 @@
 
   public Dimension getMinimumSize () 
   {
-    int dim[]=new int[2];
-    gtkWidgetGetDimensions (dim);
-    Dimension d = new Dimension (dim[0],dim[1]);
-    return (d);
+    return minimumSize ();
   }
 
   public Dimension getPreferredSize ()
   {
-    int dim[]=new int[2];
-    gtkWidgetGetDimensions (dim);
-    Dimension d = new Dimension (dim[0],dim[1]);
-    return (d);
+    return preferredSize ();
   }
 
   public Toolkit getToolkit ()
@@ -214,7 +221,11 @@
 
   public Dimension minimumSize () 
   {
-    return getMinimumSize();
+    int dim[] = new int[2];
+
+    gtkWidgetGetPreferredDimensions (dim);
+
+    return new Dimension (dim[0], dim[1]);
   }
 
   public void paint (Graphics g)
@@ -222,9 +233,13 @@
     awtComponent.paint (g);
   }
 
-  public Dimension preferredSize()
+  public Dimension preferredSize ()
   {
-    return getPreferredSize();
+    int dim[] = new int[2];
+
+    gtkWidgetGetPreferredDimensions (dim);
+
+    return new Dimension (dim[0], dim[1]);
   }
 
   public boolean prepareImage (Image image, int width, int height,
Index: gnu/java/awt/peer/gtk/GtkContainerPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkContainerPeer.java,v
retrieving revision 1.19
diff -u -r1.19 GtkContainerPeer.java
--- gnu/java/awt/peer/gtk/GtkContainerPeer.java	2 Oct 2003 18:39:54 -0000	1.19
+++ gnu/java/awt/peer/gtk/GtkContainerPeer.java	6 Jan 2004 00:36:56 -0000
@@ -92,6 +92,9 @@
 
   public Graphics getGraphics ()
   {
+    if (GtkToolkit.useGraphics2D ())
+        return new GdkGraphics2D (this);
+    else
     return new GdkGraphics (this);
   }
 
@@ -107,6 +110,11 @@
 	  try 
 	    {
 	      Graphics g = getGraphics ();
+
+	      // Some peers like GtkFileDialogPeer are repainted by Gtk itself
+	      if (g == null)
+	        break;
+
 	      g.setClip (((PaintEvent)event).getUpdateRect());
 
 	      if (id == PaintEvent.PAINT)
Index: gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,v
retrieving revision 1.11
diff -u -r1.11 GtkFileDialogPeer.java
--- gnu/java/awt/peer/gtk/GtkFileDialogPeer.java	9 Jul 2003 10:25:34 -0000	1.11
+++ gnu/java/awt/peer/gtk/GtkFileDialogPeer.java	6 Jan 2004 00:36:56 -0000
@@ -58,7 +58,7 @@
   }
 
   public native void setFile (String file);
-  public native void connectHooks ();
+  public native void connectJObject ();
 
   public void setFilenameFilter (FilenameFilter filter)
   {
Index: gnu/java/awt/peer/gtk/GtkFontPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkFontPeer.java,v
retrieving revision 1.6
diff -u -r1.6 GtkFontPeer.java
--- gnu/java/awt/peer/gtk/GtkFontPeer.java	19 Feb 2003 03:50:33 -0000	1.6
+++ gnu/java/awt/peer/gtk/GtkFontPeer.java	6 Jan 2004 00:36:56 -0000
@@ -38,10 +38,15 @@
 
 package gnu.java.awt.peer.gtk;
 import java.awt.peer.FontPeer;
-import java.awt.Font;
+import java.awt.*;
+import java.awt.geom.*;
+import java.awt.font.*;
+import java.util.Locale;
 import java.util.ResourceBundle;
+import java.text.*;
+import gnu.java.awt.peer.ClasspathFontPeer;
 
-public class GtkFontPeer implements FontPeer
+public class GtkFontPeer extends ClasspathFontPeer
 {
   private static ResourceBundle bundle;
   
@@ -61,6 +66,8 @@
 
   public GtkFontPeer (String name, int style)
   {
+    super(name, style, 12 /* kludge */);
+
     if (bundle != null)
       Xname = bundle.getString (name.toLowerCase () + "." + style);
     else
@@ -90,5 +97,105 @@
   public String getXLFD ()
   {
     return Xname;
+  }
+
+
+  /* remaining methods are for static compatibility with the newer
+     ClasspathFontPeer superclass; none of these methods ever existed or
+     worked on the older FontPeer interface, but we need to pretend to
+     support them anyways. */
+
+  public boolean canDisplay (Font font, char c)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public int canDisplayUpTo (Font font, CharacterIterator i, int start, int limit)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public String getSubFamilyName (Font font, Locale locale)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public String getPostScriptName (Font font)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public int getNumGlyphs (Font font)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public int getMissingGlyphCode (Font font)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public byte getBaselineFor (Font font, char c)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public String getGlyphName (Font font, int glyphIndex)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public GlyphVector createGlyphVector (Font font,
+                                                 FontRenderContext frc,
+                                                 CharacterIterator ci)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public GlyphVector createGlyphVector (Font font, 
+                                                 FontRenderContext ctx, 
+                                                 int[] glyphCodes)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public GlyphVector layoutGlyphVector (Font font, 
+                                                 FontRenderContext frc, 
+                                                 char[] chars, int start, 
+                                                 int limit, int flags)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public FontMetrics getFontMetrics (Font font)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public boolean hasUniformLineMetrics (Font font)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public LineMetrics getLineMetrics (Font font, 
+                                              CharacterIterator ci, 
+                                              int begin, int limit, 
+                                              FontRenderContext rc)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public Rectangle2D getMaxCharBounds (Font font, 
+                                                FontRenderContext rc)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public Rectangle2D getStringBounds (Font font, 
+                                               CharacterIterator ci, 
+                                               int begin, int limit, 
+                                               FontRenderContext frc)
+  {
+    throw new UnsupportedOperationException();
   }
 }
Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.16
diff -u -r1.16 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java	9 Oct 2003 00:34:16 -0000	1.16
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java	6 Jan 2004 00:36:56 -0000
@@ -41,6 +41,7 @@
 import java.awt.Component;
 import java.awt.Frame;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.Insets;
 import java.awt.MenuBar;
@@ -109,8 +110,12 @@
 
   public Graphics getGraphics ()
   {
-    GdkGraphics g = new GdkGraphics (this);
-    g.translateNative (-insets.left, -insets.top);
+    Graphics g;
+    if (GtkToolkit.useGraphics2D ())
+      g = new GdkGraphics2D (this);
+    else
+      g = new GdkGraphics (this);
+    g.translate (-insets.left, -insets.top);
     return g;
   }
 
Index: gnu/java/awt/peer/gtk/GtkListPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkListPeer.java,v
retrieving revision 1.13
diff -u -r1.13 GtkListPeer.java
--- gnu/java/awt/peer/gtk/GtkListPeer.java	9 Jul 2003 10:25:34 -0000	1.13
+++ gnu/java/awt/peer/gtk/GtkListPeer.java	6 Jan 2004 00:36:56 -0000
@@ -38,8 +38,11 @@
 
 package gnu.java.awt.peer.gtk;
 
+import java.awt.AWTEvent;
 import java.awt.Dimension;
 import java.awt.List;
+import java.awt.event.MouseEvent;
+import java.awt.event.KeyEvent;
 import java.awt.peer.ListPeer;
 
 public class GtkListPeer extends GtkComponentPeer
@@ -48,7 +51,8 @@
 //    native void create (ComponentPeer parent, String [] items, boolean mode);
 
   native void create ();
-  native void connectHooks ();
+  native void connectJObject ();
+  native void connectSignals ();
 
   native void getSize (int rows, int dims[]);
 
@@ -119,6 +123,43 @@
   public void setMultipleSelections (boolean b)
   {
     setMultipleMode (b);
+  }
+
+  public void handleEvent (AWTEvent e)
+  {
+    if (e.getID () == MouseEvent.MOUSE_CLICKED && isEnabled ())
+      {
+        /* Only generate the ActionEvent on the second click of
+	   a multiple click */
+	MouseEvent me = (MouseEvent) e;
+	if (!me.isConsumed ()
+	    && (me.getModifiers () & MouseEvent.BUTTON1_MASK) != 0
+	    && me.getClickCount() == 2)
+	  {
+            String selectedItem = ((List)awtComponent).getSelectedItem ();
+
+            /* Double-click only generates an Action event
+	       if something is selected */
+            if (selectedItem != null)
+	      postActionEvent (((List)awtComponent).getSelectedItem (), 
+			       me.getModifiers ());
+	  }
+      }
+
+    if (e.getID () == KeyEvent.KEY_PRESSED)
+      {
+	KeyEvent ke = (KeyEvent) e;
+	if (!ke.isConsumed () && ke.getKeyCode () == KeyEvent.VK_ENTER)
+	  {
+            String selectedItem = ((List)awtComponent).getSelectedItem ();
+
+            /* Enter only generates an Action event if something is selected */
+            if (selectedItem != null)
+	      postActionEvent (selectedItem, ke.getModifiers ());
+	  }
+      }
+
+    super.handleEvent (e);
   }
 
   protected void postItemEvent (int item, int stateChange)
Index: gnu/java/awt/peer/gtk/GtkPanelPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkPanelPeer.java,v
retrieving revision 1.13
diff -u -r1.13 GtkPanelPeer.java
--- gnu/java/awt/peer/gtk/GtkPanelPeer.java	9 Jul 2003 10:25:34 -0000	1.13
+++ gnu/java/awt/peer/gtk/GtkPanelPeer.java	6 Jan 2004 00:36:56 -0000
@@ -45,7 +45,8 @@
   implements PanelPeer
 {
   native void create ();
-  native void connectHooks ();
+  native void connectJObject ();
+  native void connectSignals ();
 
   public GtkPanelPeer (Panel p)
   {
Index: gnu/java/awt/peer/gtk/GtkScrollPanePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,v
retrieving revision 1.13
diff -u -r1.13 GtkScrollPanePeer.java
--- gnu/java/awt/peer/gtk/GtkScrollPanePeer.java	9 Jul 2003 10:25:34 -0000	1.13
+++ gnu/java/awt/peer/gtk/GtkScrollPanePeer.java	6 Jan 2004 00:36:56 -0000
@@ -46,15 +46,17 @@
 public class GtkScrollPanePeer extends GtkContainerPeer
   implements ScrollPanePeer
 {
-  native void create ();
+  native void create (int width, int height);
+
+  void create ()
+  {
+    create (awtComponent.getWidth (), awtComponent.getHeight ());
+  }
 
-  native void gtkScrolledWindowNew(ComponentPeer parent,
-				   int policy, int w, int h, int[] dims);
   native void gtkScrolledWindowSetScrollPosition(int x, int y);
   native void gtkScrolledWindowSetHScrollIncrement (int u);
   native void gtkScrolledWindowSetVScrollIncrement (int u);
-  native void gtkScrolledWindowSetSize(int w, int h);
-  
+
   public GtkScrollPanePeer (ScrollPane sp)
   {
     super (sp);
@@ -63,7 +65,24 @@
   }
 
   native void setPolicy (int policy);
-  native public void childResized (int width, int height);
+  public void childResized (int width, int height)
+  {
+    int dim[] = new int[2];
+
+    gtkWidgetGetDimensions (dim);
+
+    // If the child is in this range, GTK adds both scrollbars, but
+    // the AWT doesn't.  So set the peer's scroll policy to
+    // GTK_POLICY_NEVER.
+    if ((width > dim[0] - getVScrollbarWidth ()
+	 && width <= dim[0])
+	&& (height > dim[1] - getHScrollbarHeight ()
+	    && height <= dim[1]))
+      setPolicy (ScrollPane.SCROLLBARS_NEVER);
+    else
+      setPolicy (((ScrollPane) awtComponent).getScrollbarDisplayPolicy ());
+  }
+
   native public int getHScrollbarHeight ();
   native public int getVScrollbarWidth ();
   native public void setScrollPosition (int x, int y);
Index: gnu/java/awt/peer/gtk/GtkScrollbarPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,v
retrieving revision 1.14
diff -u -r1.14 GtkScrollbarPeer.java
--- gnu/java/awt/peer/gtk/GtkScrollbarPeer.java	9 Jul 2003 10:25:34 -0000	1.14
+++ gnu/java/awt/peer/gtk/GtkScrollbarPeer.java	6 Jan 2004 00:36:56 -0000
@@ -60,7 +60,8 @@
 		      int min, int max, int stepIncr, int pageIncr,
 		      int visibleAmount);
 
-  native void connectHooks ();
+  native void connectJObject ();
+  native void connectSignals ();
 
   public GtkScrollbarPeer (Scrollbar s)
   {
Index: gnu/java/awt/peer/gtk/GtkTextComponentPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java,v
retrieving revision 1.12
diff -u -r1.12 GtkTextComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkTextComponentPeer.java	6 Aug 2003 15:05:29 -0000	1.12
+++ gnu/java/awt/peer/gtk/GtkTextComponentPeer.java	6 Jan 2004 00:36:56 -0000
@@ -56,7 +56,7 @@
     setText (tc.getText ());
   }
 
-  public native void connectHooks ();
+  public native void connectSignals ();
 
   public native int getCaretPosition ();
   public native void setCaretPosition (int pos);
Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.44
diff -u -r1.44 GtkToolkit.java
--- gnu/java/awt/peer/gtk/GtkToolkit.java	2 Dec 2003 19:42:10 -0000	1.44
+++ gnu/java/awt/peer/gtk/GtkToolkit.java	6 Jan 2004 00:36:56 -0000
@@ -42,6 +42,7 @@
 import java.awt.datatransfer.Clipboard;
 import java.awt.dnd.DragGestureEvent;
 import java.awt.dnd.peer.DragSourceContextPeer;
+import java.awt.font.TextAttribute;
 import java.awt.im.InputMethodHighlight;
 import java.awt.image.ColorModel;
 import java.awt.image.ImageObserver;
@@ -52,6 +53,8 @@
 import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.Properties;
+import gnu.java.awt.peer.ClasspathFontPeer;
+import gnu.java.awt.peer.ClasspathFontPeer;
 import gnu.classpath.Configuration;
 import gnu.java.awt.peer.gtk.GdkPixbufDecoder;
 
@@ -62,14 +65,35 @@
    this class.  If getPeer() ever goes away, we can implement a hash table
    that will keep up with every window's peer, but for now this is faster. */
 
-public class GtkToolkit extends Toolkit
+/**
+ * This class accesses a system property called
+ * <tt>gnu.java.awt.peer.gtk.Graphics</tt>.  If the property is defined and
+ * equal to "Graphics2D", the cairo-based GdkGraphics2D will be used in
+ * drawing contexts. Any other value will cause the older GdkGraphics
+ * object to be used.
+ */
+
+public class GtkToolkit extends gnu.java.awt.ClasspathToolkit
 {
   GtkMainThread main;
   Hashtable containers = new Hashtable();
   static EventQueue q = new EventQueue();
   static Clipboard systemClipboard;
 
-  static 
+  static boolean useGraphics2dSet;
+  static boolean useGraphics2d;
+
+  public static boolean useGraphics2D()
+  {
+    if (useGraphics2dSet)
+      return useGraphics2d;
+    useGraphics2d = System.getProperty("gnu.java.awt.peer.gtk.Graphics", 
+                                       "Graphics").equals("Graphics2D");
+    useGraphics2dSet = true;
+    return useGraphics2d;
+  }
+
+  static
   {
     if (Configuration.INIT_LOAD_LIBRARY)
       System.loadLibrary("gtkpeer");
@@ -131,7 +155,10 @@
 
   public FontMetrics getFontMetrics (Font font) 
   {
-    return new GdkFontMetrics (font);
+    if (useGraphics2D())
+      return new GdkClasspathFontPeerMetrics (font);
+    else
+      return new GdkFontMetrics (font);
   }
 
   public Image getImage (String filename) 
@@ -313,6 +340,10 @@
     return new GtkWindowPeer (w);
   }
 
+  /** 
+   * @deprecated part of the older "logical font" system in earlier AWT
+   * implementations. Our newer Font class uses getClasspathFontPeer.
+   */
   protected FontPeer getFontPeer (String name, int style) 
   {
     try {
@@ -323,6 +354,38 @@
     }
   }
 
+  /**
+   * Newer method to produce a peer for a Font object, even though Sun's
+   * design claims Font should now be peerless, we do not agree with this
+   * model, hence "ClasspathFontPeer". 
+   */
+
+  public ClasspathFontPeer getClasspathFontPeer (String name, Map attrs)
+  {
+    if (useGraphics2D())
+      return new GdkClasspathFontPeer (name, attrs);
+    else
+      {
+        int style = Font.PLAIN;
+
+        if (attrs.containsKey (TextAttribute.WEIGHT))
+          {
+            Float weight = (Float) attrs.get (TextAttribute.WEIGHT);
+            if (weight.floatValue () >= TextAttribute.WEIGHT_BOLD.floatValue ())
+              style += Font.BOLD;
+          }
+        
+        if (attrs.containsKey (TextAttribute.POSTURE))
+          {
+            Float posture = (Float) attrs.get (TextAttribute.POSTURE);
+            if (posture.floatValue () >= TextAttribute.POSTURE_OBLIQUE.floatValue ())
+              style += Font.ITALIC;
+          }
+        
+        return (ClasspathFontPeer) this.getFontPeer (name, style);
+      }
+  }
+
   protected EventQueue getSystemEventQueueImpl() 
   {
     return q;
@@ -341,4 +404,18 @@
   {
     throw new Error("not implemented");
   }
+
+  // ClasspathToolkit methods
+
+  public GraphicsEnvironment getLocalGraphicsEnvironment()
+  {
+    throw new java.lang.UnsupportedOperationException ();
+  }
+
+  public Font createFont(int format, java.io.InputStream stream)
+  {
+    throw new java.lang.UnsupportedOperationException ();
+  }
+
+
 } // class GtkToolkit
Index: gnu/java/awt/peer/gtk/GtkWindowPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java,v
retrieving revision 1.24
diff -u -r1.24 GtkWindowPeer.java
--- gnu/java/awt/peer/gtk/GtkWindowPeer.java	24 Oct 2003 19:54:22 -0000	1.24
+++ gnu/java/awt/peer/gtk/GtkWindowPeer.java	6 Jan 2004 00:36:56 -0000
@@ -93,7 +93,8 @@
     create (GDK_WINDOW_TYPE_HINT_NORMAL, false);
   }
 
-  native void connectHooks ();
+  native void connectJObject ();
+  native void connectSignals ();
 
   public GtkWindowPeer (Window window)
   {
Index: include/gnu_java_awt_peer_gtk_GtkButtonPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkButtonPeer.h
--- include/gnu_java_awt_peer_gtk_GtkButtonPeer.h	8 Oct 2003 23:40:49 -0000	1.4
+++ include/gnu_java_awt_peer_gtk_GtkButtonPeer.h	6 Jan 2004 00:36:56 -0000
@@ -11,6 +11,8 @@
 #endif
 
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectJObject (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectSignals (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetSetForeground (JNIEnv *env, jobject, jint, jint, jint);
 
Index: include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkCheckboxPeer.h
--- include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h	30 Jul 2003 16:47:19 -0000	1.3
+++ include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h	6 Jan 2004 00:36:56 -0000
@@ -10,9 +10,9 @@
 {
 #endif
 
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeCreate (JNIEnv *env, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeCreate (JNIEnv *env, jobject, jobject, jboolean);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeSetCheckboxGroup (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_connectHooks (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_connectSignals (JNIEnv *env, jobject);
 
 #ifdef __cplusplus
 }
Index: include/gnu_java_awt_peer_gtk_GtkComponentPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkComponentPeer.h
--- include/gnu_java_awt_peer_gtk_GtkComponentPeer.h	25 Dec 2003 17:07:08 -0000	1.6
+++ include/gnu_java_awt_peer_gtk_GtkComponentPeer.h	6 Jan 2004 00:36:56 -0000
@@ -16,11 +16,13 @@
 extern JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetBackground (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetVisible (JNIEnv *env, jobject, jboolean);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetDimensions (JNIEnv *env, jobject, jintArray);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetPreferredDimensions (JNIEnv *env, jobject, jintArray);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetLocationOnScreen (JNIEnv *env, jobject, jintArray);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor (JNIEnv *env, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetBackground (JNIEnv *env, jobject, jint, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetForeground (JNIEnv *env, jobject, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus__ (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds (JNIEnv *env, jobject, jint, jint, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring);
Index: include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
--- include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h	30 Jul 2003 16:47:19 -0000	1.3
+++ include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h	6 Jan 2004 00:36:56 -0000
@@ -12,7 +12,7 @@
 
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_create (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_setFile (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectHooks (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectJObject (JNIEnv *env, jobject);
 
 #ifdef __cplusplus
 }
Index: include/gnu_java_awt_peer_gtk_GtkListPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkListPeer.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkListPeer.h
--- include/gnu_java_awt_peer_gtk_GtkListPeer.h	30 Jul 2003 16:47:19 -0000	1.2
+++ include/gnu_java_awt_peer_gtk_GtkListPeer.h	6 Jan 2004 00:36:56 -0000
@@ -11,7 +11,8 @@
 #endif
 
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_create (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_connectHooks (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_connectJObject (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_connectSignals (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize (JNIEnv *env, jobject, jint, jintArray);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_append (JNIEnv *env, jobject, jobjectArray);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_add (JNIEnv *env, jobject, jstring, jint);
Index: include/gnu_java_awt_peer_gtk_GtkPanelPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkPanelPeer.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkPanelPeer.h
--- include/gnu_java_awt_peer_gtk_GtkPanelPeer.h	30 Jul 2003 16:47:19 -0000	1.2
+++ include/gnu_java_awt_peer_gtk_GtkPanelPeer.h	6 Jan 2004 00:36:56 -0000
@@ -11,7 +11,8 @@
 #endif
 
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPanelPeer_create (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectHooks (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectJObject (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectSignals (JNIEnv *env, jobject);
 
 #ifdef __cplusplus
 }
Index: include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkScrollPanePeer.h
--- include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h	30 Jul 2003 16:47:19 -0000	1.2
+++ include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h	6 Jan 2004 00:36:56 -0000
@@ -10,14 +10,11 @@
 {
 #endif
 
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowNew (JNIEnv *env, jobject, jobject, jint, jint, jint, jintArray);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create__II (JNIEnv *env, jobject, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetScrollPosition (JNIEnv *env, jobject, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetHScrollIncrement (JNIEnv *env, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetVScrollIncrement (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetSize (JNIEnv *env, jobject, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_setPolicy (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_childResized (JNIEnv *env, jobject, jint, jint);
 extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getHScrollbarHeight (JNIEnv *env, jobject);
 extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getVScrollbarWidth (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_setScrollPosition (JNIEnv *env, jobject, jint, jint);
Index: include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkScrollbarPeer.h
--- include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h	30 Jul 2003 16:47:19 -0000	1.2
+++ include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h	6 Jan 2004 00:36:56 -0000
@@ -11,7 +11,8 @@
 #endif
 
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create__IIIIIII (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectHooks (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectJObject (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setLineIncrement (JNIEnv *env, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setPageIncrement (JNIEnv *env, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setValues (JNIEnv *env, jobject, jint, jint, jint, jint);
Index: include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkTextComponentPeer.h
--- include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h	24 Jul 2003 22:04:49 -0000	1.2
+++ include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h	6 Jan 2004 00:36:56 -0000
@@ -10,7 +10,7 @@
 {
 #endif
 
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_connectHooks (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_connectSignals (JNIEnv *env, jobject);
 extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getCaretPosition (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setCaretPosition (JNIEnv *env, jobject, jint);
 extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getSelectionStart (JNIEnv *env, jobject);
Index: include/gnu_java_awt_peer_gtk_GtkWindowPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkWindowPeer.h
--- include/gnu_java_awt_peer_gtk_GtkWindowPeer.h	24 Oct 2003 19:54:23 -0000	1.6
+++ include/gnu_java_awt_peer_gtk_GtkWindowPeer.h	6 Jan 2004 00:36:56 -0000
@@ -11,7 +11,8 @@
 #endif
 
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create__IZIILgnu_java_awt_peer_gtk_GtkWindowPeer_2 (JNIEnv *env, jobject, jint, jboolean, jint, jint, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectHooks (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectJObject (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toBack (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toFront (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetBounds (JNIEnv *env, jobject, jint, jint, jint, jint);
Index: java/awt/Choice.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Choice.java,v
retrieving revision 1.13
diff -u -r1.13 Choice.java
--- java/awt/Choice.java	31 Dec 2003 11:17:16 -0000	1.13
+++ java/awt/Choice.java	6 Jan 2004 00:36:56 -0000
@@ -169,17 +169,6 @@
       ChoicePeer cp = (ChoicePeer) peer;
       cp.add (item, i);
     }
-
-  if (i == 0)
-  {
-    selectedIndex = 0;
-    // We must generate an ItemEvent here
-    Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent (
-      new ItemEvent ((ItemSelectable)this, 
-                     ItemEvent.ITEM_STATE_CHANGED,
-                     getItem(0),
-                     ItemEvent.SELECTED));
-  }
 }
 
 /*************************************************************************/
@@ -229,17 +218,6 @@
       ChoicePeer cp = (ChoicePeer) peer;
       cp.add (item, index);
     }
-
-  if (getItemCount () == 1 || selectedIndex >= index)
-  {
-    select (0);
-    // We must generate an ItemEvent here
-    Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent (
-      new ItemEvent ((ItemSelectable)this, 
-                     ItemEvent.ITEM_STATE_CHANGED,
-                     getItem(0),
-                     ItemEvent.SELECTED));
-  }
 }
 
 /*************************************************************************/
@@ -273,6 +251,9 @@
 public synchronized void
 remove(int index)
 {
+  if ((index < 0) || (index > getItemCount()))
+    throw new IllegalArgumentException("Bad index: " + index);
+
   pItems.removeElementAt(index);
 
   if (peer != null)
@@ -281,17 +262,7 @@
       cp.remove (index);
     }
 
-  if ((index == selectedIndex) && (getItemCount() > 0))
-  {
-    select (0);
-    // We must generate an ItemEvent here
-    Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent (
-      new ItemEvent ((ItemSelectable)this, 
-                     ItemEvent.ITEM_STATE_CHANGED,
-                     getItem(0),
-                     ItemEvent.SELECTED));
-  }
-  else if (selectedIndex > index)
+  if (selectedIndex > index)
     --selectedIndex;
 }
 
@@ -303,26 +274,15 @@
 public synchronized void
 removeAll()
 {
-  int count = getItemCount();
-
-  if (count <= 0)
+  if (getItemCount() <= 0)
     return;
   
-  ChoicePeer cp = (ChoicePeer) peer;
+  pItems.removeAllElements ();
 
-  // Select the first item to prevent an spurious ItemEvent to be generated
-  if (cp != null)
-    {
-      cp.select (0);
-      selectedIndex = 0; // Just to keep consistent
-    }
-
-  for (int i = (count - 1); i >= 0; i--)
+  if (peer != null)
     {
-      // Always remove the last to avoid generation of ItemEvents.
-      pItems.removeElementAt(i);
-      if (cp != null)
-        cp.remove (i);
+      ChoicePeer cp = (ChoicePeer) peer;
+      cp.removeAll ();
     }
 
   selectedIndex = -1;
Index: java/awt/ScrollPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/ScrollPane.java,v
retrieving revision 1.17
diff -u -r1.17 ScrollPane.java
--- java/awt/ScrollPane.java	3 Jun 2003 16:49:45 -0000	1.17
+++ java/awt/ScrollPane.java	6 Jan 2004 00:36:56 -0000
@@ -218,12 +218,71 @@
 {
   Dimension viewsize = getSize ();
   Insets insets = getInsets ();
-  viewsize.width = (viewsize.width
-                    - (insets.left + insets.right)
-                    - getVScrollbarWidth ());
-  viewsize.height = (viewsize.height
-                     - (insets.top + insets.bottom)
-                     - getHScrollbarHeight ());
+
+  viewsize.width -= (insets.left + insets.right);
+  viewsize.height -= (insets.top + insets.bottom);
+
+  Component[] list = getComponents();
+  if ((list == null) || (list.length <= 0))
+    return viewsize;
+
+  Dimension dim = list[0].getPreferredSize();
+
+  if (dim.width <= 0 && dim.height <= 0)
+    return viewsize;
+
+  int vScrollbarWidth = getVScrollbarWidth ();
+  int hScrollbarHeight = getHScrollbarHeight ();
+
+  if (scrollbarDisplayPolicy == SCROLLBARS_ALWAYS)
+    {
+      viewsize.width -= vScrollbarWidth;
+      viewsize.height -= hScrollbarHeight;
+      return viewsize;
+    }
+
+  if (scrollbarDisplayPolicy == SCROLLBARS_NEVER)
+    return viewsize;
+
+  // The scroll policy is SCROLLBARS_AS_NEEDED, so we need to see if
+  // either scrollbar is needed.
+
+  // Assume we don't need either scrollbar.
+  boolean mayNeedVertical = false;
+  boolean mayNeedHorizontal = false;
+
+  boolean needVertical = false;
+  boolean needHorizontal = false;
+
+  // Check if we need vertical scrollbars.  If we do, then we need to
+  // subtract the width of the vertical scrollbar from the viewport's
+  // width.
+  if (dim.height > viewsize.height)
+    needVertical = true;
+  else if (dim.height > (viewsize.height - hScrollbarHeight))
+    // This is tricky.  In this case the child is tall enough that its
+    // bottom edge would be covered by a horizontal scrollbar, if one
+    // were present.  This means that if there's a horizontal
+    // scrollbar then we need a vertical scrollbar.
+    mayNeedVertical = true;
+
+  if (dim.width > viewsize.width)
+    needHorizontal = true;
+  else if (dim.width > (viewsize.width - vScrollbarWidth))
+    mayNeedHorizontal = true;
+
+  if (needVertical && mayNeedHorizontal)
+    needHorizontal = true;
+
+  if (needHorizontal && mayNeedVertical)
+    needVertical = true;
+
+  if (needHorizontal)
+    viewsize.height -= hScrollbarHeight;
+
+  if (needVertical)
+    viewsize.width -= vScrollbarWidth;
+
   return viewsize;
 }
 
@@ -391,7 +450,19 @@
   if ((list != null) && (list.length > 0))
     {
       Dimension dim = list[0].getPreferredSize();
-      list[0].resize(dim);
+      Dimension vp = getViewportSize ();
+
+      if (dim.width < vp.width)
+	dim.width = vp.width;
+
+      if (dim.height < vp.height)
+	dim.height = vp.height;
+
+      ScrollPanePeer peer = (ScrollPanePeer) getPeer ();
+      if (peer != null)
+	peer.childResized (dim.width, dim.height);
+
+      list[0].resize (dim);
 
       Point p = getScrollPosition();
       if (p.x > dim.width)
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c	20 Nov 2003 22:27:37 -0000	1.1
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c	6 Jan 2004 00:36:57 -0000
@@ -37,7 +37,6 @@
 
 #include <math.h>
 
-#include "gtkpeer.h"
 #include "gdkfont.h"
 #include "gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.h"
 
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GdkGraphics2D.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c	20 Nov 2003 22:27:37 -0000	1.2
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c	6 Jan 2004 00:36:57 -0000
@@ -35,7 +35,7 @@
    obligated to do so.  If you do not wish to do so, delete this
    exception statement from your version. */
 
-#include "gtkpeer.h"
+#include "gtkcairopeer.h"
 #include "gdkfont.h"
 #include "gnu_java_awt_peer_gtk_GdkGraphics2D.h"
 #include <gdk/gdktypes.h>
@@ -46,7 +46,6 @@
 #include <gdk-pixbuf/gdk-pixdata.h>
 
 #include <cairo.h>
-#include <cairo-xlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -385,6 +384,7 @@
 
   gdk_draw_drawable(dst->drawable, gc, src->drawable, 
  		    0, 0, x, y, width, height); 
+  gdk_flush ();
 
   g_object_unref (gc);
 
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.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c	17 Sep 2003 20:05:53 -0000	1.1
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c	6 Jan 2004 00:36:57 -0000
@@ -153,7 +153,7 @@
 }
 
 static void
-closed (GdkPixbufLoader *loader, jobject *decoder)
+closed (GdkPixbufLoader *loader __attribute__((unused)), jobject *decoder)
 {
   gdk_threads_leave ();
   (*gdk_env)->DeleteGlobalRef (gdk_env, *decoder); 
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,v
retrieving revision 1.9
diff -u -r1.9 gnu_java_awt_peer_gtk_GtkButtonPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c	8 Oct 2003 23:40:49 -0000	1.9
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c	6 Jan 2004 00:36:57 -0000
@@ -37,18 +37,54 @@
 
 
 #include "gtkpeer.h"
+#include "gnu_java_awt_peer_gtk_GtkComponentPeer.h"
 #include "gnu_java_awt_peer_gtk_GtkButtonPeer.h"
 
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create
   (JNIEnv *env, jobject obj)
 {
   GtkWidget *button;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   gdk_threads_enter ();
+  
   button = gtk_button_new();
   gtk_widget_show (button);
+
   gdk_threads_leave ();
+
   NSA_SET_PTR (env, obj, button);
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectJObject
+  (JNIEnv *env, jobject obj)
+{
+  void *ptr;
+
+  ptr = NSA_GET_PTR (env, obj);
+
+  gdk_threads_enter ();
+
+  gtk_widget_realize (GTK_WIDGET (ptr));
+
+  connect_awt_hook (env, obj, 1, GTK_BUTTON(ptr)->event_window);
+
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectSignals
+  (JNIEnv *env, jobject obj)
+{
+  /* FIXME: Do we need to connect any signals here? Otherwise just do not
+     override parent method. */
+
+  /* Connect the superclass signals.  */
+  Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, obj);
 }
 
 JNIEXPORT void JNICALL 
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkCanvasPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c	22 Aug 2003 20:41:58 -0000	1.4
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c	6 Jan 2004 00:36:57 -0000
@@ -44,8 +44,13 @@
 {
   gpointer widget;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   gdk_threads_enter ();
+  
   widget = gtk_type_new (gtk_drawing_area_get_type ());
+
   gdk_threads_leave ();
 
   NSA_SET_PTR (env, obj, widget);
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c	22 Jan 2002 22:27:02 -0000	1.3
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c	6 Jan 2004 00:36:57 -0000
@@ -46,12 +46,17 @@
   GtkWidget *widget;
   const char *str;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   str = (*env)->GetStringUTFChars (env, label, NULL);
 
   gdk_threads_enter ();
+  
   widget = gtk_check_menu_item_new_with_label (str);
   gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (widget), 1);
   gtk_widget_show (widget);
+
   gdk_threads_leave ();
 
   (*env)->ReleaseStringUTFChars (env, label, str);
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c	15 Nov 2002 03:05:11 -0000	1.6
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c	6 Jan 2004 00:36:57 -0000
@@ -1,5 +1,5 @@
 /* gtkcheckboxpeer.c -- Native implementation of GtkCheckboxPeer
-   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -78,10 +78,13 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeCreate
-  (JNIEnv *env, jobject obj, jobject group)
+  (JNIEnv *env, jobject obj, jobject group, jboolean state)
 {
   GtkWidget *button;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   gdk_threads_enter ();
 
   if (group == NULL)
@@ -97,6 +100,7 @@
 	  NSA_SET_PTR (env, group, button);
 	}
     }
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), state);
 
   gdk_threads_leave ();
 
@@ -104,25 +108,22 @@
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_connectHooks
+Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_connectSignals
   (JNIEnv *env, jobject obj)
 {
   void *ptr = NSA_GET_PTR (env, obj);
-  jobject peer;
+  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+  g_assert (gref);
 
   gdk_threads_enter ();
 
-  peer = (*env)->NewGlobalRef (env, obj);
-
-  /* FIXME: when the widget goes away, we should get rid of the global
-     reference.  */
-  gtk_signal_connect (GTK_OBJECT (ptr), "toggled",
-		      GTK_SIGNAL_FUNC (item_toggled), peer);
+  g_signal_connect (G_OBJECT (ptr), "toggled",
+		      GTK_SIGNAL_FUNC (item_toggled), *gref);
 
   gdk_threads_leave ();
 
-  /* Connect the superclass hooks.  */
-  Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks (env, obj);
+  /* Connect the superclass signals.  */
+  Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, obj);
 }
 
 JNIEXPORT void JNICALL 
@@ -166,6 +167,7 @@
 static void
 item_toggled (GtkToggleButton *item, jobject peer)
 {
+  //g_print ("toggled\n");
   (*gdk_env)->CallVoidMethod (gdk_env, peer,
 			      postItemEventID,
 			      peer,
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkChoicePeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c	8 Oct 2003 16:00:57 -0000	1.4
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c	6 Jan 2004 00:36:57 -0000
@@ -41,8 +41,9 @@
 
 static void connect_choice_item_selectable_hook (JNIEnv *env, 
 						 jobject peer_obj, 
-						 GtkItem *item, 
-						 jobject item_obj);
+						 GtkItem *menuitem, 
+						 const char *label);
+
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create 
   (JNIEnv *env, jobject obj)
@@ -51,7 +52,11 @@
   GtkOptionMenu *option_menu;
   GtkRequisition child_requisition;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   gdk_threads_enter ();
+  
   option_menu = GTK_OPTION_MENU (gtk_option_menu_new ());
   menu = gtk_menu_new ();
   gtk_widget_show (menu);
@@ -97,14 +102,13 @@
       label = (*env)->GetStringUTFChars (env, item, NULL);
 
       menuitem = gtk_menu_item_new_with_label (label);
-
-      (*env)->ReleaseStringUTFChars (env, item, label);
-
       gtk_menu_append (menu, menuitem);
       gtk_widget_show (menuitem);
 
       connect_choice_item_selectable_hook (env, obj, 
-					   GTK_ITEM (menuitem), item);
+					   GTK_ITEM (menuitem), label);
+
+      (*env)->ReleaseStringUTFChars (env, item, label);
     }
   
   if (need_set_history)
@@ -135,7 +139,8 @@
   menuitem = gtk_menu_item_new_with_label (label);
   gtk_menu_insert (GTK_MENU (menu), menuitem, index);
   gtk_widget_show (menuitem);
-  connect_choice_item_selectable_hook (env, obj, GTK_ITEM (menuitem), item);
+
+  connect_choice_item_selectable_hook (env, obj, GTK_ITEM (menuitem), label);
 
   if (need_set_history)
     gtk_option_menu_set_history (GTK_OPTION_MENU (ptr), 0);
@@ -151,14 +156,19 @@
 {
   void *ptr;
   GtkContainer *menu;
+  GtkWidget *menuitem;
   GList *children;
 
   ptr = NSA_GET_PTR (env, obj);
 
   gdk_threads_enter ();
+
   menu = GTK_CONTAINER (gtk_option_menu_get_menu (GTK_OPTION_MENU (ptr)));
   children = gtk_container_children (menu);
-  gtk_container_remove (menu, GTK_WIDGET (g_list_nth (children, index)->data));
+  menuitem = GTK_WIDGET (g_list_nth (children, index)->data);
+  gtk_container_remove (menu, menuitem);
+  gtk_widget_destroy (menuitem);
+
   gdk_threads_leave ();
 }
 
@@ -175,31 +185,49 @@
   gdk_threads_leave ();
 }
 
-
 static void
 item_activate (GtkItem *item __attribute__((unused)),
 	       struct item_event_hook_info *ie)
 {
   gdk_threads_leave ();
+
+  jstring label = (*gdk_env)->NewStringUTF (gdk_env, ie->label);
   (*gdk_env)->CallVoidMethod (gdk_env, ie->peer_obj,
-			      postItemEventID,
-			      ie->item_obj,
+			      choicePostItemEventID,
+			      label,
 			      (jint) AWT_ITEM_SELECTED);
   gdk_threads_enter ();
 }
 
 static void
-connect_choice_item_selectable_hook (JNIEnv *env, jobject peer_obj, 
-				     GtkItem *item, jobject item_obj)
+item_removed (gpointer data, 
+	      GClosure gc __attribute__((unused)))
+{
+  struct item_event_hook_info *ie = data;
+
+  free (ie->label);
+  free (ie);
+}
+
+static void
+connect_choice_item_selectable_hook (JNIEnv *env, 
+				     jobject peer_obj, 
+				     GtkItem *menuitem, 
+				     const char *label)
 {
   struct item_event_hook_info *ie;
+  jobject *peer_objGlobPtr;
 
   ie = (struct item_event_hook_info *) 
     malloc (sizeof (struct item_event_hook_info));
 
-  ie->peer_obj = (*env)->NewGlobalRef (env, peer_obj);
-  ie->item_obj = (*env)->NewGlobalRef (env, item_obj);
+  peer_objGlobPtr = NSA_GET_GLOBAL_REF (env, peer_obj);
+  g_assert (peer_objGlobPtr);
+
+  ie->peer_obj = *peer_objGlobPtr;
+  ie->label = strdup (label);
 
-  gtk_signal_connect (GTK_OBJECT (item), "activate", 
-		      GTK_SIGNAL_FUNC (item_activate), ie);
+  g_signal_connect_data (G_OBJECT (menuitem), "activate", 
+		      GTK_SIGNAL_FUNC (item_activate), ie,
+		      (GClosureNotify) item_removed, 0);
 }
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkClipboard.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c	8 Oct 2003 16:00:57 -0000	1.4
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c	6 Jan 2004 00:36:57 -0000
@@ -75,16 +75,16 @@
   gdk_threads_enter ();
   clipboard = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-  gtk_signal_connect (GTK_OBJECT(clipboard), "selection_received",
+  g_signal_connect (G_OBJECT(clipboard), "selection_received",
 		      GTK_SIGNAL_FUNC (selection_received), NULL);
 
-  gtk_signal_connect (GTK_OBJECT(clipboard), "selection_clear_event",
+  g_signal_connect (G_OBJECT(clipboard), "selection_clear_event",
 		      GTK_SIGNAL_FUNC (selection_clear), NULL);
 
   gtk_selection_add_target (clipboard, GDK_SELECTION_PRIMARY, 
 			    GDK_TARGET_STRING, 0);
 
-  gtk_signal_connect (GTK_OBJECT(clipboard), "selection_get",
+  g_signal_connect (G_OBJECT(clipboard), "selection_get",
                       GTK_SIGNAL_FUNC (selection_get), NULL);
 
   gdk_threads_leave ();
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v
retrieving revision 1.15
diff -u -r1.15 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	11 Nov 2003 17:13:36 -0000	1.15
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	6 Jan 2004 00:36:57 -0000
@@ -48,12 +48,16 @@
 {
   void *ptr;
 
+  /* Remove entries from state tables */
+  NSA_DEL_GLOBAL_REF (env, obj);
   ptr = NSA_DEL_PTR (env, obj);
 
+  gdk_threads_enter ();
+  
   /* For now the native state for any object must be a widget.
      However, a subclass could override dispose() if required.  */
-  gdk_threads_enter ();
   gtk_widget_destroy (GTK_WIDGET (ptr));
+
   gdk_threads_leave ();
 }
 
@@ -165,29 +169,69 @@
 }
 
 /*
- * Find the preferred size of a widget.
+ * Find this widget's current size.
  */
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetDimensions
-    (JNIEnv *env, jobject obj, jintArray jdims)
+  (JNIEnv *env, jobject obj, jintArray jdims)
+{
+  void *ptr;
+  jint *dims;
+  GtkRequisition requisition;
+
+  ptr = NSA_GET_PTR (env, obj);
+
+  dims = (*env)->GetIntArrayElements (env, jdims, 0);  
+  dims[0] = dims[1] = 0;
+
+  gdk_threads_enter ();
+
+  gtk_widget_size_request (GTK_WIDGET (ptr), &requisition);
+
+  dims[0] = requisition.width;
+  dims[1] = requisition.height;
+
+  gdk_threads_leave ();
+
+  (*env)->ReleaseIntArrayElements (env, jdims, dims, 0);
+}
+
+/*
+ * Find this widget's preferred size.
+ */
+JNIEXPORT void JNICALL 
+Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetPreferredDimensions
+  (JNIEnv *env, jobject obj, jintArray jdims)
 {
-    void *ptr;
-    jint *dims;
-    GtkRequisition req;
+  void *ptr;
+  jint *dims;
+  GtkRequisition current_req;
+  GtkRequisition natural_req;
 
-    ptr = NSA_GET_PTR (env, obj);
-    dims = (*env)->GetIntArrayElements (env, jdims, 0);  
+  ptr = NSA_GET_PTR (env, obj);
+
+  dims = (*env)->GetIntArrayElements (env, jdims, 0);  
+  dims[0] = dims[1] = 0;
+
+  gdk_threads_enter ();
+
+  /* Save the widget's current size request. */
+  gtk_widget_size_request (GTK_WIDGET (ptr), &current_req);
 
-    gdk_threads_enter ();
+  /* Get the widget's "natural" size request. */
+  gtk_widget_set_size_request (GTK_WIDGET (ptr), -1, -1);
+  gtk_widget_size_request (GTK_WIDGET (ptr), &natural_req);
 
-    gtk_signal_emit_by_name (GTK_OBJECT (ptr), "size_request", &req);
+  /* Reset the widget's size request. */
+  gtk_widget_set_size_request (GTK_WIDGET (ptr),
+			       current_req.width, current_req.height);
 
-    dims[0] = req.width;
-    dims[1] = req.height;
+  dims[0] = natural_req.width;
+  dims[1] = natural_req.height;
 
-    gdk_threads_leave ();
+  gdk_threads_leave ();
 
-    (*env)->ReleaseIntArrayElements(env, jdims, dims, 0);
+  (*env)->ReleaseIntArrayElements (env, jdims, dims, 0);
 }
 
 JNIEXPORT void JNICALL 
@@ -531,7 +575,7 @@
   (*env)->ReleaseStringUTFChars (env, jname, name);
 }
 
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject
   (JNIEnv *env, jobject obj)
 {
   void *ptr;
@@ -539,12 +583,36 @@
   ptr = NSA_GET_PTR (env, obj);
 
   gdk_threads_enter ();
+
   gtk_widget_realize (GTK_WIDGET (ptr));
 
-  if(GTK_IS_BUTTON(ptr))
-    connect_awt_hook (env, obj, 1, GTK_BUTTON(ptr)->event_window);
-  else
-    connect_awt_hook (env, obj, 1, GTK_WIDGET (ptr)->window);
+  connect_awt_hook (env, obj, 1, GTK_WIDGET (ptr)->window);
+
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals
+  (JNIEnv *env, jobject obj)
+{
+  void *ptr = NSA_GET_PTR (env, obj);
+  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+  g_assert (gref);
+
+  gdk_threads_enter ();
+
+  gtk_widget_realize (GTK_WIDGET (ptr));
+  
+  /* FIXME: We could check here if this is a scrolled window with a
+     single child that does not have an associated jobject.  This
+     means that it is one of our wrapped widgets like List or TextArea
+     and thus we could connect the signal to the child without having
+     to specialize this method. */
+
+  /* Connect EVENT signal, which happens _before_ any specific signal. */
+
+  g_signal_connect (GTK_OBJECT (ptr), "event", 
+                    G_CALLBACK (pre_event_handler), *gref);
+
   gdk_threads_leave ();
 }
 
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,v
retrieving revision 1.17
diff -u -r1.17 gnu_java_awt_peer_gtk_GtkEvents.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c	1 Dec 2003 23:44:12 -0000	1.17
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c	6 Jan 2004 00:36:57 -0000
@@ -813,19 +813,57 @@
 void
 awt_event_handler (GdkEvent *event)
 {
-  jobject *event_obj_ptr;
+  /* keep synthetic AWT events from being processed recursively */
+  if (event->type & SYNTHETIC_EVENT_MASK && event->type != GDK_NOTHING)
+    {
+      event->type ^= SYNTHETIC_EVENT_MASK;
+    }
+
+  gtk_main_do_event (event);
+}
+
+gboolean
+pre_event_handler (GtkWidget *widget, GdkEvent *event, jobject peer)
+{
+  GtkWidget *event_widget;
   static guint32 button_click_time = 0;
   static GdkWindow *button_window = NULL;
   static guint button_number = -1;
   static jint click_count = 1;
 
-  /* keep synthetic AWT events from being processed recursively */
-  if (event->type & SYNTHETIC_EVENT_MASK && event->type != GDK_NOTHING)
+  /* If it is not a focus change event, the widget must be realized already.
+     If not, ignore the event (Gtk+ will do the same). */
+  if (!(event->type == GDK_FOCUS_CHANGE || GTK_WIDGET_REALIZED(widget)))
+    return FALSE;
+    
+  /* Do not handle propagated events.  AWT has its own propagation rules */
+  gdk_window_get_user_data (event->any.window, (void **) &event_widget);
+  if (event_widget != widget)
+    return FALSE;
+
+  /* We only care about input events */    
+  if (!(event->type == GDK_BUTTON_PRESS
+       || event->type == GDK_BUTTON_RELEASE
+       || event->type == GDK_ENTER_NOTIFY
+       || event->type == GDK_LEAVE_NOTIFY
+       || event->type == GDK_CONFIGURE
+       || event->type == GDK_EXPOSE
+       || event->type == GDK_KEY_PRESS
+       || event->type == GDK_KEY_RELEASE
+       || event->type == GDK_FOCUS_CHANGE
+       || event->type == GDK_MOTION_NOTIFY))
     {
-      event->type ^= SYNTHETIC_EVENT_MASK;
-      gtk_main_do_event (event);
-      return;
+      return FALSE;
     }
+  /* g_print("event %u widget %s peer %p\n",
+            event->type, gtk_widget_get_name (widget), peer); */
+
+  /* If it has no jobject associated we can send no AWT event */
+  if (!peer)
+    return FALSE;
+
+  /* for all input events, which have a window with a jobject attached,
+     send the AWT input event corresponding to the Gtk event off to Java  */
 
   /* keep track of clickCount ourselves, since the AWT allows more
      than a triple click to occur */
@@ -843,341 +881,266 @@
       button_number = event->button.button;
     }
 
-  /* for all input events, which have a window with a jobject attached,
-     send the input event off to Java before GTK has a chance to process
-     the event */
-  if ((event->type == GDK_BUTTON_PRESS
-       || event->type == GDK_BUTTON_RELEASE
-       || event->type == GDK_ENTER_NOTIFY
-       || event->type == GDK_LEAVE_NOTIFY
-       || event->type == GDK_CONFIGURE
-       || event->type == GDK_EXPOSE
-       || event->type == GDK_KEY_PRESS
-       || event->type == GDK_KEY_RELEASE
-       || event->type == GDK_FOCUS_CHANGE
-       || event->type == GDK_MOTION_NOTIFY)
-      && gdk_property_get (event->any.window,
-			   gdk_atom_intern ("_GNU_GTKAWT_ADDR", FALSE),
-			   gdk_atom_intern ("CARDINAL", FALSE),
-			   0,
-			   sizeof (jobject),
-			   FALSE,
-			   NULL,
-			   NULL,
-			   NULL,
-			   (guchar **)&event_obj_ptr))
+  switch (event->type)
     {
-      GtkWidget *event_widget;
-      GtkWidget *grab_widget;
-      jobject *grab_obj_ptr = NULL;
-      void *ptr;
-
-      /* Implement modality using GTK grabs. */
-      g_assert (global_gtk_window_group);
-      if (global_gtk_window_group->grabs)
-	{
-	  grab_widget = global_gtk_window_group->grabs->data;
-	  g_assert (grab_widget);
-
-	  gdk_property_get (grab_widget->window,
-			    gdk_atom_intern ("_GNU_GTKAWT_ADDR", FALSE),
-			    gdk_atom_intern ("CARDINAL", FALSE),
-			    0,
-			    sizeof (jobject),
-			    FALSE,
-			    NULL,
-			    NULL,
-			    NULL,
-			    (guchar **)&grab_obj_ptr);
-
-	  ptr = NSA_GET_PTR (gdk_env, *event_obj_ptr);
-	  event_widget = GTK_WIDGET(ptr);
-
-	  if (GTK_WIDGET_IS_SENSITIVE (event_widget) &&
-	      gtk_widget_is_ancestor (event_widget, grab_widget))
-	    {
-	      g_free (grab_obj_ptr);
-
-	      grab_obj_ptr = event_obj_ptr;
-	    }
-	}
-      else
-	grab_obj_ptr = event_obj_ptr;
-
-      switch (event->type)
-	{
-	case GDK_BUTTON_PRESS:
-	  (*gdk_env)->CallVoidMethod (gdk_env, *grab_obj_ptr, postMouseEventID,
-				      AWT_MOUSE_PRESSED, 
-				      (jlong)event->button.time,
+    case GDK_BUTTON_PRESS:
+      (*gdk_env)->CallVoidMethod (gdk_env, peer,
+                                  postMouseEventID,
+				  AWT_MOUSE_PRESSED, 
+				  (jlong)event->button.time,
+				  state_to_awt_mods (event->button.state) |
+				  button_to_awt_mods (event->button.button), 
+				  (jint)event->button.x,
+				  (jint)event->button.y, 
+				  click_count, 
+				  (event->button.button == 3) ? JNI_TRUE :
+				                                JNI_FALSE);
+      break;
+    case GDK_BUTTON_RELEASE:
+      {
+	int width, height;
+
+	(*gdk_env)->CallVoidMethod (gdk_env, peer,
+				    postMouseEventID,
+				    AWT_MOUSE_RELEASED, 
+				    (jlong)event->button.time,
 				    state_to_awt_mods (event->button.state) |
 				    button_to_awt_mods (event->button.button), 
-				      (jint)event->button.x,
-				      (jint)event->button.y, 
-				      click_count, 
-				      (event->button.button == 3) ? JNI_TRUE :
-				                                    JNI_FALSE);
-
-	  /*	  grab_counter++;
-	  gdk_pointer_grab (event->any.window,
-			    FALSE,
-			    GDK_POINTER_MOTION_MASK |
-			    GDK_BUTTON_MOTION_MASK |
-			    GDK_BUTTON_PRESS_MASK |
-			    GDK_BUTTON_RELEASE_MASK |
-			    GDK_ENTER_NOTIFY_MASK |
-			    GDK_LEAVE_NOTIFY_MASK,
-			    NULL,
-			    NULL,
-			    event->button.time);*/
-	  break;
-	case GDK_BUTTON_RELEASE:
-	  {
-	    int width, height;
+				    (jint)event->button.x,
+				    (jint)event->button.y, 
+				    click_count,
+				    JNI_FALSE);
+
+	/* check to see if the release occured in the window it was pressed
+	   in, and if so, generate an AWT click event */
+	gdk_window_get_size (event->any.window, &width, &height);
+	if (event->button.x >= 0
+            && event->button.y >= 0
+	    && event->button.x <= width 
+	    && event->button.y <= height)
+          {
+	    (*gdk_env)->CallVoidMethod (gdk_env, peer,
+				        postMouseEventID,
+				        AWT_MOUSE_CLICKED, 
+				        (jlong)event->button.time,
+				        state_to_awt_mods (event->button.state) |
+				        button_to_awt_mods (event->button.button), 
+				        (jint)event->button.x,
+				        (jint)event->button.y, 
+				        click_count,
+				        JNI_FALSE);
+          }
+      }
+      break;
+    case GDK_MOTION_NOTIFY:
+      (*gdk_env)->CallVoidMethod (gdk_env, peer, postMouseEventID,
+				  AWT_MOUSE_MOVED,
+				  (jlong)event->motion.time,
+				  state_to_awt_mods (event->motion.state),
+				  (jint)event->motion.x,
+				  (jint)event->motion.y,
+				  0,
+				  JNI_FALSE);
 
-	    /* only ungrab if no other buttons are pressed down */
-	    /*	    if (--grab_counter == 0)
-	      gdk_pointer_ungrab (event->button.time);
-	    */
-	    (*gdk_env)->CallVoidMethod (gdk_env, *grab_obj_ptr,
-					postMouseEventID,
-					AWT_MOUSE_RELEASED, 
-					(jlong)event->button.time,
-				    state_to_awt_mods (event->button.state) |
-				    button_to_awt_mods (event->button.button), 
-					(jint)event->button.x,
-					(jint)event->button.y, 
-					click_count, JNI_FALSE);
-
-	    /* check to see if the release occured in the window it was pressed
-	       in, and if so, generate an AWT click event */
-	    gdk_window_get_size (event->any.window, &width, &height);
-	    if (event->button.x >= 0
-		&& event->button.y >= 0
-		&& event->button.x <= width 
-		&& event->button.y <= height)
-	      (*gdk_env)->CallVoidMethod (gdk_env, *grab_obj_ptr,
-					  postMouseEventID,
-					  AWT_MOUSE_CLICKED, 
-					  (jlong)event->button.time,
-				   state_to_awt_mods (event->button.state) |
-				  button_to_awt_mods (event->button.button), 
-					  (jint)event->button.x,
-					  (jint)event->button.y, 
-					  click_count, JNI_FALSE);
-	    
-	  }
-	  break;
-	case GDK_MOTION_NOTIFY:
-	  (*gdk_env)->CallVoidMethod (gdk_env, *grab_obj_ptr, postMouseEventID,
-				      AWT_MOUSE_MOVED,
+      if (event->motion.state & (GDK_BUTTON1_MASK
+				 | GDK_BUTTON2_MASK
+				 | GDK_BUTTON3_MASK
+				 | GDK_BUTTON4_MASK
+				 | GDK_BUTTON5_MASK))
+	{
+	  (*gdk_env)->CallVoidMethod (gdk_env, peer,
+			              postMouseEventID,
+				      AWT_MOUSE_DRAGGED,
 				      (jlong)event->motion.time,
 				      state_to_awt_mods (event->motion.state),
 				      (jint)event->motion.x,
 				      (jint)event->motion.y,
-				      0, JNI_FALSE);
-
-	  if (event->motion.state & (GDK_BUTTON1_MASK
-				     | GDK_BUTTON2_MASK
-				     | GDK_BUTTON3_MASK
-				     | GDK_BUTTON4_MASK
-				     | GDK_BUTTON5_MASK))
-	    {
-	      (*gdk_env)->CallVoidMethod (gdk_env, *grab_obj_ptr,
-					  postMouseEventID,
-					  AWT_MOUSE_DRAGGED,
-					  (jlong)event->motion.time,
-				      state_to_awt_mods (event->motion.state),
-					  (jint)event->motion.x,
-					  (jint)event->motion.y,
-					  0, JNI_FALSE);
-	    }
-	  break;
-	case GDK_ENTER_NOTIFY:
-	  (*gdk_env)->CallVoidMethod (gdk_env, *grab_obj_ptr, postMouseEventID,
-				      AWT_MOUSE_ENTERED, 
-				      (jlong)event->crossing.time,
-				    state_to_awt_mods (event->crossing.state), 
-				      (jint)event->crossing.x,
-				      (jint)event->crossing.y, 
-				      0, JNI_FALSE);
-	  break;
-	case GDK_LEAVE_NOTIFY:
-	  if (event->crossing.mode == GDK_CROSSING_NORMAL)
-	    (*gdk_env)->CallVoidMethod (gdk_env, *grab_obj_ptr,
-					postMouseEventID,
-					AWT_MOUSE_EXITED, 
-					(jlong)event->crossing.time,
+				      0,
+				      JNI_FALSE);
+	}
+      break;
+    case GDK_ENTER_NOTIFY:
+      (*gdk_env)->CallVoidMethod (gdk_env, peer, postMouseEventID,
+				  AWT_MOUSE_ENTERED, 
+				  (jlong)event->crossing.time,
+				  state_to_awt_mods (event->crossing.state), 
+				  (jint)event->crossing.x,
+				  (jint)event->crossing.y, 
+				  0,
+				  JNI_FALSE);
+      break;
+    case GDK_LEAVE_NOTIFY:
+      if (event->crossing.mode == GDK_CROSSING_NORMAL)
+	(*gdk_env)->CallVoidMethod (gdk_env, peer,
+				    postMouseEventID,
+				    AWT_MOUSE_EXITED, 
+				    (jlong)event->crossing.time,
 				    state_to_awt_mods (event->crossing.state),
-					(jint)event->crossing.x,
-					(jint)event->crossing.y, 
-					0, JNI_FALSE);
-	  break;
-	case GDK_CONFIGURE:
-	  {
-	    GtkWidget *widget;
+				    (jint)event->crossing.x,
+				    (jint)event->crossing.y, 
+				    0,
+				    JNI_FALSE);
+      break;
+    case GDK_CONFIGURE:
+      {
+	/* GtkWidget *widget;
 
-	    gdk_window_get_user_data (event->any.window, (void **) &widget);
+	gdk_window_get_user_data (event->any.window, (void **) &widget); */
 	    
-	    if (widget && GTK_WIDGET_TOPLEVEL (widget))
-	      {
-		gint top, left, right, bottom;
+	if (widget && GTK_WIDGET_TOPLEVEL (widget))
+	  {
+	    gint top, left, right, bottom;
 
-		/* Configure events are not posted to the AWT event
-		   queue, and as such, the gdk/gtk peer functions will
-		   be called back before postConfigureEvent
-		   returns. */
-		gdk_threads_leave ();
+	    /* Configure events are not posted to the AWT event
+	       queue, and as such, the gdk/gtk peer functions will
+	       be called back before postConfigureEvent
+	       returns. */
+	    gdk_threads_leave ();
 
-		/* FIXME: hard-code these values for now. */
+	    /* FIXME: hard-code these values for now. */
+	    if (GTK_IS_PLUG (widget))
+	      {
+		top = 0;
+		left = 0;
+		bottom = 0;
+		right = 0;
+	      }
+	    else
+	      {
 		top = 20;
 		left = 6;
 		bottom = 6;
 		right = 6;
-
-		(*gdk_env)->CallVoidMethod (gdk_env, *event_obj_ptr,
-					    postConfigureEventID,
-					    (jint) event->configure.x,
-					    (jint) event->configure.y,
-					    (jint) event->configure.width,
-					    (jint) event->configure.height,
-					    (jint) top,
-					    (jint) left,
-					    (jint) bottom,
-					    (jint) right);
-		gdk_threads_enter ();
 	      }
+
+ 	    (*gdk_env)->CallVoidMethod (gdk_env, peer,
+					postConfigureEventID,
+					(jint) event->configure.x,
+					(jint) event->configure.y,
+					(jint) event->configure.width,
+					(jint) event->configure.height,
+					(jint) top,
+					(jint) left,
+					(jint) bottom,
+					(jint) right);
+	    gdk_threads_enter ();
 	  }
-	  break;
-	case GDK_EXPOSE:
+      }
+      break;
+    case GDK_EXPOSE:
+      {
+	(*gdk_env)->CallVoidMethod (gdk_env, peer,
+				    postExposeEventID,
+				    (jint)event->expose.area.x,
+				    (jint)event->expose.area.y,
+				    (jint)event->expose.area.width,
+				    (jint)event->expose.area.height);
+      }
+      break;
+    case GDK_FOCUS_CHANGE:
+      (*gdk_env)->CallVoidMethod (gdk_env, peer,
+				  postFocusEventID,
+				  (jint) (event->focus_change.in) ? 
+				  AWT_FOCUS_GAINED : AWT_FOCUS_LOST,
+				  JNI_FALSE);
+      break;
+    case GDK_KEY_PRESS:
+    case GDK_KEY_RELEASE:
+      {
+        GdkWindow *obj_window;
+        jobject *focus_obj_ptr = NULL;
+	int generates_key_typed = 0;
+
+        /* A widget with a grab will get key events */
+	if (!GTK_IS_WINDOW (widget))
+	  focus_obj_ptr = &peer;
+	else
 	  {
-	    (*gdk_env)->CallVoidMethod (gdk_env, *event_obj_ptr,
-					postExposeEventID,
-					(jint)event->expose.area.x,
-					(jint)event->expose.area.y,
-					(jint)event->expose.area.width,
-					(jint)event->expose.area.height);
-	  }
-	  break;
+            GtkWindow *window;
 
-	case GDK_KEY_PRESS:
-	  {
-	    GtkWidget *widget;
-	    GtkWindow *window;
-            /* The window to which the Java peer is attached. */
-            GdkWindow *obj_window;
-
-	    gdk_window_get_user_data (event->any.window, (void **) &widget);
-
-	    window = GTK_WINDOW (gtk_widget_get_ancestor (widget, 
-							  GTK_TYPE_WINDOW));
-	    if (window
-		&& GTK_WIDGET_IS_SENSITIVE (window)
-		&& window->focus_widget
-		&& GTK_WIDGET_IS_SENSITIVE (window->focus_widget)
-		&& window->focus_widget->window)
-	      {
-		gtk_widget_activate (window->focus_widget);
+            /* Check if we have an enabled focused widget in this window.
+	       If not don't handle the event. */
+	    window = GTK_WINDOW (widget);
+	    if (!window->focus_widget
+	        || !GTK_WIDGET_IS_SENSITIVE (window->focus_widget)
+	        || !window->focus_widget->window)
+	      return FALSE;
+	
+            /* TextArea peers are attached to the scrolled window
+               that contains the GtkTextView, not to the text view
+               itself.  Same for List. */
+            if (GTK_IS_TEXT_VIEW (window->focus_widget)
+                || GTK_IS_CLIST (window->focus_widget))
+              {
+                obj_window = gtk_widget_get_parent (window->focus_widget)->window;
+              }
+            else if (GTK_IS_BUTTON (window->focus_widget))
+	      /* GtkButton events go to the "event_window" and this is what
+	         we registered when the button was created. */
+              obj_window = GTK_BUTTON (window->focus_widget)->event_window;
+            else
+              obj_window = window->focus_widget->window;
+
+            gdk_property_get (obj_window,
+                              gdk_atom_intern ("_GNU_GTKAWT_ADDR", FALSE),
+                              gdk_atom_intern ("CARDINAL", FALSE),
+                              0,
+                              sizeof (jobject),
+                              FALSE,
+                              NULL,
+                              NULL,
+                              NULL,
+                              (guchar **)&focus_obj_ptr);
+
+            /* If the window has no jobject attached we can't send anything */
+	    if (!focus_obj_ptr)
+	      return FALSE;
+	      
+	    /* Should we generate an AWT_KEY_TYPED event? */
+	    generates_key_typed = generates_key_typed_event (event, window->focus_widget);
+	  }	
 
-                /* TextArea peers are attached to the scrolled window
-                   that contains the GtkTextView, not to the text view
-                   itself. */
-                if (GTK_IS_TEXT_VIEW (window->focus_widget))
-                  obj_window = gtk_widget_get_parent (window->focus_widget)->window;
-                else
-                  obj_window = window->focus_widget->window;
-
-		gdk_property_get (obj_window,
-				  gdk_atom_intern ("_GNU_GTKAWT_ADDR", FALSE),
-				  gdk_atom_intern ("CARDINAL", FALSE),
-				  0,
-				  sizeof (jobject),
-				  FALSE,
-				  NULL,
-				  NULL,
-				  NULL,
-				  (guchar **)&grab_obj_ptr);
-
-		(*gdk_env)->CallVoidMethod (gdk_env, *grab_obj_ptr,
-					    postKeyEventID,
-					    (jint) AWT_KEY_PRESSED,
-					    (jlong) event->key.time,
-                             keyevent_state_to_awt_mods (event),
-                             keysym_to_awt_keycode (event),
-                             keyevent_to_awt_keychar (event),
-                             keysym_to_awt_keylocation (event));
-
-                if (generates_key_typed_event (event, window->focus_widget))
-                  (*gdk_env)->CallVoidMethod (gdk_env, *grab_obj_ptr,
-                                              postKeyEventID,
-                                              (jint) AWT_KEY_TYPED,
-                                              (jlong) event->key.time,
-                                          state_to_awt_mods (event->key.state),
-                                              VK_UNDEFINED,
-                                              keyevent_to_awt_keychar (event),
-                                              AWT_KEY_LOCATION_UNKNOWN);
-	      }
-	  }
-	  break;
-        case GDK_KEY_RELEASE:
+	if (event->type == GDK_KEY_PRESS)	
 	  {
-	    GtkWidget *widget;
-	    GtkWindow *window;
-            GdkWindow *obj_window;
-
-	    gdk_window_get_user_data (event->any.window, (void **) &widget);
-
-	    window = GTK_WINDOW (gtk_widget_get_ancestor (widget, 
-							  GTK_TYPE_WINDOW));
-	    if (window
-		&& GTK_WIDGET_IS_SENSITIVE (window) 
-		&& window->focus_widget
-		&& GTK_WIDGET_IS_SENSITIVE (window->focus_widget)
-		&& window->focus_widget->window)
-	      {
-		gtk_widget_activate (window->focus_widget);
-
-                if (GTK_IS_TEXT_VIEW (window->focus_widget))
-                  obj_window = gtk_widget_get_parent (window->focus_widget)->window;
-                else
-                  obj_window = window->focus_widget->window;
-
-		gdk_property_get (obj_window,
-				  gdk_atom_intern ("_GNU_GTKAWT_ADDR", FALSE),
-				  gdk_atom_intern ("CARDINAL", FALSE),
-				  0,
-				  sizeof (jobject),
-				  FALSE,
-				  NULL,
-				  NULL,
-				  NULL,
-				  (guchar **)&grab_obj_ptr);
-
-		(*gdk_env)->CallVoidMethod (gdk_env, *grab_obj_ptr,
-					    postKeyEventID,
-					    (jint) AWT_KEY_RELEASED,
-					    (jlong) event->key.time,
-			     keyevent_state_to_awt_mods (event),
-			     keysym_to_awt_keycode (event),
-                             keyevent_to_awt_keychar (event),
-                             keysym_to_awt_keylocation (event));
+            (*gdk_env)->CallVoidMethod (gdk_env, *focus_obj_ptr,
+				        postKeyEventID,
+				        (jint) AWT_KEY_PRESSED,
+				        (jlong) event->key.time,
+                                        keyevent_state_to_awt_mods (event),
+                                        keysym_to_awt_keycode (event),
+                                        keyevent_to_awt_keychar (event),
+                                        keysym_to_awt_keylocation (event));
+
+            if (generates_key_typed)
+              {
+                (*gdk_env)->CallVoidMethod (gdk_env, *focus_obj_ptr,
+                                            postKeyEventID,
+                                            (jint) AWT_KEY_TYPED,
+                                            (jlong) event->key.time,
+                                            state_to_awt_mods (event->key.state),
+                                            VK_UNDEFINED,
+                                            keyevent_to_awt_keychar (event),
+                                            AWT_KEY_LOCATION_UNKNOWN);
               }
           }
-          break;
-	case GDK_FOCUS_CHANGE:
-	  (*gdk_env)->CallVoidMethod (gdk_env, *event_obj_ptr,
-				      postFocusEventID,
-				      (jint) (event->focus_change.in) ? 
-				      AWT_FOCUS_GAINED : AWT_FOCUS_LOST,
-				      JNI_FALSE);
-	  break;
-        default:
-	  break;
-	}
-      g_free (event_obj_ptr);
+	else /* GDK_KEY_RELEASE */
+          {
+	    (*gdk_env)->CallVoidMethod (gdk_env, *focus_obj_ptr,
+				        postKeyEventID,
+				        (jint) AWT_KEY_RELEASED,
+				        (jlong) event->key.time,
+			                keyevent_state_to_awt_mods (event),
+			                keysym_to_awt_keycode (event),
+                                        keyevent_to_awt_keychar (event),
+                                        keysym_to_awt_keylocation (event));
+	  }
+      }
+      break;
+    default:
+      break;
     }
-
-  gtk_main_do_event (event);
+  
+  return FALSE;
 }
 
 static void
@@ -1215,10 +1178,11 @@
 {
   va_list ap;
   jobject *obj;
+  //void *ptr = NSA_GET_PTR (env, peer_obj);
 
-  obj = (jobject *) malloc (sizeof (jobject));
-  *obj = (*env)->NewGlobalRef (env, peer_obj);
-  //g_print("Connection obj %p\n", peer_obj);
+  obj = NSA_GET_GLOBAL_REF (env, peer_obj);
+  //g_print("Connection obj %s\n", gtk_widget_get_name (GTK_WIDGET (ptr)));
+  g_assert (obj);
 
   va_start (ap, nwindows);
   {
@@ -1226,9 +1190,9 @@
   for (i = 0; i < nwindows; i++)
     {
       GdkWindow* attach = (va_arg (ap, GdkWindow *));
-      //g_print("attach peer obj %p and %p\n", peer_obj, attach);
       attach_jobject(attach, obj);
     }
   }
   va_end (ap);
 }
+
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c	24 Mar 2002 23:12:54 -0000	1.4
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c	6 Jan 2004 00:36:57 -0000
@@ -49,23 +49,28 @@
 {
   gpointer widget;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   gdk_threads_enter ();
+  
   widget = gtk_type_new (gtk_file_selection_get_type ());
+
   gdk_threads_leave ();
 
   NSA_SET_PTR (env, obj, widget);
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectHooks
+Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectJObject
   (JNIEnv *env, jobject obj)
 {
   void *ptr = NSA_GET_PTR (env, obj);
 
   gdk_threads_enter ();
 
-  /* NOTE: we don't call the superclass connect method here.  */
   gtk_widget_realize (GTK_WIDGET (ptr));
+
   connect_awt_hook (env, obj, 1, GTK_WIDGET (ptr)->window);
 
   gdk_threads_leave ();
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.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkLabelPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c	11 Nov 2003 17:13:36 -0000	1.6
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c	6 Jan 2004 00:36:57 -0000
@@ -48,10 +48,13 @@
   GtkContainer *ebox_container;
   const char *str;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   str = (*env)->GetStringUTFChars (env, text, 0);
 
   gdk_threads_enter ();
-
+  
   ebox = gtk_event_box_new ();
   ebox_container = GTK_CONTAINER (ebox);
   label = gtk_label_new (str);
@@ -90,7 +93,7 @@
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setAlignment
+Java_gnu_java_awt_peer_gtk_GtkLabelPeer_nativeSetAlignment
   (JNIEnv *env, jobject obj, jfloat xalign)
 {
   void *ptr;
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,v
retrieving revision 1.7
diff -u -r1.7 gnu_java_awt_peer_gtk_GtkListPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c	30 Oct 2003 01:57:59 -0000	1.7
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c	6 Jan 2004 00:36:57 -0000
@@ -37,10 +37,18 @@
 
 
 #include "gtkpeer.h"
+#include "gnu_java_awt_peer_gtk_GtkComponentPeer.h"
 #include "gnu_java_awt_peer_gtk_GtkListPeer.h"
 
-static void
-connect_selectable_hook (JNIEnv *env, jobject peer_obj, GtkCList *list);
+static void item_select (GtkCList *list __attribute__((unused)),
+	                 int row, int col __attribute__((unused)),
+	                 GdkEventButton *event __attribute__((unused)), 
+	                 jobject peer_obj);
+static void item_unselect (GtkCList *list __attribute__((unused)),
+	                   int row,
+	                   int col __attribute__((unused)),
+	                   GdkEventButton *event __attribute__((unused)),
+	                   jobject peer_obj);
 
 #define CLIST_FROM_SW(obj) (GTK_CLIST(GTK_SCROLLED_WINDOW (obj)->container.child))
 
@@ -50,7 +58,11 @@
 {
   GtkWidget *list, *sw;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   gdk_threads_enter ();
+  
   list = gtk_clist_new (1);
   gtk_widget_show (list);
   sw = gtk_scrolled_window_new (NULL, NULL);
@@ -58,13 +70,14 @@
 				  GTK_POLICY_AUTOMATIC,
 				  GTK_POLICY_AUTOMATIC);
   gtk_container_add (GTK_CONTAINER (sw), list);
+
   gdk_threads_leave ();
 
   NSA_SET_PTR (env, obj, sw);
 }
 
 JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkListPeer_connectHooks
+Java_gnu_java_awt_peer_gtk_GtkListPeer_connectJObject
   (JNIEnv *env, jobject obj)
 {
   void *ptr;
@@ -72,76 +85,61 @@
   ptr = NSA_GET_PTR (env, obj);
 
   gdk_threads_enter ();
+
   gtk_widget_realize (GTK_WIDGET (ptr));
-  connect_selectable_hook (env, obj, CLIST_FROM_SW (ptr));
+
   connect_awt_hook (env, obj, 1, GTK_WIDGET (ptr)->window);
+
   gdk_threads_leave ();
 }
 
 JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkListPeer_append 
-  (JNIEnv *env, jobject obj, jobjectArray items)
+Java_gnu_java_awt_peer_gtk_GtkListPeer_connectSignals
+  (JNIEnv *env, jobject obj)
 {
-  void *ptr;
   GtkCList *list;
-  jint count, i;
+  void *ptr = NSA_GET_PTR (env, obj);
+  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+  g_assert (gref);
 
-  ptr = NSA_GET_PTR (env, obj);
+  gdk_threads_enter ();
 
-  count = (*env)->GetArrayLength (env, items);
+  gtk_widget_realize (GTK_WIDGET (ptr));
 
-  gdk_threads_enter ();
+  /* connect selectable hook */
+  
   list = CLIST_FROM_SW (ptr);
-  for (i = 0; i < count; i++) 
-    {
-      const char *text;
-      jobject item;
 
-      item = (*env)->GetObjectArrayElement (env, items, i);
+  g_signal_connect (G_OBJECT (list), "select_row", 
+		      GTK_SIGNAL_FUNC (item_select), *gref);
 
-      text = (*env)->GetStringUTFChars (env, item, NULL);
-      gtk_clist_append (list, (char **)&text);
-      (*env)->ReleaseStringUTFChars (env, item, text);
-    }
+  g_signal_connect (G_OBJECT (list), "unselect_row", 
+		      GTK_SIGNAL_FUNC (item_unselect), *gref);
+
+  /* Connect the superclass signals.  */
+  /* FIXME: Cannot do that here or it will get the sw and not the list.
+     We must a generic way of doing this. */
+  /* Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, peer_obj); */
+  g_signal_connect (GTK_OBJECT (list), "event", 
+                    G_CALLBACK (pre_event_handler), *gref);
 
-  gtk_clist_columns_autosize (list);
   gdk_threads_leave ();
 }
 
-
 JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkListPeer_old_create
-  (JNIEnv *env, jobject obj, jobject parent_obj,
-   jobjectArray items, jboolean mode)
+Java_gnu_java_awt_peer_gtk_GtkListPeer_append 
+  (JNIEnv *env, jobject obj, jobjectArray items)
 {
-  GtkWidget *list, *sw, *parent;
-  jsize count, i;
+  void *ptr;
+  GtkCList *list;
+  jint count, i;
 
-  parent = NSA_GET_PTR (env, parent_obj);
+  ptr = NSA_GET_PTR (env, obj);
 
   count = (*env)->GetArrayLength (env, items);
 
   gdk_threads_enter ();
-
-  list = gtk_clist_new (1);
-  gtk_widget_show (list);
-
-  sw = gtk_scrolled_window_new (NULL, NULL);
-  set_parent (sw, GTK_CONTAINER (parent));
-  gtk_widget_realize (sw);
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), 
-				  GTK_POLICY_AUTOMATIC,
-				  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (sw), list);
-
-  connect_selectable_hook (env, obj, GTK_CLIST (list));
-  connect_awt_hook (env, obj, 1, list->window);
-
-  gtk_clist_set_selection_mode (GTK_CLIST (list),
-				mode ? GTK_SELECTION_MULTIPLE : 
-				       GTK_SELECTION_SINGLE);
-  
+  list = CLIST_FROM_SW (ptr);
   for (i = 0; i < count; i++) 
     {
       const char *text;
@@ -150,14 +148,12 @@
       item = (*env)->GetObjectArrayElement (env, items, i);
 
       text = (*env)->GetStringUTFChars (env, item, NULL);
-      gtk_clist_append (GTK_CLIST (list), (char **)&text);
+      gtk_clist_append (list, (char **)&text);
       (*env)->ReleaseStringUTFChars (env, item, text);
     }
 
-  gtk_clist_columns_autosize (GTK_CLIST (list));
+  gtk_clist_columns_autosize (list);
   gdk_threads_leave ();
-
-  NSA_SET_PTR (env, obj, sw);
 }
 
 JNIEXPORT void JNICALL
@@ -192,12 +188,14 @@
   list = CLIST_FROM_SW (ptr);
 
   if (end == -1)		/* special case for removing all rows */
-    end = list->rows;
-
-  gtk_clist_freeze (list);
-  for (i = start; i < end; i++)
-    gtk_clist_remove (list, i);
-  gtk_clist_thaw (list);
+    gtk_clist_clear (list);
+  else
+    {
+      gtk_clist_freeze (list);
+      for (i = end; i >= start; i--)
+        gtk_clist_remove (list, i);
+      gtk_clist_thaw (list);
+    }
 
   gdk_threads_leave ();
 }
@@ -324,9 +322,10 @@
 item_select (GtkCList *list __attribute__((unused)),
 	     int row, int col __attribute__((unused)),
 	     GdkEventButton *event __attribute__((unused)), 
-	     jobject *peer_obj)
+	     jobject peer_obj)
 {
-  (*gdk_env)->CallVoidMethod (gdk_env, *peer_obj,
+  //g_print ("select_row\n");
+  (*gdk_env)->CallVoidMethod (gdk_env, peer_obj,
 			      postListItemEventID,
 			      row,
 			      (jint) AWT_ITEM_SELECTED);
@@ -337,25 +336,12 @@
 	       int row,
 	       int col __attribute__((unused)),
 	       GdkEventButton *event __attribute__((unused)),
-	       jobject *peer_obj)
+	       jobject peer_obj)
 {
-  (*gdk_env)->CallVoidMethod (gdk_env, *peer_obj,
+  //g_print ("unselect_row\n");
+  (*gdk_env)->CallVoidMethod (gdk_env, peer_obj,
 			      postListItemEventID,
 			      row,
 	   		      (jint) AWT_ITEM_DESELECTED);
 }
 
-static void
-connect_selectable_hook (JNIEnv *env, jobject peer_obj, GtkCList *list)
-{
-  jobject *obj;
-
-  obj = (jobject *) malloc (sizeof (jobject));
-  *obj = (*env)->NewGlobalRef (env, peer_obj);
-
-  gtk_signal_connect (GTK_OBJECT (list), "select_row", 
-		      GTK_SIGNAL_FUNC (item_select), obj);
-
-  gtk_signal_connect (GTK_OBJECT (list), "unselect_row", 
-		      GTK_SIGNAL_FUNC (item_unselect), obj);
-}
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,v
retrieving revision 1.13
diff -u -r1.13 gnu_java_awt_peer_gtk_GtkMainThread.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c	24 Oct 2003 19:54:24 -0000	1.13
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c	6 Jan 2004 00:36:57 -0000
@@ -42,6 +42,7 @@
 
 #ifdef JVM_SUN
   struct state_table *native_state_table;
+  struct state_table *native_global_ref_table;
 #endif
 
 jmethodID setBoundsCallbackID;
@@ -55,6 +56,7 @@
 jmethodID postFocusEventID;
 jmethodID postAdjustmentEventID;
 jmethodID postItemEventID;
+jmethodID choicePostItemEventID;
 jmethodID postListItemEventID;
 jmethodID postTextEventID;
 jmethodID postWindowEventID;
@@ -79,7 +81,7 @@
   char **argv;
   char *homedir, *rcpath = NULL;
 /*    jclass gtkgenericpeer; */
-  jclass gtkcomponentpeer, gtkwindowpeer, gtkscrollbarpeer, gtklistpeer,
+  jclass gtkcomponentpeer, gtkchoicepeer, gtkwindowpeer, gtkscrollbarpeer, gtklistpeer,
     gtkmenuitempeer, gtktextcomponentpeer, window;
 
   NSA_INIT (env, clazz);
@@ -138,6 +140,8 @@
 
   gtkcomponentpeer = (*env)->FindClass (env,
 				     "gnu/java/awt/peer/gtk/GtkComponentPeer");
+  gtkchoicepeer = (*env)->FindClass (env,
+				     "gnu/java/awt/peer/gtk/GtkChoicePeer");
   gtkwindowpeer = (*env)->FindClass (env,
 				     "gnu/java/awt/peer/gtk/GtkWindowPeer");
   gtkscrollbarpeer = (*env)->FindClass (env, 
@@ -180,6 +184,9 @@
   postItemEventID = (*env)->GetMethodID (env, gtkcomponentpeer,
 					 "postItemEvent", 
 					 "(Ljava/lang/Object;I)V");
+  choicePostItemEventID = (*env)->GetMethodID (env, gtkchoicepeer,
+					 "choicePostItemEvent", 
+					 "(Ljava/lang/String;I)V");
   postListItemEventID = (*env)->GetMethodID (env, gtklistpeer,
 					     "postItemEvent",
 					     "(II)V");
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkMenuBarPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c	22 Jan 2002 22:27:02 -0000	1.3
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c	6 Jan 2004 00:36:57 -0000
@@ -44,9 +44,14 @@
 {
   GtkWidget *widget;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   gdk_threads_enter ();
+  
   widget = gtk_menu_bar_new ();
   gtk_widget_show (widget);
+
   gdk_threads_leave ();
 
   NSA_SET_PTR (env, obj, widget);
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c	8 Oct 2003 16:00:57 -0000	1.4
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c	6 Jan 2004 00:36:57 -0000
@@ -40,26 +40,35 @@
 #include "gnu_java_awt_peer_gtk_GtkMenuItemPeer.h"
 #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h"
 
-static void
-connect_activate_hook (JNIEnv *, jobject, GtkMenuItem *);
+static void item_activate (GtkMenuItem *item __attribute__((unused)),
+                           jobject *peer_obj);
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create
   (JNIEnv *env, jobject obj, jstring label)
 {
   GtkWidget *widget;
   const char *str;
+  jobject *gref;
+
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+  gref = NSA_GET_GLOBAL_REF (env, obj);
 
   str = (*env)->GetStringUTFChars (env, label, NULL);
 
   gdk_threads_enter ();
-
+  
   if (strcmp (str, "-") == 0) /* "-" signals that we need a separator */
     widget = gtk_menu_item_new ();
   else
     widget = gtk_menu_item_new_with_label (str);
 
-  connect_activate_hook (env, obj, GTK_MENU_ITEM (widget));
+  /* Connect activate hook */
+  g_signal_connect (G_OBJECT (widget), "activate", 
+		      GTK_SIGNAL_FUNC (item_activate), *gref);
+
   gtk_widget_show (widget);
+
   gdk_threads_leave ();
 
   (*env)->ReleaseStringUTFChars (env, label, str);
@@ -101,14 +110,3 @@
 			      postMenuActionEventID);
 }
 
-static void
-connect_activate_hook (JNIEnv *env, jobject peer_obj, GtkMenuItem *item)
-{
-  jobject *obj;
-
-  obj = (jobject *) malloc (sizeof (jobject));
-  *obj = (*env)->NewGlobalRef (env, peer_obj);
-
-  gtk_signal_connect (GTK_OBJECT (item), "activate", 
-		      GTK_SIGNAL_FUNC (item_activate), obj);
-}
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkMenuPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c	8 Oct 2003 16:00:57 -0000	1.4
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c	6 Jan 2004 00:36:57 -0000
@@ -66,7 +66,7 @@
       if (GTK_WIDGET_REALIZED (GTK_WIDGET (ptr1)))
 	accel_attach (GTK_MENU_ITEM (ptr1), NULL);
       else
-	gtk_signal_connect (GTK_OBJECT (ptr1),
+	g_signal_connect (G_OBJECT (ptr1),
 			    "realize",
 			    GTK_SIGNAL_FUNC (accel_attach), 
 			    NULL);
@@ -92,9 +92,13 @@
   GtkWidget *menu_title, *menu;
   const char *str;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   str = (*env)->GetStringUTFChars (env, label, NULL);
 
   gdk_threads_enter ();
+  
   menu = gtk_menu_new ();
   
   menu_title = gtk_menu_item_new_with_label (str);
@@ -104,6 +108,7 @@
   gtk_widget_show (menu_title);
 
   NSA_SET_PTR (env, obj, menu_title);
+
   gdk_threads_leave ();
 
   (*env)->ReleaseStringUTFChars (env, label, str);
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,v
retrieving revision 1.5
diff -u -r1.5 gnu_java_awt_peer_gtk_GtkPanelPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c	8 Oct 2003 16:00:58 -0000	1.5
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c	6 Jan 2004 00:36:57 -0000
@@ -37,6 +37,7 @@
 
 
 #include "gtkpeer.h"
+#include "gnu_java_awt_peer_gtk_GtkComponentPeer.h"
 #include "gnu_java_awt_peer_gtk_GtkPanelPeer.h"
 
 JNIEXPORT void JNICALL 
@@ -45,8 +46,13 @@
 {
   gpointer widget;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   gdk_threads_enter ();
+  
   widget = gtk_layout_new (NULL, NULL);
+
   gdk_threads_leave ();
 
   NSA_SET_PTR (env, obj, widget);
@@ -61,7 +67,7 @@
 };
 
 JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectHooks
+Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectJObject
   (JNIEnv *env, jobject obj)
 {
   void *ptr;
@@ -72,11 +78,31 @@
   gtk_widget_realize (GTK_WIDGET (ptr));
   connect_awt_hook (env, obj, 1, GTK_LAYOUT (ptr)->bin_window);
 
-/*    gtk_signal_connect (GTK_OBJECT (ptr), "size_request", GTK_SIGNAL_FUNC (sr), */
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL 
+Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectSignals
+  (JNIEnv *env, jobject obj)
+{
+  void *ptr = NSA_GET_PTR (env, obj);
+  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+  g_assert (gref);
+
+  gdk_threads_enter ();
+  gtk_widget_realize (GTK_WIDGET (ptr));
+
+  /* FIXME: If we don't need this then remove this method. */
+/*    g_signal_connect (G_OBJECT (ptr), "size_request", GTK_SIGNAL_FUNC (sr), */
 /*  		      NULL); */
   gdk_threads_leave ();
+
+  /* Connect the superclass signals.  */
+  Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, obj);
 }
 
+/* FIXME: The following doesn't seem to be used.
+   Is not declared as a native function in GtkPanelPeer.java */
 /*
  * Make a new panel.
  */
@@ -87,19 +113,26 @@
   GtkWidget *layout;
   void *parent;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   parent = NSA_GET_PTR (env, parent_obj);
 
   gdk_threads_enter ();
+
   layout = gtk_layout_new (NULL, NULL);
   
   set_parent (layout, GTK_CONTAINER (parent));
 
   gtk_widget_realize (layout);
+
   connect_awt_hook (env, obj, 1, GTK_LAYOUT (layout)->bin_window);
+
   set_visible (layout, 1);
 
-  NSA_SET_PTR (env, obj, layout);
   gdk_threads_leave ();
+
+  NSA_SET_PTR (env, obj, layout);
 }
 
 
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c	18 Jul 2003 19:56:34 -0000	1.6
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c	6 Jan 2004 00:36:57 -0000
@@ -37,6 +37,7 @@
 
 
 #include "gtkpeer.h"
+#include "gnu_java_awt_peer_gtk_GtkComponentPeer.h"
 #include "gnu_java_awt_peer_gtk_GtkScrollbarPeer.h"
 
 struct range_scrollbar
@@ -107,46 +108,70 @@
   GtkWidget *sb;
   GtkObject *adj;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   gdk_threads_enter ();
+  
   adj = gtk_adjustment_new (value, min, max, 
 			    step_incr, page_incr, 
 			    visible_amount);
 
   sb = (orientation) ? gtk_vscrollbar_new (GTK_ADJUSTMENT (adj)) :
                        gtk_hscrollbar_new (GTK_ADJUSTMENT (adj));
+
   gdk_threads_leave ();
 
   NSA_SET_PTR (env, obj, sb);
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectHooks
+Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectJObject
   (JNIEnv *env, jobject obj)
 {
   void *ptr;
+
+  ptr = NSA_GET_PTR (env, obj);
+
+  gdk_threads_enter ();
+
+  gtk_widget_realize (GTK_WIDGET (ptr));
+
+  connect_awt_hook (env, obj, 1, GTK_SCROLLBAR (ptr)->range);
+
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals
+  (JNIEnv *env, jobject obj)
+{
   struct range_scrollbar *rs;
+  void *ptr = NSA_GET_PTR (env, obj);
+  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+  g_assert (gref);
 
   rs = (struct range_scrollbar *) malloc (sizeof (struct range_scrollbar));
 
-  ptr = NSA_GET_PTR (env, obj);
-
   gdk_threads_enter ();
+
   gtk_widget_realize (GTK_WIDGET (ptr));
 
   rs->range = GTK_RANGE (ptr);
-  rs->scrollbar = (jobject *) malloc (sizeof (jobject));
-  *(rs->scrollbar) = (*env)->NewGlobalRef (env, obj);
-  gtk_signal_connect (GTK_OBJECT (GTK_RANGE (ptr)), 
+  rs->scrollbar = gref;
+
+  g_signal_connect (G_OBJECT (GTK_RANGE (ptr)), 
 		      "move-slider", 
 		      GTK_SIGNAL_FUNC (post_adjustment_event), rs);
 
-  gtk_signal_connect (GTK_OBJECT (GTK_RANGE (ptr)), 
+  g_signal_connect (G_OBJECT (GTK_RANGE (ptr)), 
 		      "value-changed", 
 		      GTK_SIGNAL_FUNC (post_change_event), rs);
 
-
-  connect_awt_hook (env, obj, 1, GTK_SCROLLBAR (ptr)->range);
   gdk_threads_leave ();
+
+  /* Connect the superclass signals.  */
+  Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, obj);
 }
 
 
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,v
retrieving revision 1.5
diff -u -r1.5 gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c	8 Oct 2003 16:00:58 -0000	1.5
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c	6 Jan 2004 00:36:57 -0000
@@ -41,15 +41,22 @@
 
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create 
-  (JNIEnv *env, jobject obj)
+  (JNIEnv *env, jobject obj, int width, int height)
 {
-  gpointer window;
+  GtkWidget *sw;
+
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
 
   gdk_threads_enter ();
-  window = gtk_scrolled_window_new (NULL, NULL);
+  
+  sw = gtk_scrolled_window_new (NULL, NULL);
+
+  gtk_widget_set_size_request (sw, width, height);
+
   gdk_threads_leave ();
 
-  NSA_SET_PTR (env, obj, window);
+  NSA_SET_PTR (env, obj, sw);
 }
 
 JNIEXPORT void JNICALL 
@@ -111,34 +118,25 @@
   gdk_threads_leave ();
 }
 
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_childResized
-  (JNIEnv *env, jobject obj, jint width, jint height)
-{
-  void *ptr;
-
-  ptr = NSA_GET_PTR (env, obj);
-
-  return;
-
-  gdk_threads_enter ();
-  gtk_widget_set_usize (GTK_BIN (ptr)->child, width, height);
-  gdk_threads_leave ();
-}
-
 JNIEXPORT jint JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getHScrollbarHeight
   (JNIEnv *env, jobject obj)
 {
   void *ptr;
   GtkScrolledWindow *sw;
-  jint height;
+  GtkRequisition requisition;
+  jint height = 0;
+  jint spacing = 0;
 
   ptr = NSA_GET_PTR (env, obj);
 
   gdk_threads_enter ();
   sw = GTK_SCROLLED_WINDOW (ptr);
-  height = (sw->hscrollbar_visible) ? sw->hscrollbar->allocation.height : 0;
+
+  gtk_widget_size_request (sw->hscrollbar, &requisition);
+  gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL);
+  height = requisition.height + spacing;
+
   gdk_threads_leave ();
 
   return height;
@@ -150,13 +148,19 @@
 {
   void *ptr;
   GtkScrolledWindow *sw;
-  jint width;
+  GtkRequisition requisition;
+  jint width = 0;
+  jint spacing = 0;
 
   ptr = NSA_GET_PTR (env, obj);
 
   gdk_threads_enter ();
   sw = GTK_SCROLLED_WINDOW (ptr);
-  width = (sw->vscrollbar_visible) ? sw->vscrollbar->allocation.width : 0;
+
+  gtk_widget_size_request (sw->vscrollbar, &requisition);
+  gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL);
+  width = requisition.width + spacing;
+
   gdk_threads_leave ();
 
   return width;
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,v
retrieving revision 1.11
diff -u -r1.11 gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c	2 Dec 2003 01:07:59 -0000	1.11
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c	6 Jan 2004 00:36:57 -0000
@@ -46,8 +46,11 @@
 {
   GtkWidget *text, *sw;
 
-  gdk_threads_enter ();
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
 
+  gdk_threads_enter ();
+  
   text = gtk_text_view_new ();
   gtk_widget_show (text);
 
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,v
retrieving revision 1.10
diff -u -r1.10 gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c	1 Dec 2003 20:19:21 -0000	1.10
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c	6 Jan 2004 00:36:57 -0000
@@ -48,24 +48,29 @@
                                   jobject peer);
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_connectHooks
+Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_connectSignals
   (JNIEnv *env, jobject obj)
 {
-  void *ptr;
   GtkTextView *text = NULL;
   GtkTextBuffer *buf;
-
-  ptr = NSA_GET_PTR (env, obj);
+  void *ptr = NSA_GET_PTR (env, obj);
+  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+  g_assert (gref);
 
   gdk_threads_enter ();
 
   if (GTK_IS_ENTRY(ptr))
     {
       g_signal_connect (GTK_ENTRY (ptr)->im_context, "commit",
-                        G_CALLBACK (textcomponent_commit_cb), obj);
+                        G_CALLBACK (textcomponent_commit_cb), *gref);
 
       g_signal_connect (GTK_EDITABLE (ptr), "changed",
-                        G_CALLBACK (textcomponent_changed_cb), obj);
+                        G_CALLBACK (textcomponent_changed_cb), *gref);
+
+      gdk_threads_leave ();
+
+      /* Connect the superclass signals.  */
+      Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, *gref);
     }
   else
     {
@@ -81,19 +86,24 @@
       if (text)
 	{
           g_signal_connect (text->im_context, "commit",
-                            G_CALLBACK (textcomponent_commit_cb), obj);
+                            G_CALLBACK (textcomponent_commit_cb), *gref);
 
           buf = gtk_text_view_get_buffer (text);
           if (buf)
             g_signal_connect (buf, "changed",
-                              G_CALLBACK (textcomponent_changed_cb), obj);
-	}
-    }
+                              G_CALLBACK (textcomponent_changed_cb), *gref);
 
-  gdk_threads_leave ();
+          /* Connect the superclass signals.  */
+          /* FIXME: Cannot do that here or it will get the sw and not the list.
+             We must a generic way of doing this. */
+          /* Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env,
+	                                                                 obj); */
+          g_signal_connect (GTK_OBJECT (text), "event", 
+                    G_CALLBACK (pre_event_handler), *gref);
 
-  /* Connect the superclass hooks.  */
-  Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks (env, obj);
+          gdk_threads_leave ();
+	}
+    }
 }
 
 JNIEXPORT jint JNICALL 
@@ -101,7 +111,7 @@
   (JNIEnv *env, jobject obj)
 {
   void *ptr;
-  int pos;
+  int pos = 0;
   GtkEditable *editable;    // type of GtkEntry    (TextField)
   GtkWidget *text = NULL;   // type of GtkTextView (TextArea)
   GtkTextBuffer *buf;
@@ -187,7 +197,7 @@
   (JNIEnv *env, jobject obj)
 {
   void *ptr;
-  int pos;
+  int pos = 0;
   GtkEditable *editable;    // type of GtkEntry    (TextField)
   GtkWidget *text = NULL;   // type of GtkTextView (TextArea)
   GtkTextBuffer *buf;
@@ -244,7 +254,7 @@
   (JNIEnv *env, jobject obj)
 {
   void *ptr;
-  int pos;
+  int pos = 0;
   GtkEditable *editable;    // type of GtkEntry    (TextField)
   GtkWidget *text = NULL;   // type of GtkTextView (TextArea)
   GtkTextBuffer *buf;
@@ -384,7 +394,7 @@
   (JNIEnv *env, jobject obj)
 {
   void *ptr;
-  char *contents;
+  char *contents = NULL;
   jstring jcontents;
   GtkEditable *editable;    // type of GtkEntry    (TextField)
   GtkWidget *text = NULL;   // type of GtkTextView (TextArea)
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,v
retrieving revision 1.11
diff -u -r1.11 gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c	8 Oct 2003 23:40:49 -0000	1.11
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c	6 Jan 2004 00:36:57 -0000
@@ -45,8 +45,13 @@
 {
   GtkWidget *widget;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   gdk_threads_enter ();
+  
   widget = gtk_entry_new ();
+
   gdk_threads_leave ();
 
   NSA_SET_PTR (env, obj, widget);
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.14
diff -u -r1.14 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	24 Oct 2003 19:54:24 -0000	1.14
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	6 Jan 2004 00:36:57 -0000
@@ -37,6 +37,7 @@
 
 
 #include "gtkpeer.h"
+#include "gnu_java_awt_peer_gtk_GtkComponentPeer.h"
 #include "gnu_java_awt_peer_gtk_GtkWindowPeer.h"
 #include "gnu_java_awt_peer_gtk_GtkFramePeer.h"
 #include <gdk/gdkprivate.h>
@@ -73,7 +74,11 @@
   void *window_parent;
   GtkWidget *vbox, *layout;
 
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
   gdk_threads_enter ();
+  
   window_widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   window = GTK_WINDOW (window_widget);
 
@@ -116,7 +121,8 @@
   NSA_SET_PTR (env, obj, window_widget);
 }
 
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetVisible
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetVisible
   (JNIEnv *env, jobject obj, jboolean visible)
 {
   void *ptr;
@@ -135,7 +141,8 @@
   gdk_threads_leave ();
 }
 
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectHooks
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectJObject
   (JNIEnv *env, jobject obj)
 {
   void *ptr;
@@ -169,26 +176,44 @@
 
   connect_awt_hook (env, obj, 1, GTK_WIDGET (ptr)->window);
 
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals
+  (JNIEnv *env, jobject obj)
+{
+  void *ptr = NSA_GET_PTR (env, obj);
+  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+  g_assert (gref);
+
+  gdk_threads_enter ();
+
+  gtk_widget_realize (ptr);
+
   /* Connect signals for window event support. */
   g_signal_connect (G_OBJECT (ptr), "delete-event",
-		    G_CALLBACK (window_delete_cb), obj);
+		    G_CALLBACK (window_delete_cb), *gref);
 
   g_signal_connect (G_OBJECT (ptr), "destroy-event",
-		    G_CALLBACK (window_destroy_cb), obj);
+		    G_CALLBACK (window_destroy_cb), *gref);
 
   g_signal_connect (G_OBJECT (ptr), "show",
-		    G_CALLBACK (window_show_cb), obj);
+		    G_CALLBACK (window_show_cb), *gref);
 
   g_signal_connect (G_OBJECT (ptr), "focus-in-event",
-		    G_CALLBACK (window_focus_in_cb), obj);
+		    G_CALLBACK (window_focus_in_cb), *gref);
 
   g_signal_connect (G_OBJECT (ptr), "focus-out-event",
-		    G_CALLBACK (window_focus_out_cb), obj);
+		    G_CALLBACK (window_focus_out_cb), *gref);
 
   g_signal_connect (G_OBJECT (ptr), "window-state-event",
-		    G_CALLBACK (window_window_state_cb), obj);
+		    G_CALLBACK (window_window_state_cb), *gref);
 
   gdk_threads_leave ();
+
+  /* Connect the superclass signals.  */
+  Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, obj);
 }
 
 /*
Index: native/jni/gtk-peer/gtkpeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gtkpeer.h,v
retrieving revision 1.12
diff -u -r1.12 gtkpeer.h
--- native/jni/gtk-peer/gtkpeer.h	24 Oct 2003 19:54:24 -0000	1.12
+++ native/jni/gtk-peer/gtkpeer.h	6 Jan 2004 00:36:57 -0000
@@ -61,9 +61,11 @@
 #ifdef JVM_SUN
 
 extern struct state_table *native_state_table;
+extern struct state_table *native_global_ref_table;
 
 #define NSA_INIT(env, clazz) \
-  native_state_table = init_state_table (env, clazz)
+   do {native_state_table = init_state_table (env, clazz); \
+   native_global_ref_table = init_state_table (env, clazz);} while (0)
 
 #define NSA_GET_PTR(env, obj) \
   get_state (env, obj, native_state_table)
@@ -74,6 +76,21 @@
 #define NSA_DEL_PTR(env, obj) \
   remove_state_slot (env, obj, native_state_table)
 
+#define NSA_GET_GLOBAL_REF(env, obj) \
+  get_state (env, obj, native_global_ref_table)
+
+#define NSA_SET_GLOBAL_REF(env, obj) \
+  do {jobject *globRefPtr; \
+    globRefPtr = (jobject *) malloc (sizeof (jobject)); \
+    *globRefPtr = (*env)->NewGlobalRef (env, obj); \
+    set_state (env, obj, native_global_ref_table, (void *)globRefPtr);} while (0)
+
+#define NSA_DEL_GLOBAL_REF(env, obj) \
+  do {jobject *globRefPtr = get_state (env, obj, native_global_ref_table); \
+    remove_state_slot (env, obj, native_global_ref_table); \
+    (*env)->DeleteGlobalRef (env, *globRefPtr); \
+    free (globRefPtr);} while (0)
+
 #endif /* JVM_SUN */
 
 struct graphics
@@ -378,6 +395,7 @@
 extern jmethodID postKeyEventID;
 extern jmethodID postFocusEventID;
 extern jmethodID postAdjustmentEventID;
+extern jmethodID choicePostItemEventID;
 extern jmethodID postItemEventID;
 extern jmethodID postListItemEventID;
 extern jmethodID postTextEventID;
@@ -392,6 +410,10 @@
 
 void awt_event_handler (GdkEvent *event);
 
+gboolean pre_event_handler (GtkWidget *widget,
+                               GdkEvent *event,
+			       jobject peer);
+
 void connect_awt_hook (JNIEnv *env, jobject peer_obj, int nwindows, ...);
 
 void set_visible (GtkWidget *widget, jboolean visible);
@@ -403,7 +425,7 @@
 struct item_event_hook_info
 {
   jobject peer_obj;
-  jobject item_obj;
+  const char *label;
 };
 
 #endif /* __GTKPEER_H */

--=-yK+6HpzU2be+3rCNh7SB--




From MAILER-DAEMON Mon Jan 05 23:36:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Adiwu-0005DC-LY
	for mharc-classpath@gnu.org; Mon, 05 Jan 2004 23:36:12 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Adith-0004Hx-0r
	for classpath@gnu.org; Mon, 05 Jan 2004 23:32:53 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AditB-00046y-6o
	for classpath@gnu.org; Mon, 05 Jan 2004 23:32:52 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Adisn-0003Z6-AB
	for classpath@gnu.org; Mon, 05 Jan 2004 23:31:57 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id UAA12711;
	Mon, 5 Jan 2004 20:30:13 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 4E8124F8245; Mon,  5 Jan 2004 20:22:21 -0700 (MST)
To: Eric Blake <ebb9@byu.net>
References: <200312261829.21777.konqueror@gmx.de>
	<1072460429.23020.164.camel@elsschot.wildebeest.org>
	<20031226180432.GA6669@mail.konqueror.de>
	<1072558797.844.156.camel@localhost>
	<873cau14yn.fsf@fleche.redhat.com> <3FFA26EF.2090406@byu.net>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: ..I must be a VETERINARIAN..
Date: 05 Jan 2004 20:22:21 -0700
In-Reply-To: <3FFA26EF.2090406@byu.net>
Message-ID: <87brphwyky.fsf@fleche.redhat.com>
Lines: 12
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Mark Wielaard <mark@klomp.org>, Classpath <classpath@gnu.org>
Subject: Re: FYI: Patch: java.awt.image.PixelGrabber
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 04:32:53 -0000

>>>>> "Eric" == Eric Blake <ebb9@byu.net> writes:

Eric> How hard would it be to update the configure/Makefile.am to check that
Eric> the compiler supports assert, and to enable any command-line option
Eric> necessary to turn it on?

It might be a little tricky since at least for jikes we can't assume
that there is another boot class library around to find Object, etc,
in.  We could do it by looking at the "--help" output or something
gross like that though.

Tom



From MAILER-DAEMON Mon Jan 05 23:57:27 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdjHS-0004j7-Rw
	for mharc-classpath@gnu.org; Mon, 05 Jan 2004 23:57:26 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdjDF-000365-Kd
	for classpath@gnu.org; Mon, 05 Jan 2004 23:53:05 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdjCh-0002oP-8u
	for classpath@gnu.org; Mon, 05 Jan 2004 23:53:02 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AdjCg-0002lW-Dl
	for classpath@gnu.org; Mon, 05 Jan 2004 23:52:30 -0500
Received: from [204.127.198.39] (helo=rwcrmhc13.comcast.net)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1Adhb0-0002Tx-UJ
	for classpath@gnu.org; Mon, 05 Jan 2004 22:09:31 -0500
Received: from byu.net (c-24-10-254-137.client.comcast.net[24.10.254.137])
	by comcast.net (rwcrmhc13) with SMTP id <2004010603092201500q8e5le>
	(Authid: ericblake); Tue, 6 Jan 2004 03:09:22 +0000
Message-ID: <3FFA26EF.2090406@byu.net>
Date: Mon, 05 Jan 2004 20:09:35 -0700
From: Eric Blake <ebb9@byu.net>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
	rv:1.4) Gecko/20030624
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: tromey@redhat.com
References: <200312261829.21777.konqueror@gmx.de>
	<1072460429.23020.164.camel@elsschot.wildebeest.org>
	<20031226180432.GA6669@mail.konqueror.de>
	<1072558797.844.156.camel@localhost>
	<873cau14yn.fsf@fleche.redhat.com>
In-Reply-To: <873cau14yn.fsf@fleche.redhat.com>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Mark Wielaard <mark@klomp.org>, Classpath <classpath@gnu.org>
Subject: Re: FYI: Patch: java.awt.image.PixelGrabber
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 04:53:07 -0000

How hard would it be to update the configure/Makefile.am to check that the 
compiler supports assert, and to enable any command-line option necessary to 
turn it on?  Jikes supports assert when the `-source 1.4' flag is used.

Speaking of which, I probably ought to see if I can push out a new version of 
jikes.  And if I do that, I can bump the default source version of jikes to 
support 1.4 out of the box, with prior source versions requiring the 
command-line option.  It has been more than a year since the last official 
release, and I have put in several bug fixes since then (although my coding 
time on jikes, and on classpath, has greatly diminished now that I have 
graduated from school).

Tom Tromey wrote:
>>>>>>"Mark" == Mark Wielaard <mark@klomp.org> writes:
> 
> 
> Mark> Lets keep asserts out of Classpath sources for now since by default not
> Mark> all compilers support it. But I do like to see them in the future if we
> Mark> can actually use them more then in one or two spots.
> 
> Personally I'd like to see us push the envelope a little and allow
> `assert'.
> 
> The lurking issue here is choosing a source language version.  For API
> coverage it is ok to do what we've been doing, namely not pick a
> version and let things float toward the latest release.  This doesn't
> work too well for the source version though.
> 
> This is going to bite us big time when generics are introduced.
> 
> Tom
-- 
Someday, I might put a cute statement here.

Eric Blake             ebb9@byu.net




From MAILER-DAEMON Tue Jan 06 11:50:26 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AduPR-0000XY-Qq
	for mharc-classpath@gnu.org; Tue, 06 Jan 2004 11:50:25 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AduPO-0000Vg-He
	for classpath@gnu.org; Tue, 06 Jan 2004 11:50:22 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AduOr-0000Kq-DH
	for classpath@gnu.org; Tue, 06 Jan 2004 11:50:20 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AduNJ-0008Kk-P0
	for classpath@gnu.org; Tue, 06 Jan 2004 11:48:13 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 833EB62208; Tue,  6 Jan 2004 15:46:33 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 30508-01; Tue,  6 Jan 2004 15:46:29 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-70-168.adsl.solnet.ch
	[212.41.70.168]) by mail01.solnet.ch (Postfix) with ESMTP
	id 126C1622E7; Tue,  6 Jan 2004 15:46:11 +0000 (GMT)
Received: from pcprr.elca.ch (reali.dnsalias.net [192.168.1.2])
	by reali.dnsalias.net (Postfix) with ESMTP
	id 4945139879; Tue,  6 Jan 2004 16:35:32 +0100 (CET)
Date: Tue, 06 Jan 2004 16:46:08 +0100
From: Patrik Reali <reali@acm.org>
To: Robert Lougher <robert_lougher@hotmail.com>, classpath@gnu.org
Message-ID: <93292507.1073407567@[10.40.10.54]>
In-Reply-To: <BAY10-F100hejFlxDqj0003179d@hotmail.com>
References: <BAY10-F100hejFlxDqj0003179d@hotmail.com>
X-Mailer: Mulberry/3.1.0 (Win32 Demo)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
X-Virus-Scanned: by SolNet
Cc: 
Subject: RE: Java Runtime Matrix for UserLinux
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 16:50:23 -0000

Hi Robert,

if you can submit me a small paragraph describing JamVM, I'll add it to the 
link list on the Classpath site.

-Patrik

--On Montag, 5. Januar 2004 05:30 +0000 Robert Lougher 
<robert_lougher@hotmail.com> wrote:

> Hi,
>
> Sorry for the empty post - first day back into work tomorrow :)  What I
> meant to say:
>
> Any reasons for missing out JamVM (http::/jamvm.sourceforge.net)?  It's
> been using Classpath since 1.0.0 (12-Mar-2003).  Quite a few people are
> using it successfully, and I think a number of people on this list have
> given it a test.
>
> Thanks,
>
> Rob.
>
> ----Original Message Follows----
> From: Dalibor Topic <robilad@kaffe.org>
> To: GNU Classpath <classpath@gnu.org>
> Subject: Java Runtime Matrix for UserLinux
> Date: Sun, 04 Jan 2004 20:40:28 +0100
>
> Hi all,
>
> I've started a java runtime matrix in the UserLinux wiki, that will serve
> as the foundation for their decision which runtime to pick. So if you
> feel like having your runtime as the default java runtime in UserLinux,
> please consider filling in the blanks for your project. If you don't
> please remove it from the matrix.
>
> You can find the matrix here:
> http://cgi.userlinux.com/cgi-bin/wiki.pl?Java_Runtime_Matrix
>
> cheers,
> dalibor topic
>
>
>
> _______________________________________________
> Classpath mailing list
> Classpath@gnu.org
> http://mail.gnu.org/mailman/listinfo/classpath
>
> _________________________________________________________________
> Express yourself with cool new emoticons
> http://www.msn.co.uk/specials/myemo
>
>
>
> _______________________________________________
> Classpath mailing list
> Classpath@gnu.org
> http://mail.gnu.org/mailman/listinfo/classpath
>



------------------------
Patrik Reali
http://www.reali.ch/~patrik/




From MAILER-DAEMON Tue Jan 06 16:09:55 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdySY-0005Dy-OD
	for mharc-classpath@gnu.org; Tue, 06 Jan 2004 16:09:54 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdyRQ-0004YA-8L
	for classpath@gnu.org; Tue, 06 Jan 2004 16:08:44 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdyQe-00042a-Sb
	for classpath@gnu.org; Tue, 06 Jan 2004 16:08:19 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdyQd-0003zY-Cb
	for classpath@gnu.org; Tue, 06 Jan 2004 16:07:55 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i06K6Ki03311;
	Tue, 6 Jan 2004 15:06:20 -0500
Received: from redhat.com (sebastian-int.corp.redhat.com [172.16.52.221])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i06K6JE14887; 
	Tue, 6 Jan 2004 15:06:19 -0500
Message-ID: <3FFB1521.1060302@redhat.com>
Date: Tue, 06 Jan 2004 15:05:53 -0500
From: graydon hoare <graydon@redhat.com>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.5) Gecko/20031115 Thunderbird/0.3
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: java-patches@gcc.gnu.org
Content-Type: multipart/mixed; boundary="------------040405000906080209090209"
Cc: classpath@gnu.org
Subject: [PATCH] fixes to swing button implementation
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 21:09:51 -0000

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

hi,

this patch implements JButton as near as I can tell "correctly" -- that 
is, moving full responsibility for event handling and painting into the 
plaf, teaching the model about properties and listeners, delegating 
state from the component to the model, following the spec for state 
transitions in the model, etc. it also includes some small changes to 
rendering the button.

ok to commit?

-graydon

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

	* javax/swing/AbstractButton.java: Re-implement most of class.
	* javax/swing/DefaultButtonModel.java: Likewise.
	* javax/swing/BasicButtonUI.java: Likewise.
	* javax/swing/plaf/basic/BasicGraphicsUtils.java (getPreferredButtonSize):
	Incorporate margins into button size.

--------------040405000906080209090209
Content-Type: text/plain;
 name="j2d-swing-button.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="j2d-swing-button.patch"

Index: javax/swing/AbstractButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractButton.java,v
retrieving revision 1.3
diff -u -b -w -r1.3 AbstractButton.java
--- javax/swing/AbstractButton.java	14 Jul 2003 05:33:30 -0000	1.3
+++ javax/swing/AbstractButton.java	6 Jan 2004 20:04:32 -0000
@@ -38,6 +38,8 @@
 
 package javax.swing;
 
+import java.awt.AWTEventMulticaster;
+import java.awt.AWTEvent;
 import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.Insets;
@@ -62,12 +64,16 @@
 import javax.swing.event.ChangeListener;
 import javax.swing.plaf.ButtonUI;
 import javax.swing.text.AttributeSet;
+import java.util.Vector;
+import java.io.Serializable;
 
 /**
  * Provides basic button functionality
  *
  * @author Ronald Veldema (rveldema@cs.vu.nl)
+ * @author Graydon Hoare (graydon@redhat.com)
  */
+
 public abstract class AbstractButton extends JComponent
   implements ItemSelectable, SwingConstants
 {
@@ -85,7 +91,31 @@
   ButtonModel model;
   Insets margin;
 
+  ActionListener actionListener;
+  ItemListener itemListener;
+  
+  // ChangeEvents are not AWTEvents, can't use multicaster
+  Vector changeListeners = new Vector ();
+
+  public static final String BORDER_PAINTED_CHANGED_PROPERTY = "borderPainted";
+  public static final String CONTENT_AREA_FILLED_CHANGED_PROPERTY = "contentAreaFilled";
+  public static final String DISABLED_ICON_CHANGED_PROPERTY = "disabledIcon";
+  public static final String DISABLED_SELECTED_ICON_CHANGED_PROPERTY = "disabledSelectedIcon";
   public static final String FOCUS_PAINTED_CHANGED_PROPERTY = "focusPainted";
+  public static final String HORIZONTAL_ALIGNMENT_CHANGED_PROPERTY = "horizontalAlignment";
+  public static final String HORIZONTAL_TEXT_POSITION_CHANGED_PROPERTY = "horizontalTextPosition";
+  public static final String ICON_CHANGED_PROPERTY = "icon";
+  public static final String MARGIN_CHANGED_PROPERTY = "margin";
+  public static final String MNEMONIC_CHANGED_PROPERTY = "mnemonic";
+  public static final String MODEL_CHANGED_PROPERTY = "model";
+  public static final String PRESSED_ICON_CHANGED_PROPERTY = "pressedIcon";
+  public static final String ROLLOVER_ENABLED_CHANGED_PROPERTY = "rolloverEnabled";
+  public static final String ROLLOVER_ICON_CHANGED_PROPERTY = "rolloverIcon";
+  public static final String ROLLOVER_SELECTED_ICON_CHANGED_PROPERTY = "rolloverSelectedIcon";
+  public static final String SELECTED_ICON_CHANGED_PROPERTY = "selectedIcon";
+  public static final String TEXT_CHANGED_PROPERTY = "text";
+  public static final String VERTICAL_ALIGNMENT_CHANGED_PROPERTY = "verticalAlignment";
+  public static final String VERTICAL_TEXT_POSITION_CHANGED_PROPERTY = "verticalTextPosition";
 
   /**
    * AccessibleAbstractButton
@@ -340,7 +370,6 @@
     {
       c.getModel().setArmed(false);
 
-      System.out.println("LOST FOCUS");
       if (c.isFocusPainted())
         {
           c.repaint();
@@ -348,7 +377,6 @@
     }
     public void focusGained(FocusEvent event)
     {
-      System.out.println("GAIN FOCUS");
     }
   }
 
@@ -369,6 +397,9 @@
     addFocusListener( new JFocusListener(this) );
 
     setModel(new DefaultButtonModel(this));
+    model.addActionListener (new ButtonActionListener ());
+    model.addChangeListener (new ButtonChangeListener ());
+    model.addItemListener (new ButtonItemListener ());
 
     updateUI(); // get a proper ui
   }
@@ -386,156 +417,295 @@
   {   getModel().setActionCommand(aCommand);   }
 
   public void addActionListener(ActionListener l)
-  {	getModel().addActionListener(l);    }
+    {	
+	actionListener = AWTEventMulticaster.add (actionListener, l);
+	if (actionListener != null)
+	    enableEvents (AWTEvent.ACTION_EVENT_MASK);
+    }   
 
   public void removeActionListener(ActionListener l)
-  {	getModel().removeActionListener(l);    }
-
-  public void addChangeListener(ChangeListener l)
-  {   getModel().addChangeListener(l);     }
-
-  public void removeChangeListener(ChangeListener l)
-  {  getModel().removeChangeListener(l);    }
+    {	
+	actionListener = AWTEventMulticaster.remove (actionListener, l);
+    }
 
   public void addItemListener(ItemListener l)
-  {  getModel().addItemListener(l);    }
+    {  
+	itemListener = AWTEventMulticaster.add (itemListener, l);
+	if (itemListener != null)
+	    enableEvents (AWTEvent.ITEM_EVENT_MASK);
+    }
 
   public void removeItemListener(ItemListener l)
-  {  getModel().removeItemListener(l);  }
+    {
+	itemListener = AWTEventMulticaster.remove (itemListener, l);
+    }
 
-  public int getHorizontalAlignment()
-  {	return hori_align;    }
+    public void addChangeListener (ChangeListener l)
+    {   
+	changeListeners.addElement (l);
+    }
 
-  public int getHorizontalTextPosition()
-  {	return hori_text_pos;    }
+    public void removeChangeListener (ChangeListener l)
+    {  
+	changeListeners.removeElement (l);
+    }
 
-  public int getVerticalAlignment()
-  {	return vert_align;   }
+    public void fireItemStateChanged (ItemEvent e)
+    {
+	itemListener.itemStateChanged (e);
+    }
 
-  public int getVerticalTextPosition()
-  {	return vert_text_pos;  }
+    public void fireActionPerformed (ActionEvent e)
+    {
+	actionListener.actionPerformed (e);
+    }
 
-  protected  void fireItemStateChanged(ItemEvent event)
+    public void fireStateChanged (ChangeEvent event)
   {
+	for (int i=0; i < changeListeners.size(); i++)
+	    {
+		ChangeListener cl = (ChangeListener) changeListeners.get (i);
+		cl.stateChanged (event);
+	    }
   }
   
-  protected  void fireStateChanged(ChangeEvent event)
+    protected void stateChanged()
   {
+	fireStateChanged (new ChangeEvent (this));
+	revalidate ();
+	repaint ();
   }
   
-  protected void fireActionPerformed(ActionEvent event)
+    /*
+     * inner classes used to subscribe to events generated by our model
+     */
+
+    private class ButtonChangeListener 
+	implements ChangeListener, Serializable
+    {
+	public void stateChanged (ChangeEvent e)
   {
+	    AbstractButton.this.fireStateChanged (e);
+	    AbstractButton.this.revalidate ();
+	    AbstractButton.this.repaint ();
+	}
   }
 
-  public void setVerticalAlignment(int alignment)
-  {	vert_align = alignment;    }
+    private class ButtonActionListener
+	implements ActionListener, Serializable
+    {
+	public void actionPerformed(ActionEvent e)
+	{
+	    AbstractButton.this.fireActionPerformed (e);
+	}	
+    }
 
-  public void setHorizontalAlignment(int alignment)
-  {   hori_align = alignment;   }
+    private class ButtonItemListener
+	implements ItemListener, Serializable
+    {
+	public void itemStateChanged (ItemEvent e)
+	{
+	    AbstractButton.this.fireItemStateChanged (e);
+	}
+    }
 
-  public void setVerticalTextPosition(int textPosition)
-  {	vert_text_pos = textPosition;    }
 
-  public void setHorizontalTextPosition(int textPosition)
-  {   hori_text_pos = textPosition;   }
+    /* 
+     * delegated properties
+     */
 
   public int getMnemonic()
-  {	return getModel().getMnemonic();    }
+    {
+	return getModel ().getMnemonic ();
+    }
 
   public void setMnemonic(char mne)
-  {	getModel().setMnemonic(mne);    }
+    {
+	int old = getModel ().getMnemonic ();
+	getModel ().setMnemonic (mne);
+	firePropertyChange (MNEMONIC_CHANGED_PROPERTY, old, (int) mne);
+    }
 
   public void setMnemonic(int mne)
-  {	getModel().setMnemonic(mne);    }
+    {
+	int old = mne;
+	getModel ().setMnemonic (mne);
+	firePropertyChange (MNEMONIC_CHANGED_PROPERTY, old, mne);
+    }
 
-  public void setRolloverEnabled(boolean b)
-  {    getModel().setRollover(b);    }
+    public void setRolloverEnabled (boolean r)
+    {
+	boolean old = getModel ().isRollover ();
+	getModel ().setRollover (r);
+	firePropertyChange (ROLLOVER_ENABLED_CHANGED_PROPERTY, old, r);
+    }
 
   public boolean isRolloverEnabled()
-  {    return getModel().isRollover();     }
+    {
+	return getModel ().isRollover ();
+    }
 
-  public boolean isBorderPainted()
-  {	return paint_border;    }
+    public void setSelected(boolean s)
+    {
+	getModel ().setSelected (s);
+    }
 
-  public void setBorderPainted(boolean b)
+    public boolean isSelected()
   {
-    if (b != paint_border)
+	return getModel ().isSelected ();
+    }
+
+    public void setEnabled (boolean b)
       {
-        paint_border = b;
+	super.setEnabled (b);
+	getModel ().setEnabled (b);
+    }
+
+
+
+    /*
+     * intrinsic properties
+     */
+
+
+    public int getHorizontalAlignment ()
+    {	
+	return hori_align;
+    }
+
+    public void setHorizontalAlignment (int a)
+    {
+	int old = hori_align;
+	hori_align = a;
+	firePropertyChange (HORIZONTAL_ALIGNMENT_CHANGED_PROPERTY, old, a);
         revalidate();
         repaint();
       }
+
+    public int getHorizontalTextPosition ()
+    {	
+	return hori_text_pos;
   }
 
-  public Action getAction()
-  {	return action_taken;    }
+    public void setHorizontalTextPosition (int t)
+    {
+	int old = hori_text_pos;
+	hori_text_pos = t;
+	firePropertyChange (HORIZONTAL_TEXT_POSITION_CHANGED_PROPERTY, old, t);
+	revalidate ();
+	repaint ();			
+    }
 
-  public void setAction(Action a)
+    public int getVerticalAlignment ()
   {
-    action_taken = a;
+	return vert_align;
+    }
+
+    public void setVerticalAlignment (int a)
+    {
+	int old = vert_align;
+	vert_align = a;
+	firePropertyChange (VERTICAL_ALIGNMENT_CHANGED_PROPERTY, old, a);
     revalidate();
     repaint();
   }
 
-  public void setSelected(boolean b)
-  {	getModel().setSelected(b);    }
+    public int getVerticalTextPosition ()
+    {
+	return vert_text_pos;
+    }
 
-  public boolean isSelected()
-  {	return getModel().isSelected();     }
+    public void setVerticalTextPosition (int t)
+    {
+	int old = vert_text_pos;
+	vert_text_pos = t;
+	firePropertyChange (VERTICAL_TEXT_POSITION_CHANGED_PROPERTY, old, t);
+	revalidate ();
+	repaint ();			
+    }
 
-  public Icon getIcon()
-  {	return default_icon;    }
 
-  public void setIcon(Icon defaultIcon)
+    public boolean isBorderPainted ()
   {
-    if (default_icon == defaultIcon)
-      return;
+	return paint_border;
+    }
 
-    default_icon = defaultIcon;
-    if (default_icon != null)
+    public void setBorderPainted (boolean b)
       {
-        // XXX FIXME - icons do not know their parent
-        //  			default_icon.setParent(this);
+	boolean old = paint_border;
+	paint_border = b;
+	firePropertyChange (ROLLOVER_ENABLED_CHANGED_PROPERTY, old, b);
+	revalidate ();
+	repaint ();
       }
+
+    public Action getAction ()
+    {
+	return action_taken;
+    }
+
+    public void setAction (Action a)
+    {
+	action_taken = a;
+    }
+
+    public Icon getIcon()
+    {
+	return default_icon;
+    }
+
+    public void setIcon(Icon i)
+    {
+	Icon old = default_icon;
+	default_icon = i;
+	firePropertyChange (ICON_CHANGED_PROPERTY, old, i);
     revalidate();
     repaint();
   }
 
   public String getText()
-  {	return text;    }
+    {
+	return text;
+    }
 
   public void setLabel(String label)
-  {	setText(label);    }
+    {
+	setText (label);
+    }
 
   public String getLabel()
-  {	return getText();    }
+    {
+	return getText ();
+    }
 
-  public void setText(String text)
+    public void setText (String t)
   {
-    this.text = text;
+	String old = text;
+	text = t;
+	firePropertyChange (TEXT_CHANGED_PROPERTY, old, t);
     revalidate();
     repaint();
   }
 
   public 	Insets getMargin()
-  {      return margin; }
+    {
+	return margin; 
+    }
 
   public void setMargin(Insets m)
   {
+	Insets old = margin;
     margin = m;
+	firePropertyChange (MARGIN_CHANGED_PROPERTY, old, m);
     revalidate();
     repaint();
   }
 
-  public void setEnabled(boolean b)
-  {
-    super.setEnabled(b);
-    getModel().setEnabled(b);
-    repaint();
-  }
 
   public Icon getPressedIcon()
-  {	return pressed_button;    }
+    {
+	return pressed_button;
+    }
 
   public void setPressedIcon(Icon pressedIcon)
   {
@@ -545,7 +715,9 @@
   }
 
   public Icon getDisabledIcon()
-  {	return disabled_button;    }
+    {
+	return disabled_button;
+    }
 
   public void setDisabledIcon(Icon disabledIcon)
   {
@@ -555,16 +727,17 @@
   }
 
   public boolean isFocusPainted()
-  {   return paint_focus;   }
+    {
+	return paint_focus;
+    }
 
   public void setFocusPainted(boolean b)
   {
     boolean old = paint_focus;
     paint_focus = b;
 
-    firePropertyChange(FOCUS_PAINTED_CHANGED_PROPERTY,
-                       old,
-                       b);
+	firePropertyChange (FOCUS_PAINTED_CHANGED_PROPERTY, old, b);
+
     if (hasFocus())
       {
         revalidate();
@@ -572,6 +745,7 @@
       }
   }
 
+
   public boolean isFocusTraversable()
   {
     //Identifies whether or not this component can receive the focus.
@@ -738,64 +912,4 @@
     }
     */
   }
-
-  protected void processActionEvent(ActionEvent e)
-  {
-    System.out.println("PROCESS-ACTION-EVENT: " + e);
-  }
-
-  protected void processMouseEvent(MouseEvent e)
-  {
-    //	System.out.println("PROCESS-MOUSE-EVENT: " + e + ", PRESSED-IN-MODEL="+getModel().isPressed());
-
-    switch (e.getID())
-      {
-      case MouseEvent.MOUSE_MOVED:
-        {
-          break;
-        }
-      case MouseEvent.MOUSE_PRESSED:
-        {
-          if (! isEnabled())
-            {
-              System.out.println("button not enabled, ignoring press");
-            }
-          else
-            {
-              System.out.println("telling model:press: " + getModel());
-              getModel().setPressed(true);
-              repaint();
-            }
-          break;
-        }
-
-      case MouseEvent.MOUSE_RELEASED:
-        {
-          if (! isEnabled())
-            {
-              System.out.println("button not enabled, ignoring release");
-            }
-          else
-            {
-              int flags = 0;
-
-              System.out.println("        XXX--> " + getActionCommand());
-
-              fireActionPerformed(new ActionEvent(this,
-                                                  ActionEvent.ACTION_PERFORMED,
-                                                  getActionCommand(),
-                                                  flags));
-
-              //System.out.println("telling model:release");
-              getModel().setPressed(false);
-              repaint();
-            }
-          break;
-        }
-      case MouseEvent.MOUSE_CLICKED:
-        {
-          break;
-        }
-      }
-  }
 }
Index: javax/swing/DefaultButtonModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultButtonModel.java,v
retrieving revision 1.3
diff -u -b -w -r1.3 DefaultButtonModel.java
--- javax/swing/DefaultButtonModel.java	11 Jun 2003 13:20:39 -0000	1.3
+++ javax/swing/DefaultButtonModel.java	6 Jan 2004 20:04:32 -0000
@@ -38,6 +38,8 @@
 
 package javax.swing;
 
+import java.awt.AWTEvent;
+import java.awt.AWTEventMulticaster;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
@@ -54,125 +56,227 @@
 {
   static final long serialVersionUID = -5342609566534980231L;
 
-    Vector actions          = new Vector();
 
-    Vector items    = new Vector();
-    Vector changes  = new Vector();
+    ActionListener actionListener;
+    ItemListener itemListener;
+
+    // ChangeEvents are not AWTEvents
+    Vector changeListeners = new Vector ();
+
     ButtonGroup group;
     JComponent comp;
 
+    boolean armed = false;
+    boolean enabled = true;
+    boolean pressed = false;
+    boolean rolledOver = false;
+    boolean selected = false;
+    int mnemonic;  
+    String actionCommand;
     
     DefaultButtonModel(JComponent a)
     {
 	comp = a;
     }
 
-
     public Object[] getSelectedObjects()
     {
 	return null;
     }
 
 
-    public void fireItemStateChanged(ItemEvent event)
+    /* 
+     * event listener and firing methods
+     */
+
+    public void addActionListener (ActionListener l)
+    {	
+	actionListener = AWTEventMulticaster.add (actionListener, l);
+    }   
+    
+    public void removeActionListener (ActionListener l)
+    {	
+	actionListener = AWTEventMulticaster.remove (actionListener, l);
+    }
+    
+    public void addItemListener (ItemListener l)
+    {  
+	itemListener = AWTEventMulticaster.add (itemListener, l);
+    }
+
+    public void removeItemListener (ItemListener l)
     {
-	for (int i=0;i<items.size();i++)
+	itemListener = AWTEventMulticaster.remove (itemListener, l);
+    }
+
+    public void addChangeListener (ChangeListener l)
 	    {
-		ItemListener a = (ItemListener) items.get(i);
-		a.itemStateChanged(event);
+	changeListeners.addElement (l);
 	    }
+    
+    public void removeChangeListener (ChangeListener l)
+    {  
+	changeListeners.removeElement (l);
     }
+
+    public void fireItemStateChanged (ItemEvent e)
+    {
+	itemListener.itemStateChanged (e);
+    }
+
+    public void fireActionPerformed (ActionEvent e)
+    {
+	actionListener.actionPerformed (e);
+    }
+
     public void fireStateChanged(ChangeEvent event)
     {
-	for (int i=0;i<changes.size();i++)
+	for (int i=0; i < changeListeners.size(); i++)
 	    {
-		ChangeListener a = (ChangeListener) changes.get(i);
-		a.stateChanged(event);
+		ChangeListener cl = (ChangeListener) changeListeners.get (i);
+		cl.stateChanged (event);
 	    }
     }
-    public void fireActionPerformed(ActionEvent event)
+
+    protected void stateChanged()
     {
-	for (int i=0;i<actions.size();i++)
+	fireStateChanged (new ChangeEvent (this));
+    }
+    
+
+    /* 
+     * property accessors
+     */
+
+    public boolean isArmed() 
+    { 
+	return armed; 
+    }
+
+    public void setArmed(boolean a)
+    { 
+	if (armed != a)
 	    {
-		ActionListener a = (ActionListener) actions.get(i);
-		a.actionPerformed(event);
+		armed = a; 
+		stateChanged ();
 	    }
     }
 
-    boolean arm;
-    public boolean isArmed()          { return arm; }
-    public void setArmed(boolean b)   { arm = b; }
+    public boolean isEnabled()
+    {
+	return enabled; 
+    }
 
-    boolean enabled = true;
-    public boolean isEnabled()         { return enabled; }
-    public void setEnabled(boolean b)  { enabled = b; }
+    public void setEnabled (boolean e)
+    {
+	if (enabled != e)
+	    {
+		enabled = e; 
+		stateChanged ();
+	    }
+    }
 
-    boolean pressed;
-    public void setPressed(boolean b)  
+    public void setPressed (boolean p)  
     {
-	pressed = b; 
+	if (p != pressed)
+	    {
+		pressed = p;
+		stateChanged ();
     }
-    public boolean isPressed()         { return pressed; }
 
+	if (enabled && armed && !pressed)
+	    {
+		int flags = 0;
+		fireActionPerformed (new ActionEvent(this,
+						     ActionEvent.ACTION_PERFORMED,
+						     getActionCommand(), flags));
+	    }
+    }
 
-    public void removeActionListener(ActionListener l) { actions.removeElement(l); }
-    public void addActionListener(ActionListener l)    
+    public boolean isPressed ()
     {	
-	//	comp.enableEvents( AWTEvent.ACTION_EVENT_MASK );
-	actions.addElement(l);    
+	return pressed;
     }
 
-    public void addItemListener(ItemListener l)        { items.addElement(l); }
-    public void removeItemListener(ItemListener l)     { items.removeElement(l); }
+    public void setRollover (boolean r)
+    {
+	if (rolledOver != r)
+	    {
+		rolledOver = r; 
+		stateChanged ();
+	    }
+    }
 
-    public void addChangeListener(ChangeListener l)    { changes.addElement(l); }
-    public void removeChangeListener(ChangeListener l) { changes.removeElement(l); }
+    public boolean isRollover () 
+    { 
+	return rolledOver;
+    }
 
-    boolean roll;
-    public void setRollover(boolean b) { roll = b; }
-    public boolean isRollover()        { return roll; }
+    public int getMnemonic ()
+    {
+	return mnemonic;
+    }
 
-    int mne;  
-    public int  getMnemonic()        { return mne; }
-    public void setMnemonic(int key) { mne = key; }
+    public void setMnemonic (int key)
+    {
+	if (mnemonic != key)
+	    {
+		mnemonic = key;
+		stateChanged ();
+	    }
+    }
 
-    String com;
-    public void setActionCommand(String s) { com = s; }
-    public String getActionCommand()       { return com; }
+    public void setActionCommand (String s)
+    {
+	if (actionCommand != s)
+	    {
+		actionCommand = s;
+		stateChanged ();
+	    }
+    }
+
+    public String getActionCommand ()
+    { 
+	return actionCommand; 
+    }
 
-    public void setGroup(ButtonGroup group)
+    public void setGroup (ButtonGroup g)
+    {
+	if (group != g)
     {
-	this.group = group;
+		group = g;
+		stateChanged ();
+	    }
     }
 
-    boolean sel;
-    public void setSelected(boolean b) 
+    public void setSelected(boolean s) 
     { 
 	if (group != null)
 	    {
-		if (b == true)
+		if (s == true)
 		    {
-			System.out.println("selected button in group:"+this);
-			group.setSelected(this, b);
-			sel = true;
+			group.setSelected(this, s);
+			selected = true;
+			stateChanged ();
 		    }
 		else
 		    {
-			System.out.println("deselected button in group: " + this);
-			sel = false;
+			selected = false;
+			stateChanged ();
 		    }
 	    } 
 	else
 	    {
-		sel = b;
+		if (selected != s)
+		    {
+			selected = s;
+			stateChanged ();
 	    }
     }
-    public boolean isSelected()        { return sel; }
 }
 
-
-
-
-
-
-
+    public boolean isSelected ()
+    {
+	return selected;
+    }
+}
Index: javax/swing/plaf/basic/BasicButtonUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicButtonUI.java,v
retrieving revision 1.3
diff -u -b -w -r1.3 BasicButtonUI.java
--- javax/swing/plaf/basic/BasicButtonUI.java	19 Jun 2003 10:48:46 -0000	1.3
+++ javax/swing/plaf/basic/BasicButtonUI.java	6 Jan 2004 20:04:32 -0000
@@ -41,6 +41,7 @@
 import javax.swing.*;
 import javax.swing.plaf.*;
 import java.awt.*;
+import java.awt.event.*;
 
 
 public class BasicButtonUI extends ButtonUI
@@ -52,13 +53,68 @@
     Color pressedBackgroundColor;
     Color normalBackgroundColor;
 
-
     public static ComponentUI createUI(final JComponent c) 
     {
 	return new BasicButtonUI();
     }
 
     
+    static private class FocusUIListener extends FocusAdapter
+    {
+	AbstractButton button;
+
+	FocusUIListener (AbstractButton b)
+	{
+	    button = b;
+	}
+	
+	public void focusLost(FocusEvent event)
+	{
+	    button.getModel ().setArmed (false);
+	}
+    }
+
+    static private class ButtonUIListener extends MouseAdapter
+    {
+	AbstractButton button;
+
+	public ButtonUIListener (AbstractButton b)
+	{
+	    button = b;
+	}
+
+	public void mousePressed (MouseEvent e) 
+	{
+	    if ((e.getModifiers () & InputEvent.BUTTON1_MASK) != 0)
+		{
+		    button.getModel ().setPressed (true);
+		    button.getModel ().setArmed (true);
+		}
+	}
+
+	public void mouseEntered (MouseEvent e) 
+	{
+	    if ((e.getModifiers () & InputEvent.BUTTON1_MASK) != 0)
+		{
+		    button.getModel ().setPressed (true);
+		}
+	}
+
+	public void mouseExited (MouseEvent e) 
+	{
+	    button.getModel ().setArmed (false);
+	}
+
+	public void mouseReleased (MouseEvent e) 
+	{
+	    if ((e.getModifiers () & InputEvent.BUTTON1_MASK) != 0)
+		{
+		    button.getModel ().setPressed (false);
+		    button.getModel ().setArmed (false);
+		}
+	}		
+    }
+    
     public void installUI(final JComponent c) 
     {
 	super.installUI(c);
@@ -68,6 +124,12 @@
 	pressedBackgroundColor   = new Color(150,150,150);
 	pressedBackgroundColor   = new Color(150,150,150);
 	normalBackgroundColor    = new Color(192,192,192);
+
+	// this tells the border (if we have one) how to paint.
+	c.setBackground (normalBackgroundColor);
+
+	c.addMouseListener (new ButtonUIListener ((AbstractButton) c));
+	c.addFocusListener (new FocusUIListener ((AbstractButton) c));
     }
     
 
@@ -87,6 +149,7 @@
 	Rectangle tr = new Rectangle();
 	Rectangle ir = new Rectangle();
 	Rectangle vr = new Rectangle();
+	Rectangle br = new Rectangle();
 
         Font f = c.getFont();
 
@@ -94,14 +157,20 @@
 
         FontMetrics fm = g.getFontMetrics(f);
 
-        Insets i = c.getInsets();
+	Insets border = b.getInsets();
+	Insets margin = b.getMargin();
 
-        vr.x      = i.left;
-        vr.y      = i.top;
-        vr.width  = b.getWidth()  - (i.right  + vr.x);
-        vr.height = b.getHeight() - (i.bottom + vr.y);
+	br.x      = border.left;
+	br.y      = border.top;
+	br.width  = b.getWidth() - (border.right + border.left);
+	br.height = b.getHeight() - (border.top + border.bottom);
+
+        vr.x      = br.x + margin.left;
+        vr.y      = br.y + margin.top;
+        vr.width  = br.width  - (margin.right + margin.left);
+        vr.height = br.height - (margin.top + margin.bottom);
 	
-	//System.out.println("             VIEW-RECT-BUTTON="+vr+", insets="+i+", FONTM="+fm);
+	// System.out.println("             VIEW-RECT-BUTTON="+vr+", insets="+border+" margin="+margin+", FONTM="+fm);
 	
 	String text = SwingUtilities.layoutCompoundLabel(c,
 							 fm, 
@@ -116,17 +185,11 @@
 							 tr,
 							 gap);
 
-        if (b.getModel().isPressed() ||
+        if (b.getModel().isArmed () ||
 	    b.getModel().isSelected())
-	    {
-	      //System.out.println("paint pressed");
-		paintButtonPressed(g, c);
-	    }
+	    paintButtonPressed (g, br, c);
 	else
-	    {
-	      //System.out.println("paint normal");
-		paintButtonNormal(g, c);
-	    }
+	    paintButtonNormal (g, br, c);
 	
 	paintIcon(g, c, ir);
 	paintText(g, c, tr, b.getText());
@@ -152,7 +215,7 @@
 		int x = iconRect.x;
 		int y = iconRect.y;
 
-		System.out.println("WE HAVE AN ICON: " + b.getIcon());
+		// System.out.println("WE HAVE AN ICON: " + b.getIcon());
  
 		b.getIcon().paintIcon(c, g, x, y);
 	    }
@@ -163,22 +226,25 @@
     }
 
     protected void paintButtonPressed(Graphics g,
+				      Rectangle area, 
 				      JComponent b)
     {
 	Dimension size = b.getSize();
 	
 	g.setColor(pressedBackgroundColor);
-	g.fillRect(1,1,size.width-2, size.height-2);                
-
+ 	g.fillRect(area.x, area.y,
+		   area.width, area.height);
     }
     
     protected void paintButtonNormal(Graphics g,
+				     Rectangle area, 
 				     JComponent b)
     {
 	Dimension size = b.getSize();
 	
 	g.setColor(normalBackgroundColor);
-	g.fillRect(1,1,size.width-2, size.height-2);                
+ 	g.fillRect(area.x, area.y,
+		   area.width, area.height);
 
     }
     
@@ -199,7 +265,7 @@
 				      text, 
 				      0,
 				      textRect.x, 
-				      textRect.y + fm.getAscent()/2);
+				      textRect.y + fm.getAscent ());
     } 
 }
 
Index: javax/swing/plaf/basic/BasicGraphicsUtils.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java,v
retrieving revision 1.4
diff -u -b -w -r1.4 BasicGraphicsUtils.java
--- javax/swing/plaf/basic/BasicGraphicsUtils.java	1 Aug 2003 20:10:22 -0000	1.4
+++ javax/swing/plaf/basic/BasicGraphicsUtils.java	6 Jan 2004 20:04:32 -0000
@@ -595,6 +595,7 @@
     Rectangle iconRect = new Rectangle();
     Rectangle textRect = new Rectangle();
     Insets insets = b.getInsets();
+    Insets margin = b.getMargin();
     
     /* For determining the ideal size, do not assume a size restriction. */
     viewRect = new Rectangle(0, 0,
@@ -630,7 +631,11 @@
      */
     contentRect = textRect.union(iconRect);
 
-    return new Dimension(insets.left + contentRect.width + insets.right,
-                         insets.top + contentRect.height + insets.bottom);
+    return new Dimension(insets.left + margin.left
+			 + contentRect.width 
+			 + insets.right + margin.right,
+                         insets.top + margin.top
+			 + contentRect.height 
+			 + insets.bottom + margin.bottom);
   }
 }

--------------040405000906080209090209--




From MAILER-DAEMON Tue Jan 06 17:19:16 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdzXf-0001zr-Te
	for mharc-classpath@gnu.org; Tue, 06 Jan 2004 17:19:15 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdzXb-0001xB-6Q
	for classpath@gnu.org; Tue, 06 Jan 2004 17:19:11 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdzX2-0001d2-TC
	for classpath@gnu.org; Tue, 06 Jan 2004 17:19:08 -0500
Received: from [217.8.192.20] (helo=smtp1.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdzX2-0001cX-73
	for classpath@gnu.org; Tue, 06 Jan 2004 17:18:36 -0500
Received: from [192.168.1.33] (199.202.dyn-adsl.customer.ch.easynet.net
	[217.8.199.202]) by smtp1.mail.ch.easynet.net (Postfix) with ESMTP
	id 4D9EA4A059; Tue,  6 Jan 2004 22:17:05 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: GNU Classpath <classpath@gnu.org>,
	graydon hoare <graydon@redhat.com>
Date: Tue, 6 Jan 2004 22:17:04 +0100
Message-Id: <20040106211704.22283@smtp.mail.ch.easynet.net>
In-Reply-To: <3FFB1521.1060302@redhat.com>
References: <3FFB1521.1060302@redhat.com>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: java-patches@gcc.gnu.org
Subject: Re: [PATCH] fixes to swing button implementation
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 22:19:12 -0000

graydon hoare <graydon@redhat.com> wrote on Tue, 6 Jan 2004 15:05:53 -0500:

>+  // ChangeEvents are not AWTEvents, can't use multicaster
>+  Vector changeListeners = new Vector ();

Using Vector means a lot of synchronization operations.
java.util.ArrayList/LinkedList are not synchronized, which makes their
usage more efficient. But probably, it would best tp use
javax.swing.event.EventListenerList here (which, by coincidence, became
functional this afternoon...). See the Javadoc in Classpath for how to
use it efficiently. Or, for a more concrete example of its use, have a
look at the method javax.swing.DefaultBoundedRangeModel.fireStateChanged.

A general stylistic question: foo ().bar (baz) or foo().bar(baz)?

AbstractButton.getMargin(): I'm not sure whether or not it should return
a clone of the internal Insets object... A simple Mauve testcase could
check for this.

>Index: javax/swing/DefaultButtonModel.java
>===================================================================
>+    ActionListener actionListener;
>+    ItemListener itemListener;
>+
>+    // ChangeEvents are not AWTEvents
>+    Vector changeListeners = new Vector ();

See above: it probably would be advisable to use
javax.swing.event.EventListenerList instead of Vector.

>+    boolean armed = false;
>+    boolean enabled = true;
>+    boolean pressed = false;
>+    boolean rolledOver = false;
>+    boolean selected = false;
>+    int mnemonic;  
>+    String actionCommand;

Weird. From looking at the J2SE 1.4.2 API specification, I would expect:

  protected int stateMask; // e.g. ARMED | SELECTED
  protected int mnemonic;
  protected String actionCommand;

>Index: javax/swing/plaf/basic/BasicButtonUI.java
>===================================================================

>     public void installUI(final JComponent c) 
>     {
> 	super.installUI(c);
>@@ -68,6 +124,12 @@
> 	pressedBackgroundColor   = new Color(150,150,150);
> 	pressedBackgroundColor   = new Color(150,150,150);
> 	normalBackgroundColor    = new Color(192,192,192);

It seems strange that these colors are hard-coded. Shouldn't they come
from the UIManager?

A final comment: Please, please, please write documentation and Mauve
test cases. With javax.swing.DefaultBoundedRangeModel, I've just made the
experience myself how immensely useful this is for finding bugs, and for
making sure that changes don't break things.

A part from this, IMHO the code look good.

Best regards,

-- Sascha

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





From MAILER-DAEMON Tue Jan 06 17:30:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Adzi6-0008LZ-2I
	for mharc-classpath@gnu.org; Tue, 06 Jan 2004 17:30:02 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Adzho-00086G-EY
	for classpath@gnu.org; Tue, 06 Jan 2004 17:29:44 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdzhF-0007Yb-Lw
	for classpath@gnu.org; Tue, 06 Jan 2004 17:29:40 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Adzh9-0007Mm-VT
	for classpath@gnu.org; Tue, 06 Jan 2004 17:29:04 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-016.ewetel.net
	[80.228.82.16])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i06LRNl1023602;
	Tue, 6 Jan 2004 22:27:24 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AdyjV-00077u-00; Tue, 06 Jan 2004 22:27:25 +0100
Date: Tue, 6 Jan 2004 22:27:25 +0100
From: Michael Koch <konqueror@gmx.de>
To: Sascha Brawer <brawer@dandelis.ch>
Message-ID: <20040106212725.GA26671@mail.konqueror.de>
References: <3FFB1521.1060302@redhat.com>
	<20040106211704.22283@smtp.mail.ch.easynet.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20040106211704.22283@smtp.mail.ch.easynet.net>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: GNU Classpath <classpath@gnu.org>, java-patches@gcc.gnu.org,
	graydon hoare <graydon@redhat.com>
Subject: Re: [PATCH] fixes to swing button implementation
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 22:29:58 -0000

On Tue, Jan 06, 2004 at 10:17:04PM +0100, Sascha Brawer wrote:
> graydon hoare <graydon@redhat.com> wrote on Tue, 6 Jan 2004 15:05:53 -0500:
> 
> >+  // ChangeEvents are not AWTEvents, can't use multicaster
> >+  Vector changeListeners = new Vector ();
> 
> Using Vector means a lot of synchronization operations.
> java.util.ArrayList/LinkedList are not synchronized, which makes their
> usage more efficient. But probably, it would best tp use
> javax.swing.event.EventListenerList here (which, by coincidence, became
> functional this afternoon...). See the Javadoc in Classpath for how to
> use it efficiently. Or, for a more concrete example of its use, have a
> look at the method javax.swing.DefaultBoundedRangeModel.fireStateChanged.
> 
> A general stylistic question: foo ().bar (baz) or foo().bar(baz)?
> 
> AbstractButton.getMargin(): I'm not sure whether or not it should return
> a clone of the internal Insets object... A simple Mauve testcase could
> check for this.
> 
> >Index: javax/swing/DefaultButtonModel.java
> >===================================================================
> >+    ActionListener actionListener;
> >+    ItemListener itemListener;
> >+
> >+    // ChangeEvents are not AWTEvents
> >+    Vector changeListeners = new Vector ();
> 
> See above: it probably would be advisable to use
> javax.swing.event.EventListenerList instead of Vector.

The EventListenerList stuff is already on my disc since some time for
most JContainer subclasses. I said graydon not to do it.

Michael



From MAILER-DAEMON Tue Jan 06 20:19:00 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ae2Jw-0001WS-H2
	for mharc-classpath@gnu.org; Tue, 06 Jan 2004 20:17:16 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ae2IQ-00014a-Ho
	for classpath@gnu.org; Tue, 06 Jan 2004 20:15:42 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ae2Fz-0000QX-43
	for classpath@gnu.org; Tue, 06 Jan 2004 20:13:42 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1Ae2Fy-0000O7-M9
	for classpath@gnu.org; Tue, 06 Jan 2004 20:13:10 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1Ae1GE-0002K5-9e
	for classpath@gnu.org; Tue, 06 Jan 2004 19:09:22 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id RAA28868
	for <classpath@gnu.org>; Tue, 6 Jan 2004 17:09:15 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 5A20E4F8206; Tue,  6 Jan 2004 17:01:20 -0700 (MST)
To: Thomas Fitzsimmons <fitzsim@redhat.com>
References: <1073350239.19693.47.camel@tortoise.toronto.redhat.com>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: I'm into SOFTWARE!
Date: 06 Jan 2004 17:01:20 -0700
In-Reply-To: <1073350239.19693.47.camel@tortoise.toronto.redhat.com>
Message-ID: <8765fovd7z.fsf@fleche.redhat.com>
Lines: 12
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: classpath@gnu.org
Subject: Re: Patch: merge GTK peers from libgcj to Classpath
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 01:17:15 -0000

>>>>> "Tom" == Thomas Fitzsimmons <fitzsim@redhat.com> writes:

Tom> This patch merges into Classpath the improvements made to libgcj's GTK
Tom> peers since the savannah break-in.
Tom> OK to commit?

Yeah.  The general rule, as I understand it, is if something has gone
through libgcj patch review then it is ok for Classpath.  (The
exceptions being code which is purposely not merged between the two,
but there isn't much of this.)

Tom



From MAILER-DAEMON Tue Jan 06 23:39:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ae5Tn-0003fk-HV
	for mharc-classpath@gnu.org; Tue, 06 Jan 2004 23:39:39 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ae5Tk-0003ev-80
	for classpath@gnu.org; Tue, 06 Jan 2004 23:39:36 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ae5TE-0003UT-05
	for classpath@gnu.org; Tue, 06 Jan 2004 23:39:35 -0500
Received: from [132.208.29.61] (helo=gadek.homelinux.org)
	by monty-python.gnu.org with esmtp (TLSv1:RC4-SHA:128) (Exim 4.24)
	id 1Ae5TD-0003TR-FU
	for classpath@gnu.org; Tue, 06 Jan 2004 23:39:03 -0500
Received: from localhost ([127.0.0.1])
	by gadek.homelinux.org with esmtp (Exim 4.30)
	id 1Ae4Va-0004PM-5q; Tue, 06 Jan 2004 22:37:26 -0500
From: "Grzegorz B. Prokopski" <gadek@debian.org>
To: Mark Wielaard <mark@klomp.org>
Content-Type: multipart/mixed; boundary="=-y7xMupeIl3v6zMly52Ze"
Organization: Debian GNU/Linux http://www.debian.org
Message-Id: <1073446644.1117.347.camel@gadek.homelinux.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Tue, 06 Jan 2004 22:37:25 -0500
Sender: mail <mail@gadek.homelinux.org>
Cc: SableVM-devel ML <sablevm-developer@lists.sourceforge.net>,
	Debian Java <debian-java@lists.debian.org>,
	GNU Classpath <classpath@gnu.org>
Subject: FOSDEM talk about SableVM
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 04:39:37 -0000


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

Hi Mark and everybody,

I am attaching *introduction* (not an abstract, at least not this time)
to the talk I am going to give at FOSDEM [*] in Debian/Free Java room.

This may or may not make it into some prospective web page for Java
room - so it's just to give you idea what's in store. Beware - the
real meat begins near the end of this introduction :-)

Cheers,

				Grzegorz B. Prokopski

[*] http://www.fosdem.org/ 21-22 Feb 2004, Brussels Belgium

PS: Crossposting to SableVM ML for obvious reasons, to GNU CP as the
forum where Java room at FOSDEM was actively discussed and to
debian-java, as we're to share room with Debian people (huh, I'll
have to share room with myself! ;-) and apparently the areas of interest
actually overlap.

-- 
Grzegorz B. Prokopski <gadek@debian.org>
Debian GNU/Linux      http://www.debian.org
SableVM - LGPLed JVM  http://www.sablevm.org

--=-y7xMupeIl3v6zMly52Ze
Content-Disposition: inline; filename=sablevm-fosdem-sent1.txt
Content-Type: text/plain; name=sablevm-fosdem-sent1.txt; charset=ISO-8859-2
Content-Transfer-Encoding: 7bit


Title: "SableVM - the Apache of Java Virtual Machines"

Recommended background: basic knowledge of Java and C.


       = = =   - - -   Introduction to the talk   - - -     = = =

SableVM is a robust and efficient Free (LGPL) Java Virtual Machine.

SableVM started - like many other free JVMs - as an academic research project.
But unlike almost every such project - the goal was NOT fixed on some specific
subset of Java features, instead - SableVM has been designed from ground up as
a *complete* Java Virtual Machine, with number of other robustness and
maintainability features, and with desired lifetime greatly exceeding inital
author's academic goal.

Today SableVM and its design are already proven to be outstanding in many
fields, like ex. portability - where medium time spent on port to a completly
new architecture is proven to be less than an hour, or performance of its
highly portable interpreter (written in plain C) comparable with handwritten
assembly-using, hardly-portable interpreters.

Probably a strong evidence of SableVM (now Project) vitality is that it will
soon feature SableJIT - a easily-retargettable Just In Time compiler, written
by different person than the initial author. Also during the last year a number
of people have contributed to SableVM and we hope this trend to incrase.

On the Free Software side - Project priorities and features are exactly what
one would love to be the case: the codebase is absolutely clean, we're able
and willing to offer repository write access to every contributor, we release
all our code under very permissive license (LGPL), we're of course glad to
help any new contributor grasp our code quickly (which isn't anywhere near
"hard"), we perceive close collaboration with other Free Software projects
(like GNU Classpath) as high-priority, we also have all possible helpful
project infrastructure one could imagine.

The SableVM codebase has many interesting features and implements many advanced
techniques. These features and techniques are often very unique, or they
justmake your life (as user or developer) much easier: m4 macros one can use
without m4 knowlege while preserving C syntax (and thus ex. highlighting),
inlined engine (a compiler w/o a compiler one could say), portable JIT, moving
garbage collector ability (yes, with JNI!), close integration with current
GNU Classpath versions, Java Invocation Interface, ...

That's where the real story begins...

+---------------------------------------------------------------------------+
| For more informations see:                                                |
| * http://www.sablevm.org                                                  |
| * http://devel.sablevm.org/wiki/WhySableVM                                |
+---------------------------------------------------------------------------+

Speaker: Grzegorz B. Prokopski <gadek@debian.org> is an active Free Software
  contributor and advocate. As Debian Developer he initially packaged SableVM
  and ported it to a number of platforms. Lately, SableVM became his main
  interest area, as a central piece of his Ph.D. research project.

--=-y7xMupeIl3v6zMly52Ze--




From MAILER-DAEMON Wed Jan 07 03:06:31 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ae8hz-0006mf-Ig
	for mharc-classpath@gnu.org; Wed, 07 Jan 2004 03:06:31 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ae8hw-0006m8-JA
	for classpath@gnu.org; Wed, 07 Jan 2004 03:06:28 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ae8hQ-0006hd-9n
	for classpath@gnu.org; Wed, 07 Jan 2004 03:06:27 -0500
Received: from [217.8.192.20] (helo=smtp2.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ae8hQ-0006hT-0y
	for classpath@gnu.org; Wed, 07 Jan 2004 03:05:56 -0500
Received: from [192.168.1.33] (215.180.static-adsl.customer.ch.easynet.net
	[217.8.215.180]) by smtp2.mail.ch.easynet.net (Postfix) with ESMTP
	id CA618646BA; Wed,  7 Jan 2004 08:04:23 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <mkoch@mail.konqueror.de>
Date: Wed, 7 Jan 2004 08:04:22 +0100
Message-Id: <20040107070422.2684@smtp.mail.ch.easynet.net>
In-Reply-To: <20040106212725.GA26671@mail.konqueror.de>
References: <20040106212725.GA26671@mail.konqueror.de>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: GNU Classpath <classpath@gnu.org>, java-patches@gcc.gnu.org,
	graydon hoare <graydon@redhat.com>
Subject: Re: [PATCH] fixes to swing button implementation
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 08:06:29 -0000

Michael Koch <konqueror@gmx.de> wrote on Tue, 6 Jan 2004 22:27:25 +0100:

graydon>+  // ChangeEvents are not AWTEvents, can't use multicaster
graydon>+  Vector changeListeners = new Vector ();

Sascha> it probably would be advisable to use
Sascha> javax.swing.event.EventListenerList instead of Vector.

Michael> The EventListenerList stuff is already on my disc since
Michael> some time for most JContainer subclasses. I said graydon
Michael> not to do it.

"it" = using EventListenerList? Why not -- is there some problem with
that class?

-- Sascha

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





From MAILER-DAEMON Wed Jan 07 03:59:54 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ae9Xd-0003Dq-OM
	for mharc-classpath@gnu.org; Wed, 07 Jan 2004 03:59:53 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ae9Xa-0003BH-Sv
	for classpath@gnu.org; Wed, 07 Jan 2004 03:59:50 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ae9X4-0002oi-4y
	for classpath@gnu.org; Wed, 07 Jan 2004 03:59:49 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ae9X3-0002oZ-Mh
	for classpath@gnu.org; Wed, 07 Jan 2004 03:59:17 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-238.ewetel.net
	[80.228.75.238])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i077vb1h023223;
	Wed, 7 Jan 2004 08:57:38 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1Ae8ZQ-0000DA-00; Wed, 07 Jan 2004 08:57:40 +0100
Date: Wed, 7 Jan 2004 08:57:40 +0100
From: Michael Koch <konqueror@gmx.de>
To: Sascha Brawer <brawer@dandelis.ch>
Message-ID: <20040107075740.GB766@mail.konqueror.de>
References: <20040106212725.GA26671@mail.konqueror.de>
	<20040107070422.2684@smtp.mail.ch.easynet.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20040107070422.2684@smtp.mail.ch.easynet.net>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: GNU Classpath <classpath@gnu.org>, java-patches@gcc.gnu.org,
	graydon hoare <graydon@redhat.com>
Subject: Re: [PATCH] fixes to swing button implementation
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 08:59:51 -0000

On Wed, Jan 07, 2004 at 08:04:22AM +0100, Sascha Brawer wrote:
> Michael Koch <konqueror@gmx.de> wrote on Tue, 6 Jan 2004 22:27:25 +0100:
> 
> graydon>+  // ChangeEvents are not AWTEvents, can't use multicaster
> graydon>+  Vector changeListeners = new Vector ();
> 
> Sascha> it probably would be advisable to use
> Sascha> javax.swing.event.EventListenerList instead of Vector.
> 
> Michael> The EventListenerList stuff is already on my disc since
> Michael> some time for most JContainer subclasses. I said graydon
> Michael> not to do it.
> 
> "it" = using EventListenerList? Why not -- is there some problem with
> that class?

There is no problem I just added all EventListenerList stuff to most
classes in javax.swing already, just not commited yet.


Michael



From MAILER-DAEMON Wed Jan 07 13:29:01 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeIN7-0006Jw-2b
	for mharc-classpath@gnu.org; Wed, 07 Jan 2004 13:25:37 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeHx7-0005UQ-Ky
	for classpath@gnu.org; Wed, 07 Jan 2004 12:58:45 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeHwb-0005Ia-76
	for classpath@gnu.org; Wed, 07 Jan 2004 12:58:44 -0500
Received: from [195.8.69.18] (helo=oceanus2.uk.clara.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeHwa-0005Ho-Qb
	for classpath@gnu.org; Wed, 07 Jan 2004 12:58:12 -0500
Received: from du-253-232.nat.adsl.claranet.fr ([212.43.253.232]
	helo=[10.0.1.2]) by oceanus2.uk.clara.net with esmtp (Exim 3.36 #2)
	id 1AeGz2-000IMG-00
	for classpath@gnu.org; Wed, 07 Jan 2004 16:56:40 +0000
Mime-Version: 1.0 (Apple Message framework v609)
Content-Transfer-Encoding: 7bit
Message-Id: <D4BDDC41-413A-11D8-BCCF-003065B22A76@bluezoo.org>
Content-Type: text/plain; charset=US-ASCII; format=flowed
To: classpath@gnu.org
From: Chris Burdess <dog@bluezoo.org>
Date: Wed, 7 Jan 2004 18:56:34 +0100
X-Mailer: Apple Mail (2.609)
X-Mailman-Approved-At: Wed, 07 Jan 2004 13:25:34 -0500
Subject: Status of inetlib
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 17:58:46 -0000

Following the Savannah break-in, I have completed auditing of the 
inetlib codebase and am confident that it has not been maliciously 
altered in any way.

I have some fixes to the build scripts. Do I need to post diffs here or 
is it ok to commit (inetlib being a separate module and all that)?
-- 
Chris Burdess




From MAILER-DAEMON Wed Jan 07 18:44:33 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeNLk-0004ha-Qy
	for mharc-classpath@gnu.org; Wed, 07 Jan 2004 18:44:32 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeNLj-0004hC-7L
	for classpath@gnu.org; Wed, 07 Jan 2004 18:44:31 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeNLD-0004f5-Br
	for classpath@gnu.org; Wed, 07 Jan 2004 18:44:30 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeN7Z-0008Hk-Sm
	for classpath@gnu.org; Wed, 07 Jan 2004 18:29:54 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id PAA18360;
	Wed, 7 Jan 2004 15:28:19 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id A19514F824A; Wed,  7 Jan 2004 15:20:15 -0700 (MST)
To: Chris Burdess <dog@bluezoo.org>
References: <D4BDDC41-413A-11D8-BCCF-003065B22A76@bluezoo.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Now my EMOTIONAL RESOURCES are heavily committed to 23% of the
	SMELTING and REFINING industry of the state of NEVADA!!
Date: 07 Jan 2004 15:20:15 -0700
In-Reply-To: <D4BDDC41-413A-11D8-BCCF-003065B22A76@bluezoo.org>
Message-ID: <877k03s8o0.fsf@fleche.redhat.com>
Lines: 10
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: classpath@gnu.org
Subject: Re: Status of inetlib
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 23:44:31 -0000

>>>>> "Chris" == Chris Burdess <dog@bluezoo.org> writes:

Chris> I have some fixes to the build scripts. Do I need to post diffs here
Chris> or is it ok to commit (inetlib being a separate module and all that)?

We've been posting diffs manually to commit-classpath while the cvs
commit notification is down.  I think that would be handy for inetlib
as well.

Tom



From MAILER-DAEMON Thu Jan 08 05:35:37 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeXUJ-000741-5D
	for mharc-classpath@gnu.org; Thu, 08 Jan 2004 05:34:03 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeXTl-0006Yz-VM
	for classpath@gnu.org; Thu, 08 Jan 2004 05:33:29 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeXSd-0005Xm-0l
	for classpath@gnu.org; Thu, 08 Jan 2004 05:32:50 -0500
Received: from [62.108.28.95] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeXSU-0005IQ-DP
	for classpath@gnu.org; Thu, 08 Jan 2004 05:32:10 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1AeWUa-0006lR-00; Thu, 08 Jan 2004 10:30:16 +0100
From: Mark Wielaard <mark@klomp.org>
To: Chris Burdess <dog@bluezoo.org>
In-Reply-To: <877k03s8o0.fsf@fleche.redhat.com>
References: <D4BDDC41-413A-11D8-BCCF-003065B22A76@bluezoo.org>
	<877k03s8o0.fsf@fleche.redhat.com>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-0MiSb0G0ciUjlFoVKP5Z"
Message-Id: <1073554231.14315.23.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Thu, 08 Jan 2004 10:30:31 +0100
Cc: tromey@redhat.com, classpath@gnu.org
Subject: Re: Status of inetlib
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 10:33:50 -0000


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

Hi,

Thanks for auditing the code!

On Wed, 2004-01-07 at 23:20, Tom Tromey wrote:
> >>>>> "Chris" =3D=3D Chris Burdess <dog@bluezoo.org> writes:
>=20
> Chris> I have some fixes to the build scripts. Do I need to post diffs he=
re
> Chris> or is it ok to commit (inetlib being a separate module and all tha=
t)?
>=20
> We've been posting diffs manually to commit-classpath while the cvs
> commit notification is down.  I think that would be handy for inetlib
> as well.

Yes, it shows who is working on what (whether some piece of code is
actively maintained) and posting the actual diff also makes it much more
likely that someone will quickly read over it. That makes spotting
bugs/features much easier.

I saw some people posting references to savannah cvsweb for patches they
committed. Please just post the complete patch (diff -uN) before
committing.

Cheers,

Mark

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

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

iD8DBQA//SM3xVhZCJWr9QwRAvWbAJ9jBiEUcPjrsVdgyE0hcWEZ5H5zGwCgi39+
yuVoaAX954PXQHsHjcH9j/E=
=RmW+
-----END PGP SIGNATURE-----

--=-0MiSb0G0ciUjlFoVKP5Z--




From MAILER-DAEMON Thu Jan 08 11:29:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aed1q-0000Uo-GE
	for mharc-classpath@gnu.org; Thu, 08 Jan 2004 11:29:02 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aed1k-0000Tw-BM
	for classpath@gnu.org; Thu, 08 Jan 2004 11:28:56 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aed1A-0000PQ-FO
	for classpath@gnu.org; Thu, 08 Jan 2004 11:28:52 -0500
Received: from [217.8.192.20] (helo=smtp1.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aed19-0000P5-KT
	for classpath@gnu.org; Thu, 08 Jan 2004 11:28:19 -0500
Received: from [192.168.1.33] (196.166.dyn-adsl.customer.ch.easynet.net
	[217.8.196.166])
	by smtp1.mail.ch.easynet.net (Postfix) with ESMTP id 704D149FE4
	for <classpath@gnu.org>; Thu,  8 Jan 2004 16:26:47 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: GNU Classpath <classpath@gnu.org>
Date: Thu, 8 Jan 2004 16:26:46 +0100
Message-Id: <20040108152646.27333@smtp.mail.ch.easynet.net>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Fwd: Quadratic and cubic equations
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 16:28:58 -0000

---------------- Begin Forwarded Message ----------------
Subject: Re: Quadratic and cubic equations
Date Sent: Wednesday, January 7, 2004 3:17 PM
From: Sascha Brawer <brawer@dandelis.ch>
To: Brian Gough <bjg@network-theory.co.uk>
CC: Mark Wielaard <mark@klomp.org>, Michael Koch <konqueror@gmx.de>

Hi Brian

we have a problem with solving a specific quadratic equation in GNU
Classpath. For your convenience, I've re-written the problematic equation
as a patch to the GSL test suite (gsl/poly/test.c); see below.

I suspect that the problem is the test for (disc == 0) in gsl/poly/
solve_quadratic.c, line 61. With the Java version of your code, we get a
very small negative number in gcj (the Java front-end for the GCC) on IA-
32, and exactly 0.0 with some other Java Virtual Machines.

Could it be that the test for (disc == 0) should actually be replaced by
something like (fabs(disc - 0.0) < EPSILON)? If so, which value is
appropriate for EPSILON?

I have entered the problem into the bug database for GNU Classpath; see

 http://savannah.gnu.org/bugs/index.php?func=detailitem&item_id=7123

Thanks a lot for your help,

-- Sascha

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


Index: poly/test.c
===================================================================
RCS file: /cvs/gsl/gsl/poly/test.c,v
retrieving revision 1.16
diff -u -r1.16 test.c
--- poly/test.c 26 Jul 2003 13:44:36 -0000      1.16
+++ poly/test.c 7 Jan 2004 13:32:21 -0000
@@ -102,6 +102,18 @@
     gsl_test_rel (x1, 2.0, 1e-9, "x1, 5 x^2 = 20");
   }
 
+  {
+    /* From the Mauve test suite, used by GNU Classpath. */
+    double x0, x1;
+
+    int n = gsl_poly_solve_quadratic (0.1, 20.0, 1000.0, &x0, &x1);
+
+    gsl_test (n != 1,
+              "gsl_poly_solve_quadratic, (x^2)/10 + 20x + 1000 = 0");
+    gsl_test_rel (x0, -100.0, 1e-9, "x0, (x^2)/10 + 20x + 1000 = 0");
+  }
+
+
   /* Cubic */
 
   {

----------------- End Forwarded Message -----------------





From MAILER-DAEMON Thu Jan 08 13:48:15 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AefCY-0008IO-RL
	for mharc-classpath@gnu.org; Thu, 08 Jan 2004 13:48:14 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AefCV-0008Hp-HH
	for classpath@gnu.org; Thu, 08 Jan 2004 13:48:11 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AefBq-0008F3-0Z
	for classpath@gnu.org; Thu, 08 Jan 2004 13:48:01 -0500
Received: from [62.253.162.46] (helo=mta06-svc.ntlworld.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeeZZ-0003sN-Sl
	for classpath@gnu.org; Thu, 08 Jan 2004 13:07:58 -0500
Received: from cuddles.cambridge.redhat.com ([81.96.64.123])
	by mta06-svc.ntlworld.com
	(InterMail vM.4.01.03.37 201-229-121-137-20020806) with ESMTP id
	<20040108170609.LJDB1005.mta06-svc.ntlworld.com@cuddles.cambridge.redhat.com>
	for <classpath@gnu.org>; Thu, 8 Jan 2004 17:06:09 +0000
Received: from redhat.com (localhost.localdomain [127.0.0.1])
	by cuddles.cambridge.redhat.com (8.12.8/8.12.8) with ESMTP id
	i08H5Fv7007974; Thu, 8 Jan 2004 17:05:25 GMT
Received: (from aph@localhost)
	by redhat.com (8.12.8/8.12.8/Submit) id i08H5Fog007970;
	Thu, 8 Jan 2004 17:05:15 GMT
From: Andrew Haley <aph@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-ID: <16381.36299.111351.287767@cuddles.cambridge.redhat.com>
Date: Thu, 8 Jan 2004 17:05:15 +0000
To: Sascha Brawer <brawer@dandelis.ch>
In-Reply-To: <20040108152646.27333@smtp.mail.ch.easynet.net>
References: <20040108152646.27333@smtp.mail.ch.easynet.net>
X-Mailer: VM 7.14 under Emacs 21.2.1
Cc: GNU Classpath <classpath@gnu.org>
Subject: Fwd: Quadratic and cubic equations
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 18:48:12 -0000

Sascha Brawer writes:
 > ---------------- Begin Forwarded Message ----------------
 > Subject: Re: Quadratic and cubic equations
 > Date Sent: Wednesday, January 7, 2004 3:17 PM
 > From: Sascha Brawer <brawer@dandelis.ch>
 > To: Brian Gough <bjg@network-theory.co.uk>
 > CC: Mark Wielaard <mark@klomp.org>, Michael Koch <konqueror@gmx.de>
 > 
 > Hi Brian
 > 
 > we have a problem with solving a specific quadratic equation in GNU
 > Classpath. For your convenience, I've re-written the problematic equation
 > as a patch to the GSL test suite (gsl/poly/test.c); see below.
 > 
 > I suspect that the problem is the test for (disc == 0) in gsl/poly/
 > solve_quadratic.c, line 61. With the Java version of your code, we get a
 > very small negative number in gcj (the Java front-end for the GCC) on IA-
 > 32, and exactly 0.0 with some other Java Virtual Machines.
 > 
 > Could it be that the test for (disc == 0) should actually be replaced by
 > something like (fabs(disc - 0.0) < EPSILON)? If so, which value is
 > appropriate for EPSILON?

I don't think so, no.  The problem is that 0.1 cannot be represented
exactly, so it's a matter of whether the discriminant ends up being a
very small positive number, a small negative number, or zero.
solveQuadratic isn't wrong: its argument is.

It looks to me like this is a test of exact java strictfp compliance.
gcj fails, because it isn't strictfp compliant.

Andrew.



From MAILER-DAEMON Thu Jan 08 13:49:38 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AefDu-0000A8-1m
	for mharc-classpath@gnu.org; Thu, 08 Jan 2004 13:49:38 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AefDr-00009K-Hq
	for classpath@gnu.org; Thu, 08 Jan 2004 13:49:35 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AefDK-0008WV-8V
	for classpath@gnu.org; Thu, 08 Jan 2004 13:49:33 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AeeZb-0003sO-Db
	for classpath@gnu.org; Thu, 08 Jan 2004 13:07:59 -0500
Received: from [217.8.192.20] (helo=smtp1.mail.ch.easynet.net)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AecSH-0007F0-Pv
	for classpath@gnu.org; Thu, 08 Jan 2004 10:52:17 -0500
Received: from [192.168.1.33] (196.166.dyn-adsl.customer.ch.easynet.net
	[217.8.196.166]) by smtp1.mail.ch.easynet.net (Postfix) with ESMTP
	id 5F8D44A058; Thu,  8 Jan 2004 16:51:29 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: Brian Gough <bjg@network-theory.co.uk>, GNU Classpath <classpath@gnu.org>
Date: Thu, 8 Jan 2004 16:51:28 +0100
Message-Id: <20040108155128.32213@smtp.mail.ch.easynet.net>
In-Reply-To: <16381.19087.673676.158453@debian.local>
References: <16381.19087.673676.158453@debian.local>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: 
Subject: Re: [bugs #7123] Quadratic and cubic equations
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 18:49:36 -0000

Brian Gough <bjg@network-theory.co.uk> wrote on Thu, 8 Jan 2004 12:18:23
+0000:

>I suspect that GCJ on Intel uses the 80-bit extended-precision
>floating point registers (which are the gcc default, in C also) while
>the other virtual machines probably use strict double-precision.
>
>I don't know much about GCJ but I'm sure the developers are aware of
>the issue, so there may be an option to control it.

Java has a special attribute for classes/methods, fpstrict, which tells a
virtual machine to use IEEE 64-bit precision for all results of
intermediate calculations. (A double method parameter/result or field
load/store must be rounded to 64-bit even without an fpstrict
declaration, IIRC). As far as I know, gcj doesn't yet correctly implement
this, but that is something that wouldn't matter much for Classpath --
the gcj people will certainly fix this bug eventually.

So, an fpstrict declaration would give us the same result everywhere.
However, would this really solve the problem of very small discriminants?
Couldn't it be the case that the calculated discriminant is inside the
IEEE 64-bit range, but so close to zero that the further calculations are
outside the representable range?

Please apologize if my question is stupid. I don't know much about
scientific computing or error propagation; my background is pretty much
limited to <http://citeseer.nj.nec.com/goldberg91what.html>.

> > Could it be that the test for (disc == 0) should actually be replaced by
> > something like (fabs(disc - 0.0) < EPSILON)? If so, which value is
> > appropriate for EPSILON?
>
>The best value is 0, as there is no natural choice for epsilon (it
>introduces an arbitrary constant).
>
>My recommendation: choose test coefficients which are exact in binary
>(e.g. in this case multiply the polynomial by 5) to avoid the problem.

Actually, I don't understand why fixing the test case would help. Of
course, one could remove the testlet from the test suite, but user
programs still would sometimes get bad results for their input.

Do people on the Classpath mailing list have an opinion?

-- Sascha

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





From MAILER-DAEMON Thu Jan 08 14:52:36 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AegCp-0007tS-NW
	for mharc-classpath@gnu.org; Thu, 08 Jan 2004 14:52:35 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AegCP-0007rA-5T
	for classpath@gnu.org; Thu, 08 Jan 2004 14:52:09 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AegBs-0007nI-IT
	for classpath@gnu.org; Thu, 08 Jan 2004 14:52:07 -0500
Received: from [62.253.162.45] (helo=mta05-svc.ntlworld.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AegBs-0007n0-1x
	for classpath@gnu.org; Thu, 08 Jan 2004 14:51:36 -0500
Received: from cuddles.cambridge.redhat.com ([81.96.64.123])
	by mta05-svc.ntlworld.com
	(InterMail vM.4.01.03.37 201-229-121-137-20020806) with ESMTP id
	<20040108184945.FQE19387.mta05-svc.ntlworld.com@cuddles.cambridge.redhat.com>
	for <classpath@gnu.org>; Thu, 8 Jan 2004 18:49:45 +0000
Received: from redhat.com (localhost.localdomain [127.0.0.1])
	by cuddles.cambridge.redhat.com (8.12.8/8.12.8) with ESMTP id
	i08In9v7013189; Thu, 8 Jan 2004 18:49:19 GMT
Received: (from aph@localhost)
	by redhat.com (8.12.8/8.12.8/Submit) id i08In9oD013185;
	Thu, 8 Jan 2004 18:49:09 GMT
From: Andrew Haley <aph@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-ID: <16381.42533.93019.48319@cuddles.cambridge.redhat.com>
Date: Thu, 8 Jan 2004 18:49:09 +0000
To: Tom Tromey <tromey@redhat.com>
In-Reply-To: <87brpep9vl.fsf@fleche.redhat.com>
References: <20040108152646.27333@smtp.mail.ch.easynet.net>
	<16381.36299.111351.287767@cuddles.cambridge.redhat.com>
	<87brpep9vl.fsf@fleche.redhat.com>
X-Mailer: VM 7.14 under Emacs 21.2.1
Cc: GNU Classpath <classpath@gnu.org>, Sascha Brawer <brawer@dandelis.ch>
Subject: Re: Fwd: Quadratic and cubic equations
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 19:52:32 -0000

Tom Tromey writes:
 > >>>>> "Andrew" == Andrew Haley <aph@redhat.com> writes:
 > 
 > Andrew> It looks to me like this is a test of exact java strictfp
 > Andrew> compliance.  gcj fails, because it isn't strictfp compliant.
 > 
 > On top of that, to guarantee the same results everywhere we would need
 > to declare both the test case and the code in Classpath `strictfp'.

Yes.

 > That incurs a performance penalty on some platforms.  I'm not sure it
 > is worthwhile.  Do more-exact results matter that much in this code?

No.  The whole thing is misconceived because it's so unstable: an
argument error of one part in 10^12 is causing this problem.

Andrew.




From MAILER-DAEMON Thu Jan 08 15:44:53 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AegK4-0000Lu-Hk
	for mharc-classpath@gnu.org; Thu, 08 Jan 2004 15:00:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AegK1-0000Ki-19
	for classpath@gnu.org; Thu, 08 Jan 2004 15:00:01 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AegJT-0000Ah-Ll
	for classpath@gnu.org; Thu, 08 Jan 2004 14:59:58 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aeg50-00072M-Qn
	for classpath@gnu.org; Thu, 08 Jan 2004 14:44:31 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id LAA20534;
	Thu, 8 Jan 2004 11:42:41 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 00FDA4F829E; Thu,  8 Jan 2004 11:34:38 -0700 (MST)
To: Andrew Haley <aph@redhat.com>
References: <20040108152646.27333@smtp.mail.ch.easynet.net>
	<16381.36299.111351.287767@cuddles.cambridge.redhat.com>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: I was in EXCRUCIATING PAIN until I started reading JACK AND JILL
	Magazine!!
Date: 08 Jan 2004 11:34:38 -0700
In-Reply-To: <16381.36299.111351.287767@cuddles.cambridge.redhat.com>
Message-ID: <87brpep9vl.fsf@fleche.redhat.com>
Lines: 11
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: GNU Classpath <classpath@gnu.org>, Sascha Brawer <brawer@dandelis.ch>
Subject: Re: Fwd: Quadratic and cubic equations
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 20:00:02 -0000

>>>>> "Andrew" == Andrew Haley <aph@redhat.com> writes:

Andrew> It looks to me like this is a test of exact java strictfp
Andrew> compliance.  gcj fails, because it isn't strictfp compliant.

On top of that, to guarantee the same results everywhere we would need
to declare both the test case and the code in Classpath `strictfp'.
That incurs a performance penalty on some platforms.  I'm not sure it
is worthwhile.  Do more-exact results matter that much in this code?

Tom



From MAILER-DAEMON Thu Jan 08 17:24:42 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeeAB-00019a-8H
	for mharc-classpath@gnu.org; Thu, 08 Jan 2004 12:41:43 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aee8w-00012m-QT
	for classpath@gnu.org; Thu, 08 Jan 2004 12:40:26 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aed1n-0000UT-Uu
	for classpath@gnu.org; Thu, 08 Jan 2004 11:29:31 -0500
Received: from [217.8.192.20] (helo=smtp2.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aed1n-0000UN-CO
	for classpath@gnu.org; Thu, 08 Jan 2004 11:28:59 -0500
Received: from [192.168.1.33] (196.166.dyn-adsl.customer.ch.easynet.net
	[217.8.196.166])
	by smtp2.mail.ch.easynet.net (Postfix) with ESMTP id 8477E64686
	for <classpath@gnu.org>; Thu,  8 Jan 2004 16:27:28 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: GNU Classpath <classpath@gnu.org>
Date: Thu, 8 Jan 2004 16:27:27 +0100
Message-Id: <20040108152727.23063@smtp.mail.ch.easynet.net>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Fwd: Quadratic and cubic equations
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 17:41:41 -0000

---------------- Begin Forwarded Message ----------------
Subject: Re: Quadratic and cubic equations
Date Sent: Thursday, January 8, 2004 12:18 PM
From: Brian Gough <bjg@network-theory.co.uk>
To: Sascha Brawer <brawer@dandelis.ch>
CC: Mark Wielaard <mark@klomp.org>, Michael Koch <konqueror@gmx.de>

Sascha Brawer writes:
 > I suspect that the problem is the test for (disc == 0) in gsl/poly/
 > solve_quadratic.c, line 61. With the Java version of your code, we get a
 > very small negative number in gcj (the Java front-end for the GCC) on IA-
 > 32, and exactly 0.0 with some other Java Virtual Machines.

The coefficient 0.1 does not have an exact representation in binary,
so the number used will depend on the precision and the rounding
mode.  This will cause different results.

I suspect that GCJ on Intel uses the 80-bit extended-precision
floating point registers (which are the gcc default, in C also) while
the other virtual machines probably use strict double-precision.

I don't know much about GCJ but I'm sure the developers are aware of
the issue, so there may be an option to control it.

 > Could it be that the test for (disc == 0) should actually be replaced by
 > something like (fabs(disc - 0.0) < EPSILON)? If so, which value is
 > appropriate for EPSILON?

The best value is 0, as there is no natural choice for epsilon (it
introduces an arbitrary constant).

My recommendation: choose test coefficients which are exact in binary
(e.g. in this case multiply the polynomial by 5) to avoid the problem.

regards,

-- 
Brian Gough

Network Theory Ltd -- Publishing Free Software Manuals
15 Royal Park
Bristol BS8 3AL
United Kingdom

Tel: +44 (0)117 3179309
Fax: +44 (0)117 9048108
Web: http://www.network-theory.co.uk/


----------------- End Forwarded Message -----------------





From MAILER-DAEMON Thu Jan 08 20:59:26 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aelvq-0003br-Ex
	for mharc-classpath@gnu.org; Thu, 08 Jan 2004 20:59:26 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aelvj-0003Yf-W5
	for classpath@gnu.org; Thu, 08 Jan 2004 20:59:19 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aelv0-0003Hf-WF
	for classpath@gnu.org; Thu, 08 Jan 2004 20:59:06 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aelv0-0003Gx-64
	for classpath@gnu.org; Thu, 08 Jan 2004 20:58:34 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id RAA21204
	for <classpath@gnu.org>; Thu, 8 Jan 2004 17:57:03 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 97E8F4F886D; Thu,  8 Jan 2004 17:48:59 -0700 (MST)
To: GNU Classpath Project <classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Someone is DROOLING on my collar!!
Date: 08 Jan 2004 17:48:59 -0700
Message-ID: <87d69udk04.fsf@fleche.redhat.com>
Lines: 70
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: JIT pluggability
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 01:59:24 -0000

A few of us (at least Dalibor, Grzegorz, Mark, and me) have talked a
bit on irc about other possibilities for collaboration in the free
Java.  Classpath has been such a success that it seems logical that we
should start looking for ways to expand our sphere of collaboration.

One thing we talked about is the possibility of defining a standard
pluggable JIT interface, making it easier to mix-and-match JITs and
interpreters across VMs.

To that end I wrote up a short bullet list of problem areas, mostly
technical things that the VM would need to somehow export to a
pluggable JIT.

Tom


License.
  Does it even make sense to have a license for an API?
  What licenses are appropriate for a JIT plugin?

Language choice for API.
  The obvious choices being:
  C     lowest common denominator
  C++   next-to-lowest common denominator :-)  provides some
        abstraction benefit, maybe
  Java  using our own tools...

ABI Issues

- Object layout, including array layout, field offsets, etc
- Method call ABI
- vtable layout
- Interface calls.  Some systems have constant-time interface calls.
  I suggest we require a simple name lookup, and also provide an
  interface to constant-time calls for JITs that can take advantage of
  them.
- Exception handling - throwing and catching.
- Name lookup, eg class, method, etc.
- Garbage collector interface.
- Synchronization API
- API for "new"
- Cast checking API
- Array assignment API
- Class initialization API


General API

- Verifier interface?
  Does the verifier do all checking or does it impose some
  requirements on the JIT/interpreter?  (Some verifiers choose to
  delay some checking until interpretation.)
  Does the JIT want/need information already computed by the verifier?
  For instance basic blocks or the type map at a given statement.

- Some kind of negotiation API.  The JVM can indicate its
  requirements, the JIT can indicate its capabilities.  Non-matching
  JITs will be ignored by the JVM.

  For instance, gcj is pretty much tied to a conservative GC; if
  there were a JIT that couldn't work in this environment it wouldn't
  make sense to try to load it into libgcj.


Lower Priority

- Debugging interface
- Optimization interface?
    Keeping track of quality of compiler?
    Bookkeeping for profiling?



From MAILER-DAEMON Thu Jan 08 23:18:53 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aeo6m-0006DH-Gf
	for mharc-classpath@gnu.org; Thu, 08 Jan 2004 23:18:52 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aeo6f-0006Bd-W7
	for classpath@gnu.org; Thu, 08 Jan 2004 23:18:45 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aeo68-000648-NG
	for classpath@gnu.org; Thu, 08 Jan 2004 23:18:43 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aenun-0003cS-RE
	for classpath@gnu.org; Thu, 08 Jan 2004 23:06:29 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0934sg10641;
	Thu, 8 Jan 2004 22:04:54 -0500
Received: from redhat.com (sebastian-int.corp.redhat.com [172.16.52.221])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0934rE05865; 
	Thu, 8 Jan 2004 22:04:53 -0500
Message-ID: <3FFE1A39.1030509@redhat.com>
Date: Thu, 08 Jan 2004 22:04:25 -0500
From: graydon hoare <graydon@redhat.com>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.6b) Gecko/20031205 Thunderbird/0.4
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: java-patches@gcc.gnu.org
Content-Type: multipart/mixed; boundary="------------050004000904010507080208"
Cc: classpath@gnu.org
Subject: [patch] fix to JLayeredPane
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 04:18:47 -0000

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

hi,

this patch adapts JLayeredPane to the changes djee@redhat.com recently 
made to Container; notably he discovered that the drawing order in 
container does not match sun's, so reversed it. re-reading the javadocs, 
I see that I did not implement JLayeredPane correctly, and that its 
documentation makes more sense considering this "correct" order he 
discovered. so I've rewritten it to work in that order.

ok to apply?

(and before you ask, yes, the mauve tests are confirmed to work both 
ways -- hooray for the "layer" abstraction -- but I'll be extending them 
to check the underlying mapping too).

-graydon

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

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


--------------050004000904010507080208
Content-Type: text/x-patch;
 name="j2d-jlayeredpane-order-fixup.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="j2d-jlayeredpane-order-fixup.patch"

--- javax/swing/JLayeredPane.java	6 Jan 2004 18:02:23 -0000	1.4
+++ javax/swing/JLayeredPane.java	9 Jan 2004 02:59:28 -0000
@@ -69,16 +69,10 @@
  * this class:</p>
  * 
  * <dl>
- * <dt>Internal Component Index:</dt> 
+ * <dt>Component Index:</dt> 
  * <dd>An offset into the <code>component</code> array held in our ancestor,
  * {@link java.awt.Container}, from <code>[0 .. component.length)</code>. The drawing
- * rule with internal indices is that 0 is drawn first.</dd>
- *
- * <dt>External Component Index:</dt>
- * <dd>An offset into the "logical drawing order" of this container. If <code>I</code>
- * is the internal index of a component, the external index <tt>E =
- * component.length - I</tt>. The rule with external indices is that 0 is
- * drawn last.</dd>
+ * rule with indices is that 0 is drawn last.</dd>
  *
  * <dt>Layer Number:</dt>
  * <dd>A general <code>int</code> specifying a layer within this component.  Negative
@@ -90,6 +84,9 @@
  * is drawn last. Layer position -1 is a synonym for the first layer
  * position (the logical "bottom").</dd>
  *
+ * <p><b>Note:</b> the layer numbering order is the <em>reverse</em> of the
+ * component indexing and position order</p>
+ *
  * @author Graydon Hoare <graydon@redhat.com>
  */
 
@@ -117,7 +114,7 @@
 
 
   /** 
-   * Looks up the layer a child component is currently assigned to.
+   * <p>Looks up the layer a child component is currently assigned to.</p>
    *
    * @param c the component to look up.
    * @return the layer the component is currently assigned to, in this container.
@@ -132,16 +129,16 @@
   }
 
   /**
-   * Returns a pair of ints representing a half-open interval
-   * <code>[bottom, top)</code>, which is the range of internal component
-   * indices the provided layer number corresponds to.
+   * <p>Returns a pair of ints representing a half-open interval 
+   * <code>[top, bottom)</code>, which is the range of component indices 
+   * the provided layer number corresponds to.</p>
    *
-   * Note that "top" is <em>not</em> included in the interval of 
+   * <p>Note that "bottom" is <em>not</em> included in the interval of
    * component indices in this layer: a layer with 0 elements in it has 
-   * <code>ret[0] == ret[1]</code>.
+   * <code>ret[0] == ret[1]</code>.</p>
    *
    * @param layer the layer to look up.
-   * @return the half-open range of internal indices this layer spans.
+   * @return the half-open range of indices this layer spans.
    * @throws IllegalArgumentException if layer does not refer to an active layer
    * in this container.
    */
@@ -149,6 +146,7 @@
   protected int[] layerToRange (Integer layer)
   {
     int[] ret = new int[2];	
+    ret[1] = getComponents ().length;
     Iterator i = layers.entrySet ().iterator ();
     while (i.hasNext())
 	    {
@@ -157,12 +155,12 @@
         Integer layerSz = (Integer) pair.getValue ();
         if (layerNum == layer)
           {
-            ret[1] = ret[0] + layerSz.intValue ();
+            ret[0] = ret[1] - layerSz.intValue ();
             return ret;
           }
         else
           {
-            ret[0] += layerSz.intValue ();
+            ret[1] -= layerSz.intValue ();
           }
 	    }
     // should have found the layer during iteration
@@ -170,7 +168,7 @@
   }
 
   /**
-   * Increments the recorded size of a given layer.
+   * <p>Increments the recorded size of a given layer.</p>
    *
    * @param layer the layer number to increment.
    * @see #incrLayer()
@@ -185,7 +183,7 @@
   }
 
   /**
-   * Decrements the recorded size of a given layer.
+   * <p>Decrements the recorded size of a given layer.</p>
    *
    * @param layer the layer number to decrement.
    * @see #decrLayer()
@@ -200,8 +198,8 @@
   }
 
   /**
-   * Return the greatest layer number currently in use, in this container.
-   * This number may legally be positive <em>or</em> negative.
+   * <p>Return the greatest layer number currently in use, in this container.
+   * This number may legally be positive <em>or</em> negative.</p>
    *
    * @return the least layer number.
    * @see #lowestLayer()
@@ -215,8 +213,8 @@
   }
 
   /**
-   * Return the least layer number currently in use, in this container.
-   * This number may legally be positive <em>or</em> negative.
+   * <p>Return the least layer number currently in use, in this container.
+   * This number may legally be positive <em>or</em> negative.</p>
    *
    * @return the least layer number.
    * @see #highestLayer()
@@ -230,10 +228,10 @@
   }
 
   /**
-   * Moves a component to the "front" of its layer. The "front" is a
+   * <p>Moves a component to the "front" of its layer. The "front" is a
    * synonym for position 0, which is also the last position drawn in each
    * layer, so is usually the component which occludes the most other
-   * components in its layer.
+   * components in its layer.</p>
    *
    * @param c the component to move to the front of its layer.
    * @throws IllegalArgumentException if the component is not a child of
@@ -267,9 +265,9 @@
   }
 
   /**
-   * Return the position of a component within its layer. Positions are assigned
+   * <p>Return the position of a component within its layer. Positions are assigned
    * from the "front" (position 0) to the "back" (position N-1), and drawn from 
-   * the back towards the front.
+   * the back towards the front.</p>
    *
    * @param c the component to get the position of.
    * @throws IllegalArgumentException if the component is not a child of
@@ -281,21 +279,22 @@
   {
     Integer layer = getLayer (c);
     int[] range = layerToRange (layer);
-    int top = (range[1] - 1);
+    int top = range[0];
+    int bot = range[1];
     Component[] comps = getComponents ();
-    for (int i = range[0]; i < range[1]; ++i)
+    for (int i = top; i < bot; ++i)
 	    {
         if (comps[i] == c)
-          return top - i;
+          return i - top;
 	    }
     // should have found it
     throw new IllegalArgumentException ();
   }
 
   /**
-   * Change the position of a component within its layer. Positions are assigned
+   * <p>Change the position of a component within its layer. Positions are assigned
    * from the "front" (position 0) to the "back" (position N-1), and drawn from 
-   * the back towards the front.
+   * the back towards the front.</p>
    *
    * @param c the component to change the position of.
    * @param position the position to assign the component to.
@@ -311,14 +310,15 @@
     if (range[0] == range[1])
 	    throw new IllegalArgumentException ();
 
-    int top = (range[1] - 1);
+    int top = range[0];
+    int bot = range[1];
     if (position == -1)
-	    position = top - range[0];
-    int targ = top - position;
+	    position = (bot - top) - 1;
+    int targ = top + position;
     int curr = -1;
 
     Component[] comps = getComponents();
-    for (int i = range[0]; i < range[1]; ++i)
+    for (int i = top; i < bot; ++i)
 	    {
         if (comps[i] == c)
           {
@@ -336,9 +336,9 @@
   }
     
   /**
-   * Return an array of all components within a layer of this
-   * container. Components are ordered back-to-front, with the "back"
-   * element (which draws first) at position 0 of the returned array.
+   * <p>Return an array of all components within a layer of this
+   * container. Components are ordered front-to-back, with the "front"
+   * element (which draws last) at position 0 of the returned array.</p>
    *
    * @param layer the layer to return components from.
    * @return the components in the layer.
@@ -352,7 +352,7 @@
     else
 	    {
         Component[] comps = getComponents ();
-        int sz = (range[1] - 1) - range[0];
+        int sz = range[1] - range[0];
         Component[] nc = new Component[sz];
         for (int i = 0; i < sz; ++i)
           nc[i] = comps[range[0] + i];
@@ -361,8 +361,8 @@
   }
 
   /**
-   * Return the number of components within a layer of this
-   * container. 
+   * <p>Return the number of components within a layer of this
+   * container.</p>
    *
    * @param layer the layer count components in.
    * @return the number of components in the layer.
@@ -378,8 +378,8 @@
   }
 
   /**
-   * Return a hashtable mapping child components of this container to
-   * Integer objects representing the component's layer assignments.
+   * <p>Return a hashtable mapping child components of this container to
+   * Integer objects representing the component's layer assignments.</p>
    */
 
   protected Hashtable getComponentToLayer()
@@ -387,20 +387,19 @@
     return componentToLayer;
   }
 
-
   /**
-   * Return the index of a component within the underlying (contiguous)
+   * <p>Return the index of a component within the underlying (contiguous)
    * array of children. This is a "raw" number which does not represent the
-   * child's position in a layer, but rather its position in the
-   * concatenation of <em>all</em> layers within the container.
+   * child's position in a layer, but rather its position in the logical
+   * drawing order of all children of the container.</p>
    *
    * @param c the component to look up.
-   * @return the internal index of the component.
+   * @return the external index of the component.
    * @throws IllegalArgumentException if the component is not a child of
    * this container.
    */
 
-  protected int getInternalIndexOf(Component c) 
+  public int getIndexOf(Component c) 
   {
     Integer layer = getLayer (c);
     int[] range = layerToRange (layer);
@@ -414,30 +413,10 @@
     throw new IllegalArgumentException ();
   }
 
-
   /**
-   * Return the external index of a component within the underlying
-   * (contiguous) array of children. This is a "raw" number which does not
-   * represent the child's position in a layer, but rather its position in
-   * the logical drawing order of all children of the container.
-   *
-   * @param c the component to look up.
-   * @return the external index of the component.
-   * @throws IllegalArgumentException if the component is not a child of
-   * this container.
-   */
-
-  public int getIndexOf(Component c) 
-  {
-    // returns the *external* index of the component.
-    int top = getComponentCount() - 1;
-    return top - getIndexOf (c);
-  }    
-
-  /**
-   * Return an Integer object which holds the same int value as the
+   * <p>Return an Integer object which holds the same int value as the
    * parameter. This is strictly an optimization to minimize the number of
-   * identical Integer objects which we allocate.
+   * identical Integer objects which we allocate.</p>
    *
    * @param layer the layer number as an int.
    * @return the layer number as an Integer, possibly shared.
@@ -473,13 +452,13 @@
   }
 
   /**
-   * Computes an internal index at which to request the superclass {@link
+   * <p>Computes an index at which to request the superclass {@link
    * java.awt.Container} inserts a component, given an abstract layer and
-   * position number.
+   * position number.</p>
    *
    * @param layer the layer in which to insert a component.
    * @param position the position in the layer at which to insert a component.
-   * @return the internal index at which to insert the component.
+   * @return the index at which to insert the component.
    */
     
   protected int insertIndexForLayer(int layer, int position)
@@ -492,20 +471,20 @@
     if (range[0] == range[1])
 	    return range[0];
 	
-    int bottom = range[0];
-    int top = range[1] - 1;
+    int top = range[0];
+    int bot = range[1];
 	
-    if (position == -1 || position > (top - bottom))
-	    return bottom;
+    if (position == -1 || position > (bot - top))
+        return bot;
     else
-	    return top - position;
+        return top + position;
   }
 
   /**
-   * Removes a child from this container. The child is specified by
-   * internal index. After removal, the child no longer occupies a layer.
+   * <p>Removes a child from this container. The child is specified by
+   * index. After removal, the child no longer occupies a layer.</p>
    *
-   * @param index the internal index of the child component to remove.
+   * @param index the index of the child component to remove.
    */
     
   public void remove (int index)
@@ -518,15 +497,15 @@
   }
 
   /**
-   * Removes a child from this container. The child is specified directly.
-   * After removal, the child no longer occupies a layer.
+   * <p>Removes a child from this container. The child is specified directly.
+   * After removal, the child no longer occupies a layer.</p>
    *
    * @param comp the child to remove.
    */
 	
   public void remove (Component comp)
   {
-    remove (getInternalIndexOf (comp));
+    remove (getIndexOf (comp));
   }
 
   /**
@@ -547,7 +526,7 @@
   }
 
   /**
-   * Set the layer and position of a component, within this container. 
+   * <p>Set the layer and position of a component, within this container.</p>
    *
    * @param c the child component to set the layer property for.
    * @param layer the layer number to assign to the component.
@@ -565,10 +544,10 @@
   }
 
   /**
-   * Overrides the default implementation from {@link java.awt.Container}
+   * <p>Overrides the default implementation from {@link java.awt.Container}
    * such that <code>layerConstraint</code> is interpreted as an {@link
    * Integer}, specifying the layer to which the component will be added
-   * (at the bottom position).
+   * (at the bottom position).</p>
    *
    * @param comp the component to add.
    * @param layerConstraint an integer specifying the layer to add the component to.
@@ -586,6 +565,7 @@
 	    layer = DEFAULT_LAYER;
 
     int newIdx = insertIndexForLayer(layer.intValue (), -1);
+
     componentToLayer.put (comp, layer);
     incrLayer (layer);
 	

--------------050004000904010507080208--



From MAILER-DAEMON Fri Jan 09 05:18:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AetiM-0006wb-Id
	for mharc-classpath@gnu.org; Fri, 09 Jan 2004 05:18:02 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AetiJ-0006wD-Fu
	for classpath@gnu.org; Fri, 09 Jan 2004 05:17:59 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aethn-0006rF-Km
	for classpath@gnu.org; Fri, 09 Jan 2004 05:17:58 -0500
Received: from [217.8.192.20] (helo=smtp2.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AerpM-0006TJ-Lw
	for classpath@gnu.org; Fri, 09 Jan 2004 03:17:08 -0500
Received: from [192.168.1.33] (197.5.dyn-adsl.customer.ch.easynet.net
	[217.8.197.5]) by smtp2.mail.ch.easynet.net (Postfix) with ESMTP
	id F12A5645B2; Fri,  9 Jan 2004 08:15:37 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: GNU Classpath <classpath@gnu.org>, Andrew Haley <aph@redhat.com>
Date: Fri, 9 Jan 2004 08:15:36 +0100
Message-Id: <20040109071537.16818@smtp.mail.ch.easynet.net>
In-Reply-To: <16381.42533.93019.48319@cuddles.cambridge.redhat.com>
References: <16381.42533.93019.48319@cuddles.cambridge.redhat.com>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: Tom Tromey <tromey@redhat.com>
Subject: FP-strict methods (was: Quadratic and cubic equations)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 10:18:00 -0000

> "TT" == Tom Tromey <tromey@redhat.com> writes:
> "AH" == Andrew Haley <aph@redhat.com> writes:

AH> It looks to me like this is a test of exact java strictfp
AH> compliance.  gcj fails, because it isn't strictfp compliant.
 
TT> On top of that, to guarantee the same results everywhere we would need
TT> to declare both the test case and the code in Classpath `strictfp'.

AH> Yes.

I agree for the code in Classpath. But why the test case?

The tested method stores its results in a double[], which means that a
'dastore' instruction gets executed. According to the Java VM
specification, 2nd edition, 'dastore' must perform a value set
conversion, even in a method that is not FP-strict [1].

[1] <http://java.sun.com/docs/books/vmspec/2nd-edition/html/
Instructions2.doc3.html#dastore>

All other ways for passing a double value between methods (such as
dreturn, putfield, putstatic, invoke* etc.) require value set conversion, too.

Thus, I don't understand why the test case would need to be declared FP-
strict. Of course, this would be different if the test did some
calculations with the checked value, e.g. by converting the double value
to a float; the 'd2f' instruction may behave differently depending on
whether the method is FP-strict. But since it merely compares the value
with a constant, the test case should come to the same outcome everywhere
if the tested code is FP-strict.

I certainly would not mind declaring test code fpstrict, but I'd really
like to understand the reason. Can you enlighten me?

-- Sascha

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





From MAILER-DAEMON Fri Jan 09 06:42:19 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aev1u-0000oh-5L
	for mharc-classpath@gnu.org; Fri, 09 Jan 2004 06:42:18 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aev1i-0000me-J3
	for classpath@gnu.org; Fri, 09 Jan 2004 06:42:06 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aev14-0000b7-9c
	for classpath@gnu.org; Fri, 09 Jan 2004 06:41:57 -0500
Received: from [62.253.162.47] (helo=mta07-svc.ntlworld.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aev13-0000ap-Ng
	for classpath@gnu.org; Fri, 09 Jan 2004 06:41:25 -0500
Received: from cuddles.cambridge.redhat.com ([81.96.64.123])
	by mta07-svc.ntlworld.com
	(InterMail vM.4.01.03.37 201-229-121-137-20020806) with ESMTP id
	<20040109103955.FTTR2588.mta07-svc.ntlworld.com@cuddles.cambridge.redhat.com>
	for <classpath@gnu.org>; Fri, 9 Jan 2004 10:39:55 +0000
Received: from redhat.com (localhost.localdomain [127.0.0.1])
	by cuddles.cambridge.redhat.com (8.12.8/8.12.8) with ESMTP id
	i09Ad3v7016729; Fri, 9 Jan 2004 10:39:13 GMT
Received: (from aph@localhost)
	by redhat.com (8.12.8/8.12.8/Submit) id i09Ad219016725;
	Fri, 9 Jan 2004 10:39:02 GMT
From: Andrew Haley <aph@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-ID: <16382.33990.585267.870159@cuddles.cambridge.redhat.com>
Date: Fri, 9 Jan 2004 10:39:02 +0000
To: Sascha Brawer <brawer@dandelis.ch>
In-Reply-To: <20040109071537.16818@smtp.mail.ch.easynet.net>
References: <16381.42533.93019.48319@cuddles.cambridge.redhat.com>
	<20040109071537.16818@smtp.mail.ch.easynet.net>
X-Mailer: VM 7.14 under Emacs 21.2.1
Cc: Tom Tromey <tromey@redhat.com>, GNU Classpath <classpath@gnu.org>
Subject: FP-strict methods (was: Quadratic and cubic equations)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 11:42:08 -0000

Sascha Brawer writes:
 > > "TT" == Tom Tromey <tromey@redhat.com> writes:
 > > "AH" == Andrew Haley <aph@redhat.com> writes:
 > 
 > AH> It looks to me like this is a test of exact java strictfp
 > AH> compliance.  gcj fails, because it isn't strictfp compliant.
 >  
 > TT> On top of that, to guarantee the same results everywhere we would need
 > TT> to declare both the test case and the code in Classpath `strictfp'.
 > 
 > AH> Yes.
 > 
 > I agree for the code in Classpath. But why the test case?
 > 
 > The tested method stores its results in a double[], which means that a
 > 'dastore' instruction gets executed.

No, not necessarily -- there's no requirement that the Java
programming language be implemented on a Java VM.  But I think you're
right in that IEEE doubles must be used for the argument.  Of course
gcj does that already.

The place gcj falls is in solveQuadratic when c (which actually has
the value 0.10000000000000001) is read from the argument array and
preserved in high precision through the calculation.  gcj is
performing a more accurate calculation than Java specifies.

 > Thus, I don't understand why the test case would need to be declared FP-
 > strict.

You're right.  It wouldn't make any difference in this case.

Andrew.



From MAILER-DAEMON Fri Jan 09 08:38:55 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aewqk-0003VN-NL
	for mharc-classpath@gnu.org; Fri, 09 Jan 2004 08:38:54 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aewqh-0003U9-3A
	for classpath@gnu.org; Fri, 09 Jan 2004 08:38:51 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aewq2-0003IM-BG
	for classpath@gnu.org; Fri, 09 Jan 2004 08:38:41 -0500
Received: from [217.8.192.20] (helo=smtp2.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AetEH-0000jQ-Qb
	for classpath@gnu.org; Fri, 09 Jan 2004 04:46:57 -0500
Received: from [192.168.1.33] (197.5.dyn-adsl.customer.ch.easynet.net
	[217.8.197.5]) by smtp2.mail.ch.easynet.net (Postfix) with ESMTP
	id 2CA6864696; Fri,  9 Jan 2004 09:45:26 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: GNU Classpath <classpath@gnu.org>
Date: Fri, 9 Jan 2004 09:45:26 +0100
Message-Id: <20040109084527.6021@smtp.mail.ch.easynet.net>
In-Reply-To: <87d69udk04.fsf@fleche.redhat.com>
References: <87d69udk04.fsf@fleche.redhat.com>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: Tom Tromey <tromey@redhat.com>
Subject: Re: JIT pluggability
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 13:38:52 -0000

Tom Tromey <tromey@redhat.com> wrote on Thu, 8 Jan 2004 17:48:59 -0700:

>[standard pluggable JIT interface]

This would indeed be quite nice, IMHO.

>Language choice for API.
>  The obvious choices being:
>  C     lowest common denominator
>  C++   next-to-lowest common denominator :-)  provides some
>        abstraction benefit, maybe
>  Java  using our own tools...

There are some users of Classpath who cannot execute any C code, such as=

Jaos and JNodeOS. If the pluggable JIT interface was in Java, these
systems would be able to use it (assuming that someone writes a JITter i=
n
Java, like IBM did with their Jalape=F1o/Jikes RVM).

Also, I'd assume that the interface would be rather narrow in the sense
that it wouldn't get invoked very often in the direction VM --> JIT;
probably once for each class or method to be compiled. But the JIT would=

presumably have to call a lot into the VM (for retrieving field offsets =
etc.).

>ABI Issues

According to IBM's publications and web pages, Jikes RVM seems to nicely=

cope with different ABIs (such as the slightly different calling
conventions for AIX and MacOS X). Maybe, their code could serve as an
example for how to structure the JIT interface so it can cope with
different ABIs.

Jaos works on top of an abstraction called "object kernel", which
basically is an API to garbage collection, synchronization, etc. Patrik
Reali might be able to tell the list more about this.

>General API
>
>- Verifier interface=3F
>  Does the verifier do all checking or does it impose some
>  requirements on the JIT/interpreter=3F  (Some verifiers choose to
>  delay some checking until interpretation.)
>  Does the JIT want/need information already computed by the verifier=3F=

>  For instance basic blocks or the type map at a given statement.

I think it would be very wasteful to compute this information twice, but=

it might be very difficult to define common data structures that are
suitable for everyone. Might it be sufficient if a verifier could store
some opaque reference for later use by the JIT=3F

AegisVM writes that they have developed a modular bytecode verification
architecture, but I didn't look at this yet.

Another thing that might be interesting to share is parts of a compiler
backend, such as assemblers.

-- Sascha

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





From MAILER-DAEMON Fri Jan 09 09:38:50 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AesT6-0006XJ-Pz
	for mharc-classpath@gnu.org; Fri, 09 Jan 2004 03:58:12 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AesSl-0006Us-2M
	for classpath@gnu.org; Fri, 09 Jan 2004 03:57:51 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AesSE-0006M7-2k
	for classpath@gnu.org; Fri, 09 Jan 2004 03:57:49 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AesSD-0006Lz-JF
	for classpath@gnu.org; Fri, 09 Jan 2004 03:57:17 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-033.ewetel.net
	[80.228.75.33])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i097tcUa013572;
	Fri, 9 Jan 2004 08:55:38 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AerUd-0003bn-00; Fri, 09 Jan 2004 08:55:43 +0100
Date: Fri, 9 Jan 2004 08:55:43 +0100
From: Michael Koch <konqueror@gmx.de>
To: graydon hoare <graydon@redhat.com>
Message-ID: <20040109075543.GA4727@mail.konqueror.de>
References: <3FFE1A39.1030509@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <3FFE1A39.1030509@redhat.com>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: [patch] fix to JLayeredPane
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 08:57:51 -0000

On Thu, Jan 08, 2004 at 10:04:25PM -0500, graydon hoare wrote:
> hi,
> 
> this patch adapts JLayeredPane to the changes djee@redhat.com recently 
> made to Container; notably he discovered that the drawing order in 
> container does not match sun's, so reversed it. re-reading the javadocs, 
> I see that I did not implement JLayeredPane correctly, and that its 
> documentation makes more sense considering this "correct" order he 
> discovered. so I've rewritten it to work in that order.
> 
> ok to apply?
> 
> (and before you ask, yes, the mauve tests are confirmed to work both 
> ways -- hooray for the "layer" abstraction -- but I'll be extending them 
> to check the underlying mapping too).
> 
> -graydon
> 
> 2004-01-08  Graydon Hoare  <graydon@redhat.com>
> 
> 	* javax/swing/JLayeredPane.java: Rewrite to accomodate
> 	djee@redhat.com's recent inverse ordering of Container elements.

Hi Graydon,


You added "<p> ... </p>" in several places where they are not needed
(when there is only one paragraph in the method documentation).

Just my 2 cents.


Michael



From MAILER-DAEMON Fri Jan 09 11:53:30 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aezt4-0003dH-9Y
	for mharc-classpath@gnu.org; Fri, 09 Jan 2004 11:53:30 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aezt1-0003cj-Kr
	for classpath@gnu.org; Fri, 09 Jan 2004 11:53:27 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AezsV-0003YD-My
	for classpath@gnu.org; Fri, 09 Jan 2004 11:53:26 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aezre-0003O2-AR
	for classpath@gnu.org; Fri, 09 Jan 2004 11:52:02 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id IAA32269;
	Fri, 9 Jan 2004 08:50:16 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 4E49B4F8478; Fri,  9 Jan 2004 08:42:10 -0700 (MST)
To: Sascha Brawer <brawer@dandelis.ch>
References: <16381.42533.93019.48319@cuddles.cambridge.redhat.com>
	<20040109071537.16818@smtp.mail.ch.easynet.net>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: I LIKE Aisle 7a.
Date: 09 Jan 2004 08:42:10 -0700
In-Reply-To: <20040109071537.16818@smtp.mail.ch.easynet.net>
Message-ID: <87vfnlcenh.fsf@fleche.redhat.com>
Lines: 14
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: GNU Classpath <classpath@gnu.org>
Subject: Re: FP-strict methods (was: Quadratic and cubic equations)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 16:53:28 -0000

>>>>> "Sascha" == Sascha Brawer <brawer@dandelis.ch> writes:

Sascha> All other ways for passing a double value between methods
Sascha> (such as dreturn, putfield, putstatic, invoke* etc.) require
Sascha> value set conversion, too.

Sascha> I certainly would not mind declaring test code fpstrict, but
Sascha> I'd really like to understand the reason. Can you enlighten
Sascha> me?

There was some laziness on my part, I didn't read the test case.  I
assumed it did some actual calculation.  Sorry about that.

Tom



From MAILER-DAEMON Fri Jan 09 15:26:57 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Af30j-0004hD-JJ
	for mharc-classpath@gnu.org; Fri, 09 Jan 2004 15:13:37 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AexAs-0007TC-Mj
	for classpath@gnu.org; Fri, 09 Jan 2004 08:59:42 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AexAJ-0007KE-W3
	for classpath@gnu.org; Fri, 09 Jan 2004 08:59:39 -0500
Received: from [24.25.9.100] (helo=ms-smtp-01-eri0.southeast.rr.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AexAJ-0007K1-HB
	for classpath@gnu.org; Fri, 09 Jan 2004 08:59:07 -0500
Received: from [10.0.0.2] (rdu57-9-048.nc.rr.com [66.57.9.48])
	by ms-smtp-01-eri0.southeast.rr.com (8.12.10/8.12.7) with ESMTP id
	i09CvYKY019851; Fri, 9 Jan 2004 07:57:35 -0500 (EST)
From: "C. Brian Jones" <cbj@gnu.org>
To: Sascha Brawer <brawer@dandelis.ch>
In-Reply-To: <20040109084527.6021@smtp.mail.ch.easynet.net>
References: <87d69udk04.fsf@fleche.redhat.com>
	<20040109084527.6021@smtp.mail.ch.easynet.net>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-cGdKtnG076qZeYfvhAaK"
Message-Id: <1073653051.19663.10.camel@lyta.haphazard.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-7) 
Date: Fri, 09 Jan 2004 07:57:34 -0500
X-Virus-Scanned: Symantec AntiVirus Scan Engine
Cc: Tom Tromey <tromey@redhat.com>, GNU Classpath <classpath@gnu.org>
Subject: Re: JIT pluggability
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: cbj@gnu.org
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 20:13:35 -0000


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

On Fri, 2004-01-09 at 03:45, Sascha Brawer wrote:
> Tom Tromey <tromey@redhat.com> wrote on Thu, 8 Jan 2004 17:48:59 -0700:
>=20
> >[standard pluggable JIT interface]
>=20
> This would indeed be quite nice, IMHO.
>=20
> >Language choice for API.
> >  The obvious choices being:
> >  C     lowest common denominator
> >  C++   next-to-lowest common denominator :-)  provides some
> >        abstraction benefit, maybe
> >  Java  using our own tools...

Going off on a tangent, are there other interfaces where reuse may be
possible such as JVMPI, JPDA, and the wire protocols for those... if the
hooks into the free JVMs are somewhat standard?  Essentially Sun wrapped
the native interfaces like JVMPI with Java in JPDA which made the tasks
of writing profilers or debuggers somewhat easier.  So these Java
wrappers should be the same if written to the C interfaces that
pre-existed JPDA but then all the JVMs need to support those
interfaces.  To what extent should Classpath provide parts of the
debugging/profiling solution?

Thanks,
Brian

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

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

iD8DBQA//qU6cEcmdY33uzYRAg8NAJ9Lwh0Xx5I98q4GIGZmK4UikiPmMACeOsaO
6rgPjLGHlw3OjjOb0K47X8I=
=fYhn
-----END PGP SIGNATURE-----

--=-cGdKtnG076qZeYfvhAaK--




From MAILER-DAEMON Fri Jan 09 18:04:56 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Af5S7-0007nT-OO
	for mharc-classpath@gnu.org; Fri, 09 Jan 2004 17:50:03 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Af4TC-00007e-MA
	for classpath@gnu.org; Fri, 09 Jan 2004 16:47:06 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Af381-0006O7-9O
	for classpath@gnu.org; Fri, 09 Jan 2004 15:21:40 -0500
Received: from [213.180.130.37] (helo=smtp3k.poczta.onet.pl)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Af380-0006N8-Cm
	for classpath@gnu.org; Fri, 09 Jan 2004 15:21:08 -0500
Received: from mizzar.MultiCon.PL ([213.77.83.2]:17924 "EHLO adres.pl")
	by kps3.test.onet.pl with ESMTP id <S2655383AbUAITT1>;
	Fri, 9 Jan 2004 20:19:27 +0100
Message-ID: <3FFEFEC5.3060000@adres.pl>
Date: Fri, 09 Jan 2004 20:19:34 +0100
From: Artur Biesiadowski <abies@adres.pl>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
	rv:1.5) Gecko/20030925
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: GNU Classpath Project <classpath@gnu.org>
References: <87d69udk04.fsf@fleche.redhat.com>
In-Reply-To: <87d69udk04.fsf@fleche.redhat.com>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: JIT pluggability
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: abies@pg.gda.pl
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 22:50:01 -0000

Tom Tromey wrote:

 > One thing we talked about is the possibility of defining a standard
 > pluggable JIT interface, making it easier to mix-and-match JITs and
 > interpreters across VMs.
[..snip...]

One quite important thing you have not stressed is gc interface - unless 
gc is supposed to be part of jit, there is a lot of issues to be solved 
(IMHO harder than jit <-> core jvm/classes interface).

For a jumpstart I would suggest looking at orp jit interface.
http://sourceforge.net/projects/orp/
Directory interface, all .h files there.

jit_runtime_support.h - number of jvm function which need to be called 
from _generated_ code

jit_intf.h - jit use these function to discover info about classes it 
needs to compile

jit_export.h - jvm call these methods on jit to request method 
compilation, synchronize gc events and discover stack info

There are gc interface there, but AFAIK, orp never managed to get them 
really pluggable - there was still a number of ifdefs in both jvm and 
jit code depending on type of gc used. In fact, I'm not sure if 
gc/jit/jvm can be separated through abstract interface and do not impose 
any restrictions on implementation.

While orp code uses C for interfaces, I'm not proposing sticking to it 
here - just to scavenge their headers to get a list of functions which 
were needed to implement working, pluggable jit.


Artur




From MAILER-DAEMON Fri Jan 09 20:45:22 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Af6tA-0004me-Uz
	for mharc-classpath@gnu.org; Fri, 09 Jan 2004 19:22:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Af6t5-0004li-21
	for classpath@gnu.org; Fri, 09 Jan 2004 19:21:59 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Af6sX-0004fv-Ai
	for classpath@gnu.org; Fri, 09 Jan 2004 19:21:56 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1Af4nN-0004lF-R2; Fri, 09 Jan 2004 17:07:57 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by mx20.gnu.org with esmtp (Exim 4.24)
	id 1Af3oz-000540-Em; Fri, 09 Jan 2004 16:05:33 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id OAA30788;
	Fri, 9 Jan 2004 14:05:24 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 02A094F824A; Fri,  9 Jan 2004 13:57:16 -0700 (MST)
To: cbj@gnu.org
References: <87d69udk04.fsf@fleche.redhat.com>
	<20040109084527.6021@smtp.mail.ch.easynet.net>
	<1073653051.19663.10.camel@lyta.haphazard.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Feel th' WHIRLING BUFFERS buffing away all that stress...
	Years of ROAD TAR gently washing away...
Date: 09 Jan 2004 13:57:16 -0700
In-Reply-To: <1073653051.19663.10.camel@lyta.haphazard.org>
Message-ID: <87n08wc02b.fsf@fleche.redhat.com>
Lines: 25
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: GNU Classpath <classpath@gnu.org>, Sascha Brawer <brawer@dandelis.ch>
Subject: Re: JIT pluggability
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 00:22:00 -0000

>>>>> "Brian" == C Brian Jones <cbj@gnu.org> writes:

Brian> Going off on a tangent, are there other interfaces where reuse
Brian> may be possible such as JVMPI, JPDA, and the wire protocols for
Brian> those... if the hooks into the free JVMs are somewhat standard?

That's a good question.  I haven't really looked too deeply into these
things.  gcj is a problem child for things like JDWP, JVMPI, etc --
they seem to be pretty hard to implement given our model :-(.  It
might still be interesting to try, or to write classes that handle the
protocol (e.g., we could write subclasses that use gdb to drive
libgcj, or some insane thing like that).


There are a couple other areas we can all cooperate in.  One we
already do -- we have a (more-or-less) shared jni.h.

Another area is the bytecode verifier.  The libgcj verifier can be
made to work with non-libgcj VMs fairly easily (I've already got a
patch to make it work inside gcj itself, a very different
environment).  It isn't perfect (still a known bug or two) and it is
written in C++, but it might still be suitable for many projects.  I'm
definitely interested in helping out projects that want to do this.

Tom



From MAILER-DAEMON Fri Jan 09 21:41:19 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Af8LT-000760-Fg
	for mharc-classpath@gnu.org; Fri, 09 Jan 2004 20:55:23 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Af6Gt-0003Qw-Lo
	for classpath@gnu.org; Fri, 09 Jan 2004 18:42:31 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Af5ya-0007V5-7Z
	for classpath@gnu.org; Fri, 09 Jan 2004 18:24:07 -0500
Received: from [204.138.111.138] (helo=smtp1.echo-on.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Af5yZ-0007RN-Mz
	for classpath@gnu.org; Fri, 09 Jan 2004 18:23:35 -0500
Received: from mantatest.com (perdition.echo-on.net [205.189.151.14])
	by smtp1.echo-on.net (Postfix) with SMTP id 1296815753
	for <classpath@gnu.org>; Fri,  9 Jan 2004 17:25:29 -0500 (EST)
Received: from scott ([192.168.22.60]) by mantatest.com ( IA Mail Server
	Version: 3.2.4. Build: 1096 ) ) ; Fri, 09 Jan 2004 17:22:04 -0500
Message-ID: <0e4401c3d6fe$7e188800$3c16a8c0@mantatest.com>
From: "Scott Gilbertson" <scottg@mantatest.com>
To: "graydon hoare" <graydon@redhat.com>
References: <8765irnxnu.fsf@dub.venge.net>
	<0e3301c3d6f0$d900cfb0$3c16a8c0@mantatest.com>
	<3FFF2323.4060105@redhat.com>
Date: Fri, 9 Jan 2004 17:18:22 -0500
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2800.1158
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1165
X-Mailman-Approved-At: Fri, 09 Jan 2004 20:55:21 -0500
Cc: classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: [PATCH] new font model for awt / java2d
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 01:33:38 -0000

> Scott Gilbertson wrote:
> > Do you suppose we should have a pure java subclass of ClasspathToolkit
(from
> > which to subclass XToolkit), or do I need to go ahead and get XToolkit
to
> > work as a subclass of ClasspathToolkit?

to which Graydon Hoare replied:
> hmm. tricky. the obvious ways forward that I can see for you are:
>
>    - make a ClasspathFontPeer with a special subclass name, which your
>      toolkit generates and your Graphics object recognizes, which only
>      supports the pre-1.4 semantics (which is broadly compatible with
>      the view of fonts available to xlib), and explodes when the user
>      tries to call any fancy new stuff. this would mostly be an
>      API-mapping task, with a bunch of cases that map to "throw ...".
>...

Thanks for the suggestions.  I guess the one reproduced above is the
simplest way to go.  I roughed something in today along those lines, but it
just crashes in a different place now (in the font metrics cache).  I'll
have to revert to the previous gcj/libjava code for a while, until I can
schedule a day or so to make a working implementation (next week I hope).
In the meantime nobody's beating down my door for xlib peer updates, and my
embedded app was working fine on the older code.




From MAILER-DAEMON Fri Jan 09 21:43:52 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Af91w-0000J8-Kn
	for mharc-classpath@gnu.org; Fri, 09 Jan 2004 21:39:16 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Af8Pc-00009v-6P
	for classpath@gnu.org; Fri, 09 Jan 2004 20:59:40 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Af6Ez-00030W-4q
	for classpath@gnu.org; Fri, 09 Jan 2004 18:41:04 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1Af5cK-0001yv-OG
	for classpath@gnu.org; Fri, 09 Jan 2004 18:00:36 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1Af4b8-0000pn-Nq
	for classpath@gnu.org; Fri, 09 Jan 2004 16:55:18 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i09LtCg22285;
	Fri, 9 Jan 2004 16:55:12 -0500
Received: from redhat.com (sebastian-int.corp.redhat.com [172.16.52.221])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i09LtCE25420; 
	Fri, 9 Jan 2004 16:55:12 -0500
Message-ID: <3FFF2323.4060105@redhat.com>
Date: Fri, 09 Jan 2004 16:54:43 -0500
From: graydon hoare <graydon@redhat.com>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.6b) Gecko/20031205 Thunderbird/0.4
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Scott Gilbertson <scottg@mantatest.com>
References: <8765irnxnu.fsf@dub.venge.net>
	<0e3301c3d6f0$d900cfb0$3c16a8c0@mantatest.com>
In-Reply-To: <0e3301c3d6f0$d900cfb0$3c16a8c0@mantatest.com>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: [PATCH] new font model for awt / java2d
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 02:39:13 -0000

Scott Gilbertson wrote:
> I got new code from CVS and my xlib application no longer works, because
> XToolkit isn't a subclass of ClasspathToolkit (i.e. it doesn't implement the
> ClasspathFontPeer stuff).

ah. well.. I don't know particularly what to say. I'm guessing your 
discomfort is partly because the Font that you were relying on using was 
an old pre-1.4 "strings and simple logical fonts" model, and we've 
migrated Font to the new precision model with glyph vectors, glyph 
metrics, complex layout, etc.

there's not an awful lot we can do here; classpath can only have one 
java.awt.Font, and either it claims (in its API) to implement the 
1.4-style or it doesn't. it's a requirement for modern javas, so I'm of 
the mind that it should be supported. the ClasspathFontPeer compromise 
was designed to let sascha's work on a pure-java version of it coexist 
with my native pango/cairo/freetype version. there wasn't much of a plan 
for a version which didn't support the new font model at all.

> Do you suppose we should have a pure java subclass of ClasspathToolkit (from
> which to subclass XToolkit), or do I need to go ahead and get XToolkit to
> work as a subclass of ClasspathToolkit?

hmm. tricky. the obvious ways forward that I can see for you are:

   - make a ClasspathFontPeer with a special subclass name, which your
     toolkit generates and your Graphics object recognizes, which only
     supports the pre-1.4 semantics (which is broadly compatible with
     the view of fonts available to xlib), and explodes when the user
     tries to call any fancy new stuff. this would mostly be an
     API-mapping task, with a bunch of cases that map to "throw ...".

   - try to integrate sascha's pure-java font code into yours, eg. by
     rendering into offscreen buffers and copying tiles into xlib. this
     would require you to have, I think, a cubic bezier scanline
     converter at minimum (which you'll need for your Graphics2D
     anyways), but would also eventually require adding hinting
     support. I don't know where sascha is at on this stuff.

   - if you're comfortable with xlib, maybe make a version which uses
     xft+xlib, but not cairo/pango/freetype as my version did.

> Is this stuff fairly stable (i.e. if I get xlib working with today's code,
> is it likely to stay functional for a while)?

I have no intention to change ClasspathFontPeer / ClasspathToolkit any 
further than strictly necessary; this code was put in place to permit 
multiple toolkit authors to fumble along our own ways, trying different 
strategies for font<->graphics<->toolkit communication without stepping 
on each others' feet too much. if it's not right for you, feel free to 
suggest changes.

-graydon



From MAILER-DAEMON Sat Jan 10 03:11:15 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfEDD-0005LG-F2
	for mharc-classpath@gnu.org; Sat, 10 Jan 2004 03:11:15 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfE7s-0004IH-BT
	for classpath@gnu.org; Sat, 10 Jan 2004 03:05:44 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Af6Eb-0002u0-W1
	for classpath@gnu.org; Fri, 09 Jan 2004 18:40:42 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1Af5Hf-00058x-25
	for classpath@gnu.org; Fri, 09 Jan 2004 17:39:15 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1Af4Jc-0008Al-Qu
	for classpath@gnu.org; Fri, 09 Jan 2004 16:37:12 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id OAA12449;
	Fri, 9 Jan 2004 14:37:09 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 4F3C84F82A3; Fri,  9 Jan 2004 14:29:02 -0700 (MST)
To: graydon hoare <graydon@redhat.com>
References: <3FFE1A39.1030509@redhat.com>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Send your questions to ``ASK ZIPPY'', Box 40474,
	San Francisco, CA 94140, USA
Date: 09 Jan 2004 14:29:02 -0700
In-Reply-To: <3FFE1A39.1030509@redhat.com>
Message-ID: <87isjkbyld.fsf@fleche.redhat.com>
Lines: 10
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: [patch] fix to JLayeredPane
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 08:11:13 -0000

>>>>> "graydon" == graydon hoare <graydon@redhat.com> writes:

graydon> this patch adapts JLayeredPane to the changes djee@redhat.com
graydon> recently made to Container

graydon> ok to apply?

Yes, thanks.

Tom



From MAILER-DAEMON Sat Jan 10 04:15:58 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfFDq-0002Ii-0s
	for mharc-classpath@gnu.org; Sat, 10 Jan 2004 04:15:58 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfD7V-0000Tf-7a
	for classpath@gnu.org; Sat, 10 Jan 2004 02:01:17 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfCxI-00070F-Do
	for classpath@gnu.org; Sat, 10 Jan 2004 01:51:15 -0500
Received: from [24.25.9.100] (helo=ms-smtp-01-eri0.southeast.rr.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AfCC4-0005RG-Vl
	for classpath@gnu.org; Sat, 10 Jan 2004 01:01:57 -0500
Received: from [10.0.0.2] (rdu57-9-048.nc.rr.com [66.57.9.48])
	by ms-smtp-01-eri0.southeast.rr.com (8.12.10/8.12.7) with ESMTP id
	i0A50PKY028349
	for <classpath@gnu.org>; Sat, 10 Jan 2004 00:00:25 -0500 (EST)
From: "C. Brian Jones" <cbj@gnu.org>
To: classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-Cx70gLS5JokLcHAf2T9n"
Message-Id: <1073710824.19663.27.camel@lyta.haphazard.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-7) 
Date: Sat, 10 Jan 2004 00:00:25 -0500
X-Virus-Scanned: Symantec AntiVirus Scan Engine
Subject: Serialization compatibility testing
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: cbj@gnu.org
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 09:15:56 -0000


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

All,

I've been working a little lately on some tools I once added to japi for
serialization compatibility testing.  I'm pretty close to having
something useful, just wondering if anyone is interested in using these
for checking compatibility?  Here's the list of the files that are the
same when compared to Sun's JDK 1.4.1 for Kaffe 1.1.3.  These .ser files
are object serializations.  I've omitted the things that are missing in
Kaffe or exist in Kaffe but not the JDK.  The list of classes the tool
attempted to serialize is based on Java 1.4 documented serializable
classes.  I'm looking forward to adding a tool to attempt to read
objects written by Sun's JDK, from version 1.1 through 1.4 into the
appropriate object type.  Eventually I'll be able to combine these
building block type tools to comprehensively state serialization
compatibility for a JVM to Sun's JDK.  I'll also have fun checking Sun.=20
:)

I've thought about trying to add this to Mauve.  Thoughts?  New module?

kaffe113/java/security/Permission.ser identical
kaffe113/java/security/Provider.ser identical
kaffe113/java/security/BasicPermission.ser identical
kaffe113/java/security/PermissionCollection.ser identical
kaffe113/java/security/IdentityScope.ser identical
kaffe113/java/security/Signer.ser identical
kaffe113/java/security/SecureRandomSpi.ser identical
kaffe113/java/security/cert/CertPath.ser identical
kaffe113/java/security/cert/X509Certificate.ser identical
kaffe113/java/security/cert/CertPath$CertPathRep.ser identical
kaffe113/java/security/cert/Certificate.ser identical
kaffe113/java/security/cert/Certificate$CertificateRep.ser identical
kaffe113/java/security/Identity.ser identical
kaffe113/java/net/SocketAddress.ser identical
kaffe113/java/util/TreeSet.ser identical
kaffe113/java/util/LinkedList.ser identical
kaffe113/java/util/Stack.ser identical
kaffe113/java/util/TimeZone.ser identical
kaffe113/java/util/Hashtable.ser identical
kaffe113/java/util/TreeMap.ser identical
kaffe113/java/util/BitSet.ser identical
kaffe113/java/util/IdentityHashMap.ser identical
kaffe113/java/util/Calendar.ser identical
kaffe113/java/util/EventObject.ser identical
kaffe113/java/util/Vector.ser identical
kaffe113/java/text/DateFormat.ser identical
kaffe113/java/text/Format.ser identical
kaffe113/java/text/NumberFormat.ser identical
kaffe113/java/awt/Insets.ser identical
kaffe113/java/awt/dnd/MouseDragGestureRecognizer.ser identical
kaffe113/java/awt/dnd/DragGestureRecognizer.ser identical
kaffe113/java/awt/CheckboxGroup.ser identical
kaffe113/java/awt/GraphicsConfigTemplate.ser identical
kaffe113/java/awt/Dimension.ser identical
kaffe113/java/awt/Rectangle.ser identical
kaffe113/java/awt/GridLayout.ser identical
kaffe113/java/awt/Point.ser identical
kaffe113/java/awt/ComponentOrientation.ser identical
kaffe113/java/awt/image/renderable/ParameterBlock.ser identical
kaffe113/java/awt/color/ColorSpace.ser identical
kaffe113/java/awt/Component.ser identical
kaffe113/java/awt/MenuComponent.ser identical
kaffe113/java/lang/Integer.ser identical
kaffe113/java/lang/VirtualMachineError.ser identical
kaffe113/java/lang/Byte.ser identical
kaffe113/java/lang/Short.ser identical
kaffe113/java/lang/Character.ser identical
kaffe113/java/lang/Float.ser identical
kaffe113/java/lang/Double.ser identical
kaffe113/java/lang/String.ser identical
kaffe113/java/lang/Number.ser identical
kaffe113/java/lang/Long.ser identical
kaffe113/java/lang/StringBuffer.ser identical
kaffe113/java/beans/PropertyChangeSupport.ser identical
kaffe113/java/beans/PropertyChangeEvent.ser identical
kaffe113/java/beans/beancontext/BeanContextEvent.ser identical
kaffe113/java/beans/beancontext/BeanContextServicesSupport$BCSSServiceProvi=
der.ser identical
kaffe113/java/beans/beancontext/BeanContextSupport$BCSChild.ser
identical
kaffe113/java/beans/beancontext/BeanContextServicesSupport$BCSSChild.ser
identical
kaffe113/java/beans/VetoableChangeSupport.ser identical
kaffe113/java/rmi/server/RemoteStub.ser identical
kaffe113/java/rmi/server/RemoteObject.ser identical
kaffe113/java/rmi/server/RemoteServer.ser identical
kaffe113/java/rmi/activation/Activatable.ser identical
kaffe113/java/rmi/activation/ActivationGroup.ser identical
kaffe113/java/io/ObjectStreamException.ser identical
kaffe113/javax/rmi/CORBA/ClassDesc.ser identical
kaffe113/javax/rmi/CORBA/Stub.ser identical
kaffe113/javax/naming/ldap/LdapReferralException.ser identical
kaffe113/javax/naming/StringRefAddr.ser identical
kaffe113/javax/naming/NamingSecurityException.ser identical
kaffe113/javax/naming/NameClassPair.ser identical
kaffe113/javax/naming/RefAddr.ser identical
kaffe113/javax/naming/ReferralException.ser identical

Brian
--=20
Brian Jones <cbj@gnu.org>

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

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

iD8DBQA//4bocEcmdY33uzYRAvrCAJ9OvIwTeecJeVuQABA+i0RqXZM5qACbBsBh
WfTfPIENMVOkKMGS57Mviq4=
=aOh5
-----END PGP SIGNATURE-----

--=-Cx70gLS5JokLcHAf2T9n--




From MAILER-DAEMON Sat Jan 10 06:27:07 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfGzH-0005rs-1K
	for mharc-classpath@gnu.org; Sat, 10 Jan 2004 06:09:03 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfE7V-0004Bu-It
	for classpath@gnu.org; Sat, 10 Jan 2004 03:05:21 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfE5j-0003j1-Ap
	for classpath@gnu.org; Sat, 10 Jan 2004 03:04:02 -0500
Received: from [65.212.118.136] (helo=ai.uwf.edu)
	by monty-python.gnu.org with esmtp (Exim 4.24)
	id 1AfE41-0003Fq-CV; Sat, 10 Jan 2004 03:01:45 -0500
Received: by ai.uwf.edu (CommuniGate Pro PIPE 4.1.8)
	with PIPE id 2644822; Sat, 10 Jan 2004 01:00:44 -0600
Received: from [68.14.176.92] (account nsuri HELO Darkmatter)
	by ai.uwf.edu (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 2644821 for classpath@gnu.org;
	Sat, 10 Jan 2004 01:00:41 -0600
Message-ID: <002101c3d747$64e90af0$0227020a@Darkmatter>
From: "Niranjan Suri" <nsuri@ai.uwf.edu>
To: <classpath@gnu.org>
References: <87d69udk04.fsf@fleche.redhat.com>
Date: Sat, 10 Jan 2004 01:00:12 -0600
Organization: University of West Florida
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2720.3000
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2727.1300
X-Mailman-Approved-At: Sat, 10 Jan 2004 06:08:59 -0500
Subject: Re: JIT pluggability
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 09:20:26 -0000

Hi All,

I wanted to point out some existing work in this area - OpenJIT 2 - being
developed at the Tokyo Institute of Technology by Fuyuhiko Maruyama. Here is
a link to his research page:
http://matsu-www.is.titech.ac.jp/~maruyama/research.html

Fuyuhiko's research is primarily focused on developing VM-independent JIT
compilers. To this end, he is experimenting with several VMs including the
Aroma VM (a research VM primarily developed by me).

So far, I have been a passive observer on the Classpath list. However, I
would be interested in contributing to an effort to define such a standard
interface. If there is a spinoff group, please let me know.

Thanks!

Sincerely,
Niranjan
----------------------------------------------------------------------
Niranjan Suri                                            nsuri@ihmc.us
Institute for Human & Machine Cognition              40 S. Alcaniz St.
University of West Florida                         Pensacola, FL 32502


----- Original Message -----
From: "Tom Tromey" <tromey@redhat.com>
To: "GNU Classpath Project" <classpath@gnu.org>
Sent: Thursday, January 08, 2004 6:48 PM
Subject: JIT pluggability


> A few of us (at least Dalibor, Grzegorz, Mark, and me) have talked a
> bit on irc about other possibilities for collaboration in the free
> Java.  Classpath has been such a success that it seems logical that we
> should start looking for ways to expand our sphere of collaboration.
>
> One thing we talked about is the possibility of defining a standard
> pluggable JIT interface, making it easier to mix-and-match JITs and
> interpreters across VMs.
>
> To that end I wrote up a short bullet list of problem areas, mostly
> technical things that the VM would need to somehow export to a
> pluggable JIT.
>
> Tom
>
>
> License.
>   Does it even make sense to have a license for an API?
>   What licenses are appropriate for a JIT plugin?
>
> Language choice for API.
>   The obvious choices being:
>   C     lowest common denominator
>   C++   next-to-lowest common denominator :-)  provides some
>         abstraction benefit, maybe
>   Java  using our own tools...
>
> ABI Issues
>
> - Object layout, including array layout, field offsets, etc
> - Method call ABI
> - vtable layout
> - Interface calls.  Some systems have constant-time interface calls.
>   I suggest we require a simple name lookup, and also provide an
>   interface to constant-time calls for JITs that can take advantage of
>   them.
> - Exception handling - throwing and catching.
> - Name lookup, eg class, method, etc.
> - Garbage collector interface.
> - Synchronization API
> - API for "new"
> - Cast checking API
> - Array assignment API
> - Class initialization API
>
>
> General API
>
> - Verifier interface?
>   Does the verifier do all checking or does it impose some
>   requirements on the JIT/interpreter?  (Some verifiers choose to
>   delay some checking until interpretation.)
>   Does the JIT want/need information already computed by the verifier?
>   For instance basic blocks or the type map at a given statement.
>
> - Some kind of negotiation API.  The JVM can indicate its
>   requirements, the JIT can indicate its capabilities.  Non-matching
>   JITs will be ignored by the JVM.
>
>   For instance, gcj is pretty much tied to a conservative GC; if
>   there were a JIT that couldn't work in this environment it wouldn't
>   make sense to try to load it into libgcj.
>
>
> Lower Priority
>
> - Debugging interface
> - Optimization interface?
>     Keeping track of quality of compiler?
>     Bookkeeping for profiling?
>
>
> _______________________________________________
> Classpath mailing list
> Classpath@gnu.org
> http://mail.gnu.org/mailman/listinfo/classpath
>




From MAILER-DAEMON Sat Jan 10 06:27:15 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfGzH-0005sH-MO
	for mharc-classpath@gnu.org; Sat, 10 Jan 2004 06:09:03 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfGSr-0006zZ-Aj
	for classpath@gnu.org; Sat, 10 Jan 2004 05:35:33 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfGPj-0006FW-PF
	for classpath@gnu.org; Sat, 10 Jan 2004 05:32:50 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AfGNv-0005xt-0b; Sat, 10 Jan 2004 05:30:27 -0500
Received: from [213.49.17.120] (helo=pigsty.cats.cradle)
	by mx20.gnu.org with esmtp (Exim 4.24)
	id 1AfFLl-00080Z-3h; Sat, 10 Jan 2004 04:24:09 -0500
Received: from there (localhost.cats.cradle [127.0.0.1])
	by pigsty.cats.cradle (8.12.6/8.11.6) with SMTP id i0A9SOSX027712;
	Sat, 10 Jan 2004 10:28:25 +0100 (CET)
	(envelope-from chris.gray@kiffer.be)
Message-Id: <200401100928.i0A9SOSX027712@pigsty.cats.cradle>
Content-Type: text/plain;
  charset="iso-8859-1"
From: Chris Gray <chris.gray@kiffer.be>
To: cbj@gnu.org, classpath@gnu.org
Date: Sat, 10 Jan 2004 10:28:24 +0100
X-Mailer: KMail [version 1.3]
References: <1073710824.19663.27.camel@lyta.haphazard.org>
In-Reply-To: <1073710824.19663.27.camel@lyta.haphazard.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Mailman-Approved-At: Sat, 10 Jan 2004 06:08:59 -0500
Cc: 
Subject: Re: Serialization compatibility testing
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 10:35:34 -0000

On Saturday 10 January 2004 06:00, C. Brian Jones wrote:
> All,
>
> I've been working a little lately on some tools I once added to japi for
> serialization compatibility testing.  I'm pretty close to having
> something useful, just wondering if anyone is interested in using these
> for checking compatibility?  

Yes. :)

> Here's the list of the files that are the
> same when compared to Sun's JDK 1.4.1 for Kaffe 1.1.3.  These .ser files
> are object serializations.  I've omitted the things that are missing in
> Kaffe or exist in Kaffe but not the JDK.  The list of classes the tool
> attempted to serialize is based on Java 1.4 documented serializable
> classes.  I'm looking forward to adding a tool to attempt to read
> objects written by Sun's JDK, from version 1.1 through 1.4 into the
> appropriate object type.  Eventually I'll be able to combine these
> building block type tools to comprehensively state serialization
> compatibility for a JVM to Sun's JDK.  I'll also have fun checking Sun.
>
> :)
>
> I've thought about trying to add this to Mauve.  Thoughts?  New module?

This would be a Good Thing. Wonka's test suite contains some tests which were 
originally written for JUnit - you can find them in Wonka CVS under 
too/mauve/somewhere, or I could parcel them up and mail them to you; you 
might find some ideas you can use.

> [...]

-- 
Chris Gray                                  /k/ Embedded Java Solutions
Embedded & Mobile Java, OSGi              http://www.kiffer.be/k/
chris.gray@kiffer.be                                      +32 477 599 703



From MAILER-DAEMON Sat Jan 10 06:43:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfHWT-0005mC-19
	for mharc-classpath@gnu.org; Sat, 10 Jan 2004 06:43:21 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfHUl-0005CT-3n
	for classpath@gnu.org; Sat, 10 Jan 2004 06:41:35 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfHKD-0003H1-5Q
	for classpath@gnu.org; Sat, 10 Jan 2004 06:31:12 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AfHJe-00034s-Um
	for classpath@gnu.org; Sat, 10 Jan 2004 06:30:07 -0500
Received: from [213.49.17.120] (helo=pigsty.cats.cradle)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AfGJ5-000222-FM
	for classpath@gnu.org; Sat, 10 Jan 2004 05:25:27 -0500
Received: from there (localhost.cats.cradle [127.0.0.1])
	by pigsty.cats.cradle (8.12.6/8.11.6) with SMTP id i0AATgSX027757;
	Sat, 10 Jan 2004 11:29:43 +0100 (CET)
	(envelope-from chris.gray@kiffer.be)
Message-Id: <200401101029.i0AATgSX027757@pigsty.cats.cradle>
Content-Type: text/plain;
  charset="iso-8859-1"
From: Chris Gray <chris.gray@kiffer.be>
To: Sascha Brawer <brawer@dandelis.ch>, GNU Classpath <classpath@gnu.org>
Date: Sat, 10 Jan 2004 11:29:42 +0100
X-Mailer: KMail [version 1.3]
References: <87d69udk04.fsf@fleche.redhat.com>
	<20040109084527.6021@smtp.mail.ch.easynet.net>
In-Reply-To: <20040109084527.6021@smtp.mail.ch.easynet.net>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-MIME-Autoconverted: from 8bit to quoted-printable by pigsty.cats.cradle id
	i0AATgSX027757
Cc: Tom Tromey <tromey@redhat.com>
Subject: Re: JIT pluggability
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 11:43:15 -0000

On Friday 09 January 2004 09:45, Sascha Brawer wrote:
> Tom Tromey <tromey@redhat.com> wrote on Thu, 8 Jan 2004 17:48:59 -0700:
> >[standard pluggable JIT interface]
>
> This would indeed be quite nice, IMHO.

IMHO2 (that should probably be 3 or 4 by now).

I suspect that the interface to GC will be hard to define, though. There =
are=20
several possible models, including:
  1. The mutator (JITted code) tells GC, "hey! I just mutated something!"=
,=20
whereupon GC either (a) aborts the current attempt to mark the heap or (b=
)=20
makes a note to re-mark the affected objects before doing a sweep.
  2. No one is allowed to mutate anything during the marking process, so =
a=20
protocol is devised which ensures this without deadlock.

And that's only counting mark-and-sweep collectors ...

> >Language choice for API.
> >  The obvious choices being:
> >  C     lowest common denominator
> >  C++   next-to-lowest common denominator :-)  provides some
> >        abstraction benefit, maybe
> >  Java  using our own tools...
>
> There are some users of Classpath who cannot execute any C code, such a=
s
> Jaos and JNodeOS. If the pluggable JIT interface was in Java, these
> systems would be able to use it (assuming that someone writes a JITter =
in
> Java, like IBM did with their Jalape=F1o/Jikes RVM).
>
> Also, I'd assume that the interface would be rather narrow in the sense
> that it wouldn't get invoked very often in the direction VM --> JIT;
> probably once for each class or method to be compiled. But the JIT woul=
d
> presumably have to call a lot into the VM (for retrieving field offsets
> etc.).
>
> >ABI Issues
>
> According to IBM's publications and web pages, Jikes RVM seems to nicel=
y
> cope with different ABIs (such as the slightly different calling
> conventions for AIX and MacOS X). Maybe, their code could serve as an
> example for how to structure the JIT interface so it can cope with
> different ABIs.
>
> Jaos works on top of an abstraction called "object kernel", which
> basically is an API to garbage collection, synchronization, etc. Patrik
> Reali might be able to tell the list more about this.
>
> >General API
> >
> >- Verifier interface?
> >  Does the verifier do all checking or does it impose some
> >  requirements on the JIT/interpreter?  (Some verifiers choose to
> >  delay some checking until interpretation.)
> >  Does the JIT want/need information already computed by the verifier?
> >  For instance basic blocks or the type map at a given statement.
>
> I think it would be very wasteful to compute this information twice, bu=
t
> it might be very difficult to define common data structures that are
> suitable for everyone. Might it be sufficient if a verifier could store
> some opaque reference for later use by the JIT?
>
> AegisVM writes that they have developed a modular bytecode verification
> architecture, but I didn't look at this yet.
>
> Another thing that might be interesting to share is parts of a compiler
> backend, such as assemblers.
>
> -- Sascha
>
> Sascha Brawer, brawer@dandelis.ch, http://www.dandelis.ch/people/brawer=
/
>
>
>
>
> _______________________________________________
> Classpath mailing list
> Classpath@gnu.org
> http://mail.gnu.org/mailman/listinfo/classpath

--=20
Chris Gray                                  /k/ Embedded Java Solutions
Embedded & Mobile Java, OSGi              http://www.kiffer.be/k/
chris.gray@kiffer.be                                      +32 477 599 703



From MAILER-DAEMON Sat Jan 10 13:20:00 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfNiK-0006ON-Bp
	for mharc-classpath@gnu.org; Sat, 10 Jan 2004 13:20:00 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfNiH-0006O5-Km
	for classpath@gnu.org; Sat, 10 Jan 2004 13:19:57 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfNhl-0006Ft-Q5
	for classpath@gnu.org; Sat, 10 Jan 2004 13:19:56 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AfNhl-0006Fm-Ao
	for classpath@gnu.org; Sat, 10 Jan 2004 13:19:25 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-034.ewetel.net
	[80.228.82.34])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0AHHrUa019429;
	Sat, 10 Jan 2004 18:17:54 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AfMkK-00027P-00; Sat, 10 Jan 2004 18:18:01 +0100
Date: Sat, 10 Jan 2004 18:18:00 +0100
From: Michael Koch <konqueror@gmx.de>
To: David =?iso-8859-15?Q?B=E9langer?= <dbelan2@cs.mcgill.ca>
Message-ID: <20040110171800.GA8040@mail.konqueror.de>
References: <20031125014456.GA28272@pinto.cs.mcgill.ca>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: inline
In-Reply-To: <20031125014456.GA28272@pinto.cs.mcgill.ca>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Content-Transfer-Encoding: quoted-printable
X-MIME-Autoconverted: from 8bit to quoted-printable by mail2.ewetel.de id
	i0AHHrUa019429
Cc: classpath@gnu.org
Subject: Re: File.list()
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 18:19:58 -0000

On Mon, Nov 24, 2003 at 08:44:56PM -0500, David B=E9langer wrote:
>=20
> Hi,
>=20
> This may be some trace left from a old bug.
>=20
> File: java/io/File.java.
>=20
>=20
> A long time ago, there was a bug with listInternals as it was
> not returning an empty array for "no files".  This has been
> fixed since then and listInternals returns only NULL on error.
> If there are no files, it correctly returns a String array
> of length 0.
>=20
> The current implementation of Filelists is as follows:
>=20
> ---------
>   public String[] list (FilenameFilter filter)
>   {
>     checkRead ();
>=20
>     // Get the list of files
>     String list_path =3D PlatformHelper.removeTailSeparator(path);
>     File dir =3D new File(list_path);
>=20
>     if (! dir.exists() || ! dir.isDirectory() ) return null;
>    =20
>     String files[] =3D listInternal(list_path);
>    =20
> --> if (files =3D=3D null)
> -->   return new String[0];
>     if (filter =3D=3D null)
>       return files;
> ------------
>=20
> Note: From the current implementation of listInternal, it will return N=
ULL
>       only on error, and it will correctly return "new String[0]" if
>       the directory is empty.  (I checked with gdb to make sure).
>=20
> So, I suggest something like:
>     if (files =3D=3D null) {
>       throw new IOException("Unknown IO Exception");
>     }
> I am assuming some JCL_* functions set exceptions on errors (did not st=
udy
> them) but this may get other exceptional cases.
>=20
>=20
> Let me know if it makes sense.

Sorry for answering so late.

According to SUNs JDK 1.4.2 online api documentation this method doesnt
throw any exception except SecurityException. Throwing an IOException
would be wrong.

I think the code you marked above is wrong because it hides an error in
listInternal with an empty file list. list(FilenameFilter filter) should
return null.

Just my 2 cents.


Michael



From MAILER-DAEMON Sat Jan 10 18:49:59 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfSre-00007J-FS
	for mharc-classpath@gnu.org; Sat, 10 Jan 2004 18:49:58 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfSrW-0008To-R8
	for classpath@gnu.org; Sat, 10 Jan 2004 18:49:50 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfSqv-0008Hk-TD
	for classpath@gnu.org; Sat, 10 Jan 2004 18:49:45 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AfSpH-0007rJ-QC
	for classpath@gnu.org; Sat, 10 Jan 2004 18:47:31 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-034.ewetel.net
	[80.228.82.34])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0AMk1HA010797
	for <classpath@gnu.org>; Sat, 10 Jan 2004 23:46:01 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AfRrs-0002wz-00
	for <classpath@gnu.org>; Sat, 10 Jan 2004 23:46:08 +0100
From: Michael Koch <konqueror@gmx.de>
To: classpath@gnu.org
Date: Sat, 10 Jan 2004 23:49:22 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_yFIAAX9ki0eqtEZ"
Message-Id: <200401102349.22756.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: file stuff
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 23:49:53 -0000


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

Hi list,


I wanna start a new trend on this mailing list now. I wanna ask for approving 
the attached patch. This patch fixes two bugs with files.

1) java.io.File.list() uses an internal method called listInternal(). This 
methods returns null in the error case. list() now converts this to a 
String[0] array which is similar to an empty directory. This behaviour is 
incorrect. We should return the null in the error case.

2) Java_java_io_File_listInternal doest release local references to a newly 
created string. This patch fixes this.

Please review and comment.

mjw: Okay to commit ?


Michael


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

	* java/io/File.java
	(list): Return null in error case.
	* native/jni/java-io/java_io_File.c
	(Java_java_io_File_listInternal): release local reference.


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

Index: java/io/File.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/File.java,v
retrieving revision 1.37
diff -u -b -B -r1.37 File.java
--- java/io/File.java	21 Oct 2003 14:53:54 -0000	1.37
+++ java/io/File.java	10 Jan 2004 22:39:01 -0000
@@ -670,8 +670,10 @@
     
     String files[] = listInternal(list_path);
     
+    // Check if an error occured in listInternal().
     if (files == null)
-      return new String[0];
+      return null;
+
     if (filter == null)
       return files;
     
Index: native/jni/java-io/java_io_File.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-io/java_io_File.c,v
retrieving revision 1.9
diff -u -b -B -r1.9 java_io_File.c
--- native/jni/java-io/java_io_File.c	19 Aug 2003 08:59:56 -0000	1.9
+++ native/jni/java-io/java_io_File.c	10 Jan 2004 22:39:01 -0000
@@ -682,6 +682,9 @@
 
       /* save into array */
       (*env)->SetObjectArrayElement(env, filearray, i, str);
+
+      /* delete local reference */
+      (*env)->DeleteLocalRef(env, str);
     }
 
   /* free resources */

--Boundary-00=_yFIAAX9ki0eqtEZ--




From MAILER-DAEMON Sun Jan 11 14:17:21 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Afl5M-0000zr-OH
	for mharc-classpath@gnu.org; Sun, 11 Jan 2004 14:17:20 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Afl5K-0000zK-EO
	for classpath@gnu.org; Sun, 11 Jan 2004 14:17:18 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Afl4o-0000mX-NP
	for classpath@gnu.org; Sun, 11 Jan 2004 14:17:17 -0500
Received: from [24.196.18.187] (helo=InterJet.dellroad.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Afl4o-0000lH-94
	for classpath@gnu.org; Sun, 11 Jan 2004 14:16:46 -0500
Received: from arch20m.dellroad.org (arch20m.dellroad.org [10.2.2.20])
	by InterJet.dellroad.org (8.9.1a/8.9.1) with ESMTP id MAA29017;
	Sun, 11 Jan 2004 12:04:31 -0600 (CST)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.8/8.12.6) with ESMTP id i0BI4UoU049876;
	Sun, 11 Jan 2004 12:04:31 -0600 (CST)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.8/8.12.8/Submit) id i0BI4UTl049875;
	Sun, 11 Jan 2004 12:04:30 -0600 (CST)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200401111804.i0BI4UTl049875@arch20m.dellroad.org>
In-Reply-To: <200401102349.22756.konqueror@gmx.de>
To: Michael Koch <konqueror@gmx.de>
Date: Sun, 11 Jan 2004 12:04:30 -0600 (CST)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Cc: classpath@gnu.org
Subject: Re: FYI: Patch: file stuff
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jan 2004 19:17:19 -0000

Michael Koch wrote:
> I wanna start a new trend on this mailing list now. I wanna ask for approving 
> the attached patch. This patch fixes two bugs with files.
> 
> 1) java.io.File.list() uses an internal method called listInternal(). This 
> methods returns null in the error case. list() now converts this to a 
> String[0] array which is similar to an empty directory. This behaviour is 
> incorrect. We should return the null in the error case.
> 
> 2) Java_java_io_File_listInternal doest release local references to a newly 
> created string. This patch fixes this.

FYI,
I already reported #2 as bug #6989:

 https://savannah.gnu.org/bugs/?func=detailitem&item_id=6989

Please close the bug if you commit your fix.

-Archie

__________________________________________________________________________
Archie Cobbs     *    Halloo Communications    *     http://www.halloo.com



From MAILER-DAEMON Sun Jan 11 14:25:52 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AflDb-0001JB-AP
	for mharc-classpath@gnu.org; Sun, 11 Jan 2004 14:25:51 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AflDV-0001Hk-Mr
	for classpath@gnu.org; Sun, 11 Jan 2004 14:25:45 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AflCy-0000iB-B3
	for classpath@gnu.org; Sun, 11 Jan 2004 14:25:44 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AflCy-0000h2-2d
	for classpath@gnu.org; Sun, 11 Jan 2004 14:25:12 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AfkDy-0004iV-U1
	for classpath@gnu.org; Sun, 11 Jan 2004 13:22:11 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-030.ewetel.net
	[80.228.80.30])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0BILvUa003530;
	Sun, 11 Jan 2004 19:21:57 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AfkDt-0000Tn-00; Sun, 11 Jan 2004 19:22:05 +0100
Date: Sun, 11 Jan 2004 19:22:05 +0100
From: Michael Koch <konqueror@gmx.de>
To: Archie Cobbs <archie@dellroad.org>
Message-ID: <20040111182205.GA1279@mail.konqueror.de>
References: <200401102349.22756.konqueror@gmx.de>
	<200401111804.i0BI4UTl049875@arch20m.dellroad.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200401111804.i0BI4UTl049875@arch20m.dellroad.org>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: classpath@gnu.org, Michael Koch <konqueror@gmx.de>
Subject: Re: FYI: Patch: file stuff
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jan 2004 19:25:46 -0000

On Sun, Jan 11, 2004 at 12:04:30PM -0600, Archie Cobbs wrote:
> Michael Koch wrote:
> > I wanna start a new trend on this mailing list now. I wanna ask for approving 
> > the attached patch. This patch fixes two bugs with files.
> > 
> > 1) java.io.File.list() uses an internal method called listInternal(). This 
> > methods returns null in the error case. list() now converts this to a 
> > String[0] array which is similar to an empty directory. This behaviour is 
> > incorrect. We should return the null in the error case.
> > 
> > 2) Java_java_io_File_listInternal doest release local references to a newly 
> > created string. This patch fixes this.
> 
> FYI,
> I already reported #2 as bug #6989:
> 
>  https://savannah.gnu.org/bugs/?func=detailitem&item_id=6989
> 
> Please close the bug if you commit your fix.

I found this change in a post on the mailing list but I forgot to look
into BTS. Sorry.


Michael



From MAILER-DAEMON Sun Jan 11 16:36:48 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfnGK-0003lV-7c
	for mharc-classpath@gnu.org; Sun, 11 Jan 2004 16:36:48 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfnGH-0003kv-JC
	for classpath@gnu.org; Sun, 11 Jan 2004 16:36:45 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfnFl-0003bR-Hv
	for classpath@gnu.org; Sun, 11 Jan 2004 16:36:44 -0500
Received: from [24.196.18.187] (helo=InterJet.dellroad.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AfnFl-0003bL-6Y
	for classpath@gnu.org; Sun, 11 Jan 2004 16:36:13 -0500
Received: from arch20m.dellroad.org (arch20m.dellroad.org [10.2.2.20])
	by InterJet.dellroad.org (8.9.1a/8.9.1) with ESMTP id OAA30313;
	Sun, 11 Jan 2004 14:30:02 -0600 (CST)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.8/8.12.6) with ESMTP id i0BKU2oU050416;
	Sun, 11 Jan 2004 14:30:02 -0600 (CST)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.8/8.12.8/Submit) id i0BKU16P050415;
	Sun, 11 Jan 2004 14:30:01 -0600 (CST)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200401112030.i0BKU16P050415@arch20m.dellroad.org>
In-Reply-To: <20040111182205.GA1279@mail.konqueror.de>
To: Michael Koch <konqueror@gmx.de>
Date: Sun, 11 Jan 2004 14:30:01 -0600 (CST)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Cc: classpath@gnu.org
Subject: Re: FYI: Patch: file stuff
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jan 2004 21:36:46 -0000

Michael Koch wrote:
> > I already reported #2 as bug #6989:
> > 
> >  https://savannah.gnu.org/bugs/?func=detailitem&item_id=6989
> > 
> > Please close the bug if you commit your fix.
> 
> I found this change in a post on the mailing list but I forgot to look
> into BTS. Sorry.

Not a problem, just trying to reduce clutter in the bug db :-)

Thanks,
-Archie

__________________________________________________________________________
Archie Cobbs     *    Halloo Communications    *     http://www.halloo.com



From MAILER-DAEMON Sun Jan 11 18:43:06 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfpEX-0008Sc-4R
	for mharc-classpath@gnu.org; Sun, 11 Jan 2004 18:43:05 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfpEI-0008Jr-Ky
	for classpath@gnu.org; Sun, 11 Jan 2004 18:42:50 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfpDm-0007xV-Ci
	for classpath@gnu.org; Sun, 11 Jan 2004 18:42:49 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24)
	id 1AfpDk-0007rB-0A; Sun, 11 Jan 2004 18:42:16 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id PAA20176;
	Sun, 11 Jan 2004 15:40:39 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id A1AF34F8470; Sun, 11 Jan 2004 15:32:23 -0700 (MST)
To: cbj@gnu.org
References: <1073710824.19663.27.camel@lyta.haphazard.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: You can't hurt me!!  I have an ASSUMABLE MORTGAGE!!
Date: 11 Jan 2004 15:32:23 -0700
In-Reply-To: <1073710824.19663.27.camel@lyta.haphazard.org>
Message-ID: <87vfni9kw8.fsf@fleche.redhat.com>
Lines: 14
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: classpath@gnu.org
Subject: Re: Serialization compatibility testing
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jan 2004 23:43:00 -0000

>>>>> "Brian" == C Brian Jones <cbj@gnu.org> writes:

Brian> I've been working a little lately on some tools I once added to
Brian> japi for serialization compatibility testing.

Awesome!  We've needed this for a long time.

Brian> I've thought about trying to add this to Mauve.  Thoughts?  New
Brian> module?

Feel free to put it either in the core of Mauve or in a new module as
you see fit.

Tom



From MAILER-DAEMON Mon Jan 12 01:51:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfvuD-0004Uj-8K
	for mharc-classpath@gnu.org; Mon, 12 Jan 2004 01:50:33 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Afvtp-00049N-OD
	for classpath@gnu.org; Mon, 12 Jan 2004 01:50:09 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Afvps-0002j6-MH
	for classpath@gnu.org; Mon, 12 Jan 2004 01:46:37 -0500
Received: from [24.25.9.102] (helo=ms-smtp-03-eri0.southeast.rr.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Afvpa-0002fz-RX
	for classpath@gnu.org; Mon, 12 Jan 2004 01:45:46 -0500
Received: from [10.0.0.2] (rdu57-9-048.nc.rr.com [66.57.9.48])
	by ms-smtp-03-eri0.southeast.rr.com (8.12.10/8.12.7) with ESMTP id
	i0C5i8Te000374
	for <classpath@gnu.org>; Mon, 12 Jan 2004 00:44:09 -0500 (EST)
From: "C. Brian Jones" <cbj@gnu.org>
To: classpath@gnu.org
In-Reply-To: <200401100928.i0A9SOSX027712@pigsty.cats.cradle>
References: <1073710824.19663.27.camel@lyta.haphazard.org>
	<200401100928.i0A9SOSX027712@pigsty.cats.cradle>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-gmsn7APSGTYgQ1ad6hqC"
Message-Id: <1073886248.4096.6.camel@lyta.haphazard.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-7) 
Date: Mon, 12 Jan 2004 00:44:08 -0500
X-Virus-Scanned: Symantec AntiVirus Scan Engine
Subject: Re: Serialization compatibility testing
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: cbj@gnu.org
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2004 06:50:15 -0000


--=-gmsn7APSGTYgQ1ad6hqC
Content-Type: multipart/mixed; boundary="=-GInOwBc5h3+EPR/Ito7o"


--=-GInOwBc5h3+EPR/Ito7o
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

On Sat, 2004-01-10 at 04:28, Chris Gray wrote:
> On Saturday 10 January 2004 06:00, C. Brian Jones wrote:
> > All,
> >
> > I've been working a little lately on some tools I once added to japi fo=
r
> > serialization compatibility testing.  I'm pretty close to having
> > something useful, just wondering if anyone is interested in using these
> > for checking compatibility? =20
>=20
> Yes. :)

Here is version 0.01.  I could call it 1.0 but there are some things to
do still.  Let me know if this is useful.  Because I'm using Fedora at
home, I cannot run any Sun JVM other than 1.4.x and I'm not able to
include the .ser files for 1.1, 1.2, or 1.3 at this time.

Brian
--=20
Brian Jones <cbj@gnu.org>

--=-GInOwBc5h3+EPR/Ito7o
Content-Disposition: attachment; filename=serialization-0.01.tar.bz2
Content-Type: application/x-bzip; name=serialization-0.01.tar.bz2
Content-Transfer-Encoding: base64

QlpoOTFBWSZTWcJaOBYD/CL/////////////////////////////////////////////4fFe95S3
2HQAF2AAANlu6RTrVRUoUTbcudzbkju7kcuzOx3ZOUoKUElUuhZro3cADcO2lrOuwAXdlAr6yObV
TRoJZDo72ANHLbe2CvtaZ3t7fOPiLsPG+XdT3vb2HrnXdLxDnre69xz1WJlXnblrTved562uLn03
vJJ4DN0G4AMHvXtt93VBzbbMtWdgbmV3veHvdjjesBTn233s6+7uQ7DSJrKpc2NaVNsVsHbjlUpF
j18p9us3Kd0gOrZ1qu5K2ZoQGiqoClS6M0MIjWgoKb75VU27IJbp3bpafbyeDV7UusVKq5xevPbw
Pp15k1iqVVgtVW+2LmPtPKqqX2qR5260JqdBbvj7zPPHzbNWY81mThkPfXffH3vvnPfABNA++L3O
e7qUDd4ue7AAC6nddYHcnc2YHcrG7BY7ctgbOtzuwFiEgVXWld0e1677dbvvRfbT7rupWsilVRO0
Dr2+c7AFVvvlZ74+775W6X2tNbY19zwIbtNb49gHyXsFFAU56Y59Lg4+u+9V3PbhG65wO6vqLw9b
7vfcDh753PXny7H33w9e+2bS8Pt9HtnzO99Vb4991I7vfVY69DvVfe++25ncmXz6FV59e33PC++a
9gPu7QWtpdnn076qer6t0nN76nut529L3GdTHY6UkZab73PR76333d8qqiIUO8vHeqtZnfbYD713
MrSqmi2JViUaqK8buMmsNi0oTJT75V3S9ktt71YevSJtsyNbbVpme8+58b5dwnG27rdyss73zd7e
+5cZQL2Cp1uiu5zu4ZQG1J1XS5rGmSuu1g5abIdwdIEOtisvH1uu7771CjvTDqfLRU25677faD49
mp8+vva+X2oFqarKZNLXu27TtbaxQbubtlbaWtffVW96PoDoG5g6aKFu99bye1jnm+o+vtEsDGNZ
Ms027vPnevB8rixJHHvnnfAt92UMtiFKtNiytIYqgLMwHPveeO97iRR6qRrLUncGcVmxbVpl767n
u+1XZD0Ztlq27dfFjzIVe2qltKVSgUCh5b7qQ+dAPVBk19LknY4uguxxcCxtGoBK+PG94HG2dqbd
txO++UKOPXn3M6usVbhqp1MTZZ75d71MzAAFt9EoacooXGqgbbiJEMptAUNtEGgBqG0taNq7r59e
UPk+Q3wAABMdtlt3x8+++jb7vvrKfQc7enTuxQfaDb3m3jeLZr67X31Hm19aVVVy1M2kqlClBRRE
oBRQkKSlSoIqpURVIqlIqhVVVKEKpSqoFColFIqKKVVUAUqiqqk2GgFSiVVAVIUoUVS7BoUEhWml
UqoCiVVJBFAklKKoBKgRKRUUCopBSSkCkSSVVSAKqlSkVKJRSiUQoqoSqqlUEkhKpKQIShRCSgJA
VQBVD6aqogKABKkqUQqRUCRVFFdjd8jEShAAAAAAmE0yGjBMEyYAjTEaBoMTI00yNME1PTRkZMmE
YJgAAAJgJhMBMAABMAATAACYUIkQQAAAAAAAACYAAAmAAAABMBMAAIYEyaaGBMEaaaTyNNMIZNGj
TQaGmQGgGTTTTE00aCCUITQEATQBMjQATJpqeQMjQBMNAAAATA0TTANTE0wEwmCGBMhiZMARiYmg
ZGgyDU9MEZMmjIyZAKeyUEmogiEEAgAgaE0who0nqYaQ0aR4k09NKep6n6ZU8ptonqnk0yeSn6p5
PRNT9U/Ipp5T9JPUPT1NRkaHgmmp5qnmptU8o9R5Mmo9T0TYpoekep5T1D0h6gYmmno0giUIgCAE
AACAAAjIADIaaA0CepiYBPQAaYkxoA0npoJ6AGgCbRoaATTBqYmTBpPQCYRpkwJiDEanpAqSIIIA
EyAINGgmJkMSejQDUYmQxNMFJ+qemGCBkyaCeQ00NTU20p+jIyU8m0wmmNJPRhTZJmhk0nqaZGie
EYTamyJlPNU08p+qbBJU8kYuepcfkJj+6TkTqztd2DTnjpFNSxq1LEhB/iTpRPMKC+wPLTChTsZz
CT/iPOIn507f/GoU0qOvFxLqvfZAmSWwPoHvQHEAiKXT5sBA5WTl5y/pSQmONanoPQZ1B8M5TCCE
GElxyQg9FXGUQuY00sbRz9V7Pw/g7+wvH39eEmCY9v8sqfSEUqqSvsK+ufsHJZkUcQZ5ERZQSUmS
0rgTX9b0Ww63PpzW9K2yaTXa5ltl12NGobEnsO0OvNfDWQvqx8CXmeILx7CEBwUuRKznuE5lXGba
ICVdhFq6kWQqsXAoQgl0EoIiYUrUqAQtXJZDjLgor5RVVCl/EWFbMwdvcSzStEWyshab9pDlY4Re
ItarIYZJYwI5suQvBk6mJDGpQGhAFAsZJrOJcJ35ssIoTWvAwTBDGblhM4uBcC7/yM5mYZMjjExM
FEukaAxR5LDOZUMFZS2xKAoSNHNzWTwzKwYLK39rrQ9oO5NhnsM5kZz25VeYgMou/rJvzDBw8K0z
ECFZzifhNIvmqgUVQ+OQP0ARWEioisjFUYsERigLFGMUSDGIwQFYsCIQCT9ReE6fc2WHnZXSBSBV
UTtVSCwsqhjJBiJSLFBYKsNVQiAoFiAWhLQOiUi6QwgH1zhDae1JJJAbd1W7ooSkKbZSCwGqhbcY
3UFkv+vUDlDnPr/L3Vhx9pjGA1kaOye6Mc11cmig96grec3rJ2bTFxbNpg7VKzFlDD8K9N9rMq/1
Koy5T3MUfm0DCdMXnV+EcKzK91kst72x8GhiKwXby6TA/x6KgLBYoCyZRZHzVLZ4hJ1qcJCuPkaO
h4zGwQxEwbfmlfW/+A2WJRoqSbEigDihqvQMqJDDQkRD6UzgwHxzXlxQKbq5J9b11OK4vJgSbjMd
F+71/3xMTxhuAvIIXRVAUUwdtY1rBQzc2Q7X4LnNu4BwRcxGkoaurba83k8ZYQwrhISRHEGAtFHi
TxFFBVwfY3aqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqrAy0ZqOU9uvn85WmNONXBjkmAYUS
kQFYNTL+OwqWIjpGkU0ZhVWR5MpU2hzxXvNTvNVS8i87AKEXCd+mlrmrhvTAaeBSrEEGbWFjP5QS
ceSCgimk9zmFg9CABWiW8ExpJFC2wDC3vUNe6YoChBEgIxOZdyT1z9JCiiwSwpydHk14KxSWcL31
4WUp6LfLkXVKUMIGM1daGQyZOl/XgK4UWhqkKAkNMorAjJSkBFM/OXhLqbiiU5XKaHA81ycpkQyk
IyhDISZE+m0OGmqCnCtJFH2tBChGERXPoURTmDyNFA/RBHS0jSRDSRE0lENIRdJHS4jEpvNcogbT
aaVRDXgsN5RQK/TaIGPutBTvsFkUNaA62TcyqD45t7l0esvYN2ojPOxfL6S501ClZqTn1EmSgHet
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

--=-GInOwBc5h3+EPR/Ito7o--

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

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

iD8DBQBAAjQocEcmdY33uzYRAkDuAJ44a3H/Ehr0RP5l1PO39317iwXyGwCfXBIU
9P40uNeGT2VogUh7nU45ACs=
=1YPX
-----END PGP SIGNATURE-----

--=-gmsn7APSGTYgQ1ad6hqC--




From MAILER-DAEMON Mon Jan 12 08:34:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ag2Ae-0004rv-6E
	for mharc-classpath@gnu.org; Mon, 12 Jan 2004 08:31:56 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfjUE-00080A-0Q
	for classpath@gnu.org; Sun, 11 Jan 2004 12:34:54 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfjTh-0007rc-0D
	for classpath@gnu.org; Sun, 11 Jan 2004 12:34:52 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AfjQk-0007BI-Gk
	for classpath@gnu.org; Sun, 11 Jan 2004 12:31:18 -0500
Received: from [212.186.60.145] (helo=twisti.tvand.net)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AfiSB-000602-VD
	for classpath@gnu.org; Sun, 11 Jan 2004 11:28:44 -0500
Received: from sector17.home.at (twisti@sector17.home.at [192.168.1.2])
	by twisti.tvand.net (8.12.3/8.12.3/Debian-6.6) with ESMTP id
	i0BGOKdF005728
	for <classpath@gnu.org>; Sun, 11 Jan 2004 17:24:20 +0100
From: Christian Thalinger <twisti@complang.tuwien.ac.at>
To: classpath@gnu.org
Content-Type: text/plain
Message-Id: <1073838503.17232.56.camel@sector17.home.at>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sun, 11 Jan 2004 17:28:23 +0100
Content-Transfer-Encoding: 7bit
X-Mailman-Approved-At: Mon, 12 Jan 2004 08:31:53 -0500
Subject: [PATCH] 64-bit dtoa - strtod fix
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jan 2004 17:34:54 -0000

We are building a java jit called cacao
(http://www.complang.tuwien.ac.at/java/cacao/) which now uses the gnu
classpath. On our 64-bit ports we had problems with dtoa and strtod
functions. After a long night of debugging, i found the problem: it
seems that in mprec.h

#define MAX_BIGNUM_WDS 32

is too small for some floats. The amount can grow up to 48, as my
debugging showed. On i386 systems where Pack_32 is defined, it seems to
be ok. But Pack_32 does not work on 64-bit systems.

This bug is hit, when you try to execute this small code

class test {
    public static void main(String[] argv) {
        System.out.println(Double.MIN_VALUE);
    }
}

with gij (gcc-3.3.2) on x86_64. Defining

#define MAX_BIGNUM_WDS 64

shows the expected result with our jit. I don't know if 64 is a
reasonable number, but when not packing 32-bit in a long but 16-bit,
twice as much should be ok.

This is also cross-posted to java-patches@gcc.gnu.org

TWISTI

--- classpath-0.07/native/fdlibm/mprec.h        2001-11-05
03:56:47.000000000 +0100
+++ cacaodev/gnuclasspath/native/fdlibm/mprec.h 2004-01-11
17:17:55.000000000 +0100
@@ -295,7 +298,12 @@


#define MAX_BIGNUMS 16
+
+#ifndef Pack_32
+#define MAX_BIGNUM_WDS 64
+#else
#define MAX_BIGNUM_WDS 32
+#endif

struct _Jv_Bigint
{





From MAILER-DAEMON Mon Jan 12 10:51:57 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ag4M8-00079w-Qm
	for mharc-classpath@gnu.org; Mon, 12 Jan 2004 10:51:56 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ag4M4-00078u-Cb
	for classpath@gnu.org; Mon, 12 Jan 2004 10:51:52 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ag44x-0001Pu-CM
	for classpath@gnu.org; Mon, 12 Jan 2004 10:34:42 -0500
Received: from [139.165.32.78] (helo=serv09.segi.ulg.ac.be)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ag44w-0001PG-RU
	for classpath@gnu.org; Mon, 12 Jan 2004 10:34:11 -0500
Received: (qmail 2836 invoked by uid 504); 12 Jan 2004 15:32:37 +0100
Received: from arnaud.vandyck@ulg.ac.be by serv09.segi.ulg.ac.be by uid 501
	with qmail-scanner-1.16 
	(clamscan: 0.60. spamassassin: 2.55.  Clear:. 
	Processed in 0.828388 secs); 12 Jan 2004 14:32:37 -0000
Received: from unknown (HELO localhost) ([139.165.77.181])
	(envelope-sender <arnaud.vandyck@ulg.ac.be>)
	by serv09.segi.ulg.ac.be (qmail-ldap-1.03) with SMTP
	for <konqueror@gmx.de>; 12 Jan 2004 15:32:36 +0100
Received: from arnaud by localhost with local (Exim 4.30)
	id 1Ag37L-0001w8-Di; Mon, 12 Jan 2004 15:32:35 +0100
To: Michael Koch <konqueror@gmx.de>
References: <E1Ag0mi-0008V2-Iu@savannah.gnu.org>
From: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
Organization: ULg, STE-Formations Informatiques
X-Face: ".{A?<Dzy|V1IPZL0O-B-~G{n+`j%t7K$Y`:u[w54'>P>_0mS1E$Wn4RK&CR)_yvw`),0&;
	?-]upzJvA]->#pP:$si]X039T'Qrd}9t=!EstonSVE1F$dtgGsRC"lyQnP+H6/g:f^d:,0@)P#xCy9?MmW[8n{8B75hA_=]O7TRZ~r9SE6CL*xpR8k4'~!5B8"|u
Date: Mon, 12 Jan 2004 15:32:35 +0100
In-Reply-To: <E1Ag0mi-0008V2-Iu@savannah.gnu.org> (Michael Koch's message of
	"Mon, 12 Jan 2004 07:03:08 -0500")
Message-ID: <87smilgruk.fsf@oz.fapse.ulg.ac.be>
User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
Cc: ClassPath List <classpath@gnu.org>
Subject: Re: [patch #2388] DefaultTableCellRenderer update
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2004 15:51:54 -0000

Michael Koch <noreply@savannah.gnu.org> writes:

> This mail is an automated notification from the patch tracker
>  of the project: classpath.
>
> /**************************************************************************/
> [patch #2388] Latest Modifications:
>
> Changes by: 
> 		Michael Koch <konqueror@gmx.de>
> 'Date: 
> 		Mon 01/12/04 at 12:03 (GMT)
>
> ------------------ Additional Follow-up Comments ----------------------------
> Some problems with this patch:
>
> - no changelog entry

And what is this?

 2003-12-01  Arnaud Vandyck  <arnaud.vandyck@ulg.ac.be>

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


> - we dont wanna add stubbed methods anymore. Either implement it or leave it out.

Sorry if I left a stub method... Which one? Lot of methods in this
component are empty because they override parent and they DO NOTHING
(it's the way they are! because it's the table that make the renderer)

... if I understood it right! ;)

> /**************************************************************************/
> [patch #2388] Full Item Snapshot:
>
> URL: <http://savannah.gnu.org/patch/?func=detailitem&item_id=2388>
> Project: classpath
> Submitted by: Arnaud Vandyck
> On: Sun 11/30/03 at 23:22
>
> Category:  None
> Priority:  1 - Later
> Resolution:  None
> Assigned to:  None
> Originator Email:  
> Status:  Open
>
>
> Summary:  DefaultTableCellRenderer update
>
> Original Submission:  Here is a patch for javax/swing/table/DefaultTableCellRenderer.java and here is the Changelog entry.
>
> 2003-12-01  Arnaud Vandyck  <arnaud.vandyck@ulg.ac.be>
>
> 	* javax/swing/table/DefaultTableCellRenderer.java
> 	(DefaultTableCellRenderer): Added javadoc for the class and for
> 	the constructor, Border instance, create an EmptyBorder.
> 	(UIResource): Removed the comment at the end of the class
> 	(setForeground): New method.
> 	(setBackground): New method.
> 	(updateUI): New method.
> 	(getTableCellRendererComponent): rewritten with the help of
> 	dvholten and Stephane Meslin-Weber.
> 	(validate): New method.
> 	(repaint): New method.
> 	(firePropertyChange): New method.
> 	(setValue): New method.
>
>
> Follow-up Comments
> ------------------
>
>
> -------------------------------------------------------
> Date: Mon 01/12/04 at 12:03         By: mkoch
> Some problems with this patch:
>
> - no changelog entry
> - we dont wanna add stubbed methods anymore. Either implement it or leave it out.
>
>
>
>
>
>
> File Attachments
> -------------------
>
> -------------------------------------------------------
> Date: Sun 11/30/03 at 23:22  Name: DefaultTableCellRenderer.patch  Size: 4KB   By: avdyk
>
> http://savannah.gnu.org/patch/download.php?item_id=2388&amp;item_file_id=2407
>
>
>
>
>
>
> For detailed info, follow this link:
> <http://savannah.gnu.org/patch/?func=detailitem&item_id=2388>
>
> _______________________________________________
>   Message sent via/by Savannah
>   http://savannah.gnu.org/
>
>
>
>

-- 
Arnaud Vandyck, STE fi, ULg
Formateur Cellule Programmation.



From MAILER-DAEMON Mon Jan 12 12:45:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ag68E-0001NO-7y
	for mharc-classpath@gnu.org; Mon, 12 Jan 2004 12:45:42 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ag688-0001LH-Lu
	for classpath@gnu.org; Mon, 12 Jan 2004 12:45:36 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ag67W-00018i-Am
	for classpath@gnu.org; Mon, 12 Jan 2004 12:45:29 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ag4wz-0001yq-HV
	for classpath@gnu.org; Mon, 12 Jan 2004 11:30:01 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-111.ewetel.net
	[80.228.80.111])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i0CFS81h022191;
	Mon, 12 Jan 2004 16:28:09 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1Ag3zG-0003lV-00; Mon, 12 Jan 2004 16:28:18 +0100
Date: Mon, 12 Jan 2004 16:28:18 +0100
From: Michael Koch <konqueror@gmx.de>
To: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
Message-ID: <20040112152818.GA14428@mail.konqueror.de>
References: <E1Ag0mi-0008V2-Iu@savannah.gnu.org>
	<87smilgruk.fsf@oz.fapse.ulg.ac.be>
	<20040112145242.GA13884@mail.konqueror.de>
	<87k73xfb6f.fsf@oz.fapse.ulg.ac.be>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <87k73xfb6f.fsf@oz.fapse.ulg.ac.be>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: ClassPath List <classpath@gnu.org>, Michael Koch <konqueror@gmx.de>
Subject: Re: [patch #2388] DefaultTableCellRenderer update
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2004 17:45:39 -0000

On Mon, Jan 12, 2004 at 04:18:00PM +0100, Arnaud Vandyck wrote:
> Michael Koch <konqueror@gmx.de> writes:
> 
> > On Mon, Jan 12, 2004 at 03:32:35PM +0100, Arnaud Vandyck wrote:
> >> Michael Koch <noreply@savannah.gnu.org> writes:
> >> > - no changelog entry
> >> And what is this?
> [...]
> > Oh, I totally overlooked this.
> NP.
> 
> >> > - we dont wanna add stubbed methods anymore. Either implement it or
> >> > leave it out.
> >> 
> >> Sorry if I left a stub method... Which one? Lot of methods in this
> >> component are empty because they override parent and they DO NOTHING
> >> (it's the way they are! because it's the table that make the renderer)
> >> 
> >> ... if I understood it right! ;)
> >
> > If thats the case the you should really add this as comment to method
> > like this:
> >
> > public void foobar()
> > {
> >   // This methods needs to be overridden in subclasses to actually do
> >   // somthing.
> > }
> >
> > A comment in the method documentation can't hurt too but "Does nothing."
> > is a little bit short and undesciptive why this method does nothing.
> 
> Yes, I should comment, sorry. The fact is some methods in this component
> are overriden because it's the table that does redraw all the components
> and if each component redraw it self, it'll take too much time.
> 
> I thing I still have some mails that explain exactly what happens (some
> devs on this list helped me).
> 
> You know Mark, it took me a long time to understand and to implement
> (event empty methods because I was not sure I have to leave it empty)
> and I really want a working swing implementation, not just a library to
> compile (but not to run). Believe me, when I do send a patch, I try that
> it's really useful ;)... even if I make mistakes ;)
> 
> I already do follow your coding standards, next time, I'll comment my
> code ;)

No problem. Will you update your patch or should I do it ? Then the
patch can go in.


Michael



From MAILER-DAEMON Mon Jan 12 13:00:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ag6MF-0006ES-4w
	for mharc-classpath@gnu.org; Mon, 12 Jan 2004 13:00:11 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ag6MB-0006Ce-SK
	for classpath@gnu.org; Mon, 12 Jan 2004 13:00:07 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ag6Lc-0005uz-ST
	for classpath@gnu.org; Mon, 12 Jan 2004 13:00:03 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ag4OR-0007b3-78
	for classpath@gnu.org; Mon, 12 Jan 2004 10:54:19 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-111.ewetel.net
	[80.228.80.111])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0CEqWHA010764;
	Mon, 12 Jan 2004 15:52:32 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1Ag3Qo-0003cG-00; Mon, 12 Jan 2004 15:52:42 +0100
Date: Mon, 12 Jan 2004 15:52:42 +0100
From: Michael Koch <konqueror@gmx.de>
To: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
Message-ID: <20040112145242.GA13884@mail.konqueror.de>
References: <E1Ag0mi-0008V2-Iu@savannah.gnu.org>
	<87smilgruk.fsf@oz.fapse.ulg.ac.be>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <87smilgruk.fsf@oz.fapse.ulg.ac.be>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: ClassPath List <classpath@gnu.org>, Michael Koch <konqueror@gmx.de>
Subject: Re: [patch #2388] DefaultTableCellRenderer update
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2004 18:00:08 -0000

On Mon, Jan 12, 2004 at 03:32:35PM +0100, Arnaud Vandyck wrote:
> Michael Koch <noreply@savannah.gnu.org> writes:
> 
> > This mail is an automated notification from the patch tracker
> >  of the project: classpath.
> >
> > /**************************************************************************/
> > [patch #2388] Latest Modifications:
> >
> > Changes by: 
> > 		Michael Koch <konqueror@gmx.de>
> > 'Date: 
> > 		Mon 01/12/04 at 12:03 (GMT)
> >
> > ------------------ Additional Follow-up Comments ----------------------------
> > Some problems with this patch:
> >
> > - no changelog entry
> 
> And what is this?
> 
>  2003-12-01  Arnaud Vandyck  <arnaud.vandyck@ulg.ac.be>
> 
>  	* javax/swing/table/DefaultTableCellRenderer.java
>  	(DefaultTableCellRenderer): Added javadoc for the class and for
>  	the constructor, Border instance, create an EmptyBorder.
>  	(UIResource): Removed the comment at the end of the class
>  	(setForeground): New method.
>  	(setBackground): New method.
>  	(updateUI): New method.
>  	(getTableCellRendererComponent): rewritten with the help of
>  	dvholten and Stephane Meslin-Weber.
>  	(validate): New method.
>  	(repaint): New method.
>  	(firePropertyChange): New method.
>  	(setValue): New method.

Oh, I totally overlooked this.

> 
> 
> > - we dont wanna add stubbed methods anymore. Either implement it or leave it out.
> 
> Sorry if I left a stub method... Which one? Lot of methods in this
> component are empty because they override parent and they DO NOTHING
> (it's the way they are! because it's the table that make the renderer)
> 
> ... if I understood it right! ;)

If thats the case the you should really add this as comment to method
like this:

public void foobar()
{
  // This methods needs to be overridden in subclasses to actually do
  // somthing.
}

A comment in the method documentation can't hurt too but "Does nothing."
is a little bit short and undesciptive why this method does nothing.


Michael



From MAILER-DAEMON Mon Jan 12 13:07:46 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ag6R9-0007fW-0G
	for mharc-classpath@gnu.org; Mon, 12 Jan 2004 13:05:15 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ag6R6-0007e1-LY
	for classpath@gnu.org; Mon, 12 Jan 2004 13:05:12 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ag6Qa-0007Ss-FR
	for classpath@gnu.org; Mon, 12 Jan 2004 13:05:11 -0500
Received: from [139.165.32.78] (helo=serv09.segi.ulg.ac.be)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ag4mu-0007s9-DC
	for classpath@gnu.org; Mon, 12 Jan 2004 11:19:36 -0500
Received: (qmail 29245 invoked by uid 504); 12 Jan 2004 16:18:05 +0100
Received: from arnaud.vandyck@ulg.ac.be by serv09.segi.ulg.ac.be by uid 501
	with qmail-scanner-1.16 
	(clamscan: 0.60. spamassassin: 2.55.  Clear:. 
	Processed in 1.048097 secs); 12 Jan 2004 15:18:05 -0000
Received: from unknown (HELO localhost) ([139.165.77.181])
	(envelope-sender <arnaud.vandyck@ulg.ac.be>)
	by serv09.segi.ulg.ac.be (qmail-ldap-1.03) with SMTP
	for <konqueror@gmx.de>; 12 Jan 2004 16:18:03 +0100
Received: from arnaud by localhost with local (Exim 4.30)
	id 1Ag3pI-0001zo-VC; Mon, 12 Jan 2004 16:18:00 +0100
To: Michael Koch <konqueror@gmx.de>
References: <E1Ag0mi-0008V2-Iu@savannah.gnu.org>
	<87smilgruk.fsf@oz.fapse.ulg.ac.be>
	<20040112145242.GA13884@mail.konqueror.de>
From: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
Organization: ULg, STE-Formations Informatiques
X-Face: ".{A?<Dzy|V1IPZL0O-B-~G{n+`j%t7K$Y`:u[w54'>P>_0mS1E$Wn4RK&CR)_yvw`),0&;
	?-]upzJvA]->#pP:$si]X039T'Qrd}9t=!EstonSVE1F$dtgGsRC"lyQnP+H6/g:f^d:,0@)P#xCy9?MmW[8n{8B75hA_=]O7TRZ~r9SE6CL*xpR8k4'~!5B8"|u
Date: Mon, 12 Jan 2004 16:18:00 +0100
In-Reply-To: <20040112145242.GA13884@mail.konqueror.de> (Michael Koch's
	message of "Mon, 12 Jan 2004 15:52:42 +0100")
Message-ID: <87k73xfb6f.fsf@oz.fapse.ulg.ac.be>
User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
Cc: ClassPath List <classpath@gnu.org>
Subject: Re: [patch #2388] DefaultTableCellRenderer update
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2004 18:05:13 -0000

Michael Koch <konqueror@gmx.de> writes:

> On Mon, Jan 12, 2004 at 03:32:35PM +0100, Arnaud Vandyck wrote:
>> Michael Koch <noreply@savannah.gnu.org> writes:
>> > - no changelog entry
>> And what is this?
[...]
> Oh, I totally overlooked this.
NP.

>> > - we dont wanna add stubbed methods anymore. Either implement it or
>> > leave it out.
>> 
>> Sorry if I left a stub method... Which one? Lot of methods in this
>> component are empty because they override parent and they DO NOTHING
>> (it's the way they are! because it's the table that make the renderer)
>> 
>> ... if I understood it right! ;)
>
> If thats the case the you should really add this as comment to method
> like this:
>
> public void foobar()
> {
>   // This methods needs to be overridden in subclasses to actually do
>   // somthing.
> }
>
> A comment in the method documentation can't hurt too but "Does nothing."
> is a little bit short and undesciptive why this method does nothing.

Yes, I should comment, sorry. The fact is some methods in this component
are overriden because it's the table that does redraw all the components
and if each component redraw it self, it'll take too much time.

I thing I still have some mails that explain exactly what happens (some
devs on this list helped me).

You know Mark, it took me a long time to understand and to implement
(event empty methods because I was not sure I have to leave it empty)
and I really want a working swing implementation, not just a library to
compile (but not to run). Believe me, when I do send a patch, I try that
it's really useful ;)... even if I make mistakes ;)

I already do follow your coding standards, next time, I'll comment my
code ;)

Cheers,

-- 
Arnaud Vandyck, STE fi, ULg
Formateur Cellule Programmation.



From MAILER-DAEMON Mon Jan 12 14:04:07 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ag7M7-0001Ug-Aj
	for mharc-classpath@gnu.org; Mon, 12 Jan 2004 14:04:07 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ag7M2-0001Rx-W6
	for classpath@gnu.org; Mon, 12 Jan 2004 14:04:02 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ag7LW-0001EP-L7
	for classpath@gnu.org; Mon, 12 Jan 2004 14:04:01 -0500
Received: from [139.165.32.78] (helo=serv09.segi.ulg.ac.be)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ag6yf-0002Qs-6y
	for classpath@gnu.org; Mon, 12 Jan 2004 13:39:53 -0500
Received: (qmail 5785 invoked by uid 504); 12 Jan 2004 18:10:20 +0100
Received: from arnaud.vandyck@ulg.ac.be by serv09.segi.ulg.ac.be by uid 501
	with qmail-scanner-1.16 
	(clamscan: 0.60. spamassassin: 2.55.  Clear:. 
	Processed in 0.300841 secs); 12 Jan 2004 17:10:20 -0000
Received: from unknown (HELO localhost) ([139.165.77.181])
	(envelope-sender <arnaud.vandyck@ulg.ac.be>)
	by serv09.segi.ulg.ac.be (qmail-ldap-1.03) with SMTP
	for <konqueror@gmx.de>; 12 Jan 2004 18:10:20 +0100
Received: from arnaud by localhost with local (Exim 4.30)
	id 1Ag5Zx-00030z-1x; Mon, 12 Jan 2004 18:10:17 +0100
To: Michael Koch <konqueror@gmx.de>
References: <E1Ag0mi-0008V2-Iu@savannah.gnu.org>
	<87smilgruk.fsf@oz.fapse.ulg.ac.be>
	<20040112145242.GA13884@mail.konqueror.de>
	<87k73xfb6f.fsf@oz.fapse.ulg.ac.be>
	<20040112152818.GA14428@mail.konqueror.de>
From: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
Organization: ULg, STE-Formations Informatiques
X-Face: ".{A?<Dzy|V1IPZL0O-B-~G{n+`j%t7K$Y`:u[w54'>P>_0mS1E$Wn4RK&CR)_yvw`),0&;
	?-]upzJvA]->#pP:$si]X039T'Qrd}9t=!EstonSVE1F$dtgGsRC"lyQnP+H6/g:f^d:,0@)P#xCy9?MmW[8n{8B75hA_=]O7TRZ~r9SE6CL*xpR8k4'~!5B8"|u
Date: Mon, 12 Jan 2004 18:10:17 +0100
In-Reply-To: <20040112152818.GA14428@mail.konqueror.de> (Michael Koch's
	message of "Mon, 12 Jan 2004 16:28:18 +0100")
Message-ID: <877jzxf5za.fsf@oz.fapse.ulg.ac.be>
User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
Cc: ClassPath List <classpath@gnu.org>
Subject: Re: [patch #2388] DefaultTableCellRenderer update
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2004 19:04:05 -0000

Michael Koch <konqueror@gmx.de> writes:

> No problem. Will you update your patch or should I do it ? Then the
> patch can go in.

As you want (if you can do it, go on ;)). I don't think I'll have the
time to do that but maybe we'll meet tonight (for me at last) on #kaffe
;) Also, I don't know if I still have the patch on my machine (and were
it is!)... and I don't have a classpath cvs in sync... (yes, I know,
it's a shame!)...

Cheers to everyone,

-- 
Arnaud Vandyck, STE fi, ULg
Formateur Cellule Programmation.



From MAILER-DAEMON Mon Jan 12 16:38:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ag9l5-000659-6Q
	for mharc-classpath@gnu.org; Mon, 12 Jan 2004 16:38:03 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ag9l2-000648-78
	for classpath@gnu.org; Mon, 12 Jan 2004 16:38:00 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ag9kV-0005x7-Fp
	for classpath@gnu.org; Mon, 12 Jan 2004 16:37:58 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1Ag9fc-0004H6-Vo
	for classpath@gnu.org; Mon, 12 Jan 2004 16:32:25 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1Ag8fX-0002Nd-E7
	for classpath@gnu.org; Mon, 12 Jan 2004 15:28:15 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 1B17B62254; Mon, 12 Jan 2004 20:28:14 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 65207-03; Mon, 12 Jan 2004 20:28:13 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-70-168.adsl.solnet.ch
	[212.41.70.168]) by mail01.solnet.ch (Postfix) with ESMTP
	id 5B9706215D; Mon, 12 Jan 2004 20:28:08 +0000 (GMT)
Received: from nbprr (reali.dnsalias.net [192.168.1.2])
	by reali.dnsalias.net (Postfix) with ESMTP
	id B9C2D2189D; Mon, 12 Jan 2004 21:17:21 +0100 (CET)
Date: Mon, 12 Jan 2004 21:28:59 +0100
From: Patrik Reali <reali@acm.org>
To: Sascha Brawer <brawer@dandelis.ch>,
	GNU Classpath <classpath@gnu.org>
Message-ID: <29974751.1073942939@[192.168.1.3]>
In-Reply-To: <20040109084527.6021@smtp.mail.ch.easynet.net>
References: <87d69udk04.fsf@fleche.redhat.com>
	<20040109084527.6021@smtp.mail.ch.easynet.net>
X-Mailer: Mulberry/3.1.0 (Win32 Demo)
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1; format=flowed
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
X-Virus-Scanned: by SolNet
Cc: Tom Tromey <tromey@redhat.com>
Subject: Re: JIT pluggability (ABI Issues)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2004 21:38:00 -0000

ABI Issues.

I would divide this in three parts: allocation, calling convention, code=20
patterns.

Allocation deals with the addresses of the data structures and is fairly=20
easy to deal with. The information needed is:
* size for each basic type
* padding/alignment of each type (in an object, in an array)
* class layout (do we really need this? I guess the fields are allocated in =

the row as they are declared)
* class hidden fields (type descriptor, locks, ...)
* array layout (this may get complicated)
* method number / offset in the vtable or itable
* class numbering / interface numbering (for the systems that use this=20
information)
* Strings (some systems may have some special implementations here)

Calling Convention
* left-to-right (as in java) or right-to-left (as in C)
* self (first or last?)
* size and alignment issues
* return values (on register? on stack?)
* which params are passed on stack / in a register
* register saving policies

Code Patterns (using a system call or some inlined code)
* method invocation (i.e. type descriptor layout)
* class allocation
* array allocation
* class initialization
* locking / unlocking
* switch-tables (Jaos has a table with the absolute address of each switch=20
destination, this must be patched by the linker)
[... I'm sure I'm missing some here...]


I think allocation is fairly simple to deal with. In fact, each backend=20
could provide an implementation class which computes the allocation values.

Calling convention and code pattern configuration may make even the=20
simplest compiler become too complex to implement.... please correct me if=20
wrong (this is just an assumption).


-Patrik

--------------------------------
Patrik Reali
http://www.reali.ch/~patrik/
http://www.oberon.ethz.ch/jaos/
http://iiop-net.sourceforge.net/



--On Freitag, 9. Januar 2004 09:45 +0100 Sascha Brawer <brawer@dandelis.ch> =

wrote:

> Tom Tromey <tromey@redhat.com> wrote on Thu, 8 Jan 2004 17:48:59 -0700:
>
>> [standard pluggable JIT interface]
>
> This would indeed be quite nice, IMHO.
>
>> Language choice for API.
>>  The obvious choices being:
>>  C     lowest common denominator
>>  C++   next-to-lowest common denominator :-)  provides some
>>        abstraction benefit, maybe
>>  Java  using our own tools...
>
> There are some users of Classpath who cannot execute any C code, such as
> Jaos and JNodeOS. If the pluggable JIT interface was in Java, these
> systems would be able to use it (assuming that someone writes a JITter in
> Java, like IBM did with their Jalape=F1o/Jikes RVM).
>
> Also, I'd assume that the interface would be rather narrow in the sense
> that it wouldn't get invoked very often in the direction VM --> JIT;
> probably once for each class or method to be compiled. But the JIT would
> presumably have to call a lot into the VM (for retrieving field offsets
> etc.).
>
>> ABI Issues
>
> According to IBM's publications and web pages, Jikes RVM seems to nicely
> cope with different ABIs (such as the slightly different calling
> conventions for AIX and MacOS X). Maybe, their code could serve as an
> example for how to structure the JIT interface so it can cope with
> different ABIs.
>
> Jaos works on top of an abstraction called "object kernel", which
> basically is an API to garbage collection, synchronization, etc. Patrik
> Reali might be able to tell the list more about this.
>
>> General API
>>
>> - Verifier interface?
>>  Does the verifier do all checking or does it impose some
>>  requirements on the JIT/interpreter?  (Some verifiers choose to
>>  delay some checking until interpretation.)
>>  Does the JIT want/need information already computed by the verifier?
>>  For instance basic blocks or the type map at a given statement.
>
> I think it would be very wasteful to compute this information twice, but
> it might be very difficult to define common data structures that are
> suitable for everyone. Might it be sufficient if a verifier could store
> some opaque reference for later use by the JIT?
>
> AegisVM writes that they have developed a modular bytecode verification
> architecture, but I didn't look at this yet.
>
> Another thing that might be interesting to share is parts of a compiler
> backend, such as assemblers.
>
> -- Sascha
>
> Sascha Brawer, brawer@dandelis.ch, http://www.dandelis.ch/people/brawer/
>
>
>





From MAILER-DAEMON Mon Jan 12 16:50:39 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ag9xG-0000uC-VD
	for mharc-classpath@gnu.org; Mon, 12 Jan 2004 16:50:38 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ag9xE-0000tH-0R
	for classpath@gnu.org; Mon, 12 Jan 2004 16:50:36 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ag9wf-0000hn-AR
	for classpath@gnu.org; Mon, 12 Jan 2004 16:50:32 -0500
Received: from [213.49.17.120] (helo=pigsty.cats.cradle)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1Ag9we-0000gF-AN
	for classpath@gnu.org; Mon, 12 Jan 2004 16:50:01 -0500
Received: from there (localhost.cats.cradle [127.0.0.1])
	by pigsty.cats.cradle (8.12.6/8.11.6) with SMTP id i0CKqrSX031163;
	Mon, 12 Jan 2004 21:52:54 +0100 (CET)
	(envelope-from chris.gray@kiffer.be)
Message-Id: <200401122052.i0CKqrSX031163@pigsty.cats.cradle>
Content-Type: text/plain;
  charset="iso-8859-1"
From: Chris Gray <chris.gray@kiffer.be>
To: Patrik Reali <reali@acm.org>, Sascha Brawer <brawer@dandelis.ch>,
	GNU Classpath <classpath@gnu.org>, Tom Tromey <tromey@redhat.com>
Date: Mon, 12 Jan 2004 21:52:53 +0100
X-Mailer: KMail [version 1.3]
References: <87d69udk04.fsf@fleche.redhat.com>
	<200401101029.i0AATgSX027757@pigsty.cats.cradle>
	<28909750.1073941874@[192.168.1.3]>
In-Reply-To: <28909750.1073941874@[192.168.1.3]>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-MIME-Autoconverted: from 8bit to quoted-printable by pigsty.cats.cradle id
	i0CKqrSX031163
Cc: 
Subject: Re: JIT pluggability (GC Interface)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2004 21:50:37 -0000

On Monday 12 January 2004 21:11, Patrik Reali wrote:
> Hi!
>
> let me add my 0.02 cents (of euro). :-)

Yup, it's "soldi" time. :)

> GC Interface:
>
> let's divide the GCs in 2x2 categories:
>
> * (TA) type-accurate: know where the pointers inside the objects are
> * (CO) conservative: guess where the pointers inside the objects are
>
> and
>
> * (NC) non-concurrent: the GC is the only thread running during the
> collection
> * (CI) concurrent / incremental: the GC and the mutator run
> (pseudo-)concurrently

CI corresponds to my type 1, NC to type 2.

> These categories affect the interface between compiler, generated code,=
 and
> the gc itself.

Is anybody using CO?

> Static information (TA vs. CO):
> * All GCs need a hook into the memory management to return the blocks t=
o
> the free-list.
> * All GCs need to access the whole heap
> * TA GCs need a root-set from which the collection starts: the list of =
all
> static fields, all pointers on the stack of each thread, all pointers i=
n
> the CPU registers (and those in the stack when the thread is preemted) =
[The
> registers depend in fact on the compiler optimizations: if some value m=
ay
> live longer in a register than in a variable then yes, otherwise if the
> compiler ensures that all pointers in the registers are also anchored
> somewhere in a variable, then no]
> The list of static fields can be obtained through reflection; pointers =
on
> the stack are more complicated to get.
> * TA GCs need a type descriptor containing the pointer offsets inside e=
ach
> type; arrays of references are also to be collected
>
> Code Instrumentation (NC vs. CI):
> * NC GCs do not need code instrumentation

Not so fast.

A NC GC typically needs to bring all (non-GC) threads to a "safe" state=20
before it can run: a "safe" state is one in which all references from a=20
thread to the heap are visible to GC. So some degree of instrumentation i=
s=20
needed in order to determine when a thread is "safe", and maybe also a=20
mechanism to politely ask a thread to become "safe" at the earliest=20
opportunity.
=20
> * some CI GCs define code points where the GC can run
> * some CI use read barriers (each pointer read operation is instrumente=
d)
> * some CI use write barriers (each pointer store operation is instrumen=
ted)
> * some GCs use master-lists (each pointer points to the real pointer wh=
ich
> is present only once, thus moving an object correspond to moving a
> master-pointer instead of each reference)

AKA "handles".

>
> Example: Jaos + Aos Kernel
> The Aos kernel provides memory allocation with a mark & sweep GC; the m=
ark
> operation is implemented using the pointer rotation algorithm (Deutsch
> Waite Schorre). This is a "stop the world" non-concurrent GC (even in t=
he
> multiprocessor version of the kernel).
> The GC information is provided by the Jaos classloader (because it perf=
orms
> the field allocation during the load); each class has a module (a runti=
me
> compilation-unit) with the code, statics and a list of static pointers,=
 and
> a type descriptor containing the pointer offsets, the method table, and=
 the
> type hierarchy (those are then patched by the linker). The stack traver=
sal
> is conservative.
>
> A few pointers:
> * http://www.memorymanagement.org
> * Paul Wilson; Uniprocessor Garbage Collection Techniques; Proceedings =
of
> the Memory Management, International Workshop, Saint Malo, France, Sep =
1992
> (postscript 764KB; ftp://ftp.cs.utexas.edu/pub/garbage/bigsurv.ps)
> * Garbage Collection in Oberon: http://www.oberon.ethz.ch/gc/
> * Garbage Collection in .NET: (part 1)
> <http://msdn.microsoft.com/msdnmag/issues/1100/GCI/GCI.asp> and (part 2=
)
> <http://msdn.microsoft.com/msdnmag/nettop.asp?page=3D/msdnmag/issues/12=
00/GCI
> 2/GCI2.asp>
> * Slides from lecture "System Software" on Garbage Collection:
> http://www.cs.inf.ethz.ch/37-201/slides/ssw03_memorymanagement_2.pdf

And if you don't mind killing trees: Richard Jones, Rafael Lins; Garbage=20
Collection; John Wiley and Sons, 1996 (ISBN 0 471 94148 4).

> I hope this clarifies more than it confuses....
>
> -Patrik
>
>
> --On Samstag, 10. Januar 2004 11:29 +0100 Chris Gray <chris.gray@kiffer=
.be>
>
> wrote:
> > On Friday 09 January 2004 09:45, Sascha Brawer wrote:
> >> Tom Tromey <tromey@redhat.com> wrote on Thu, 8 Jan 2004 17:48:59 -07=
00:
> >> > [standard pluggable JIT interface]
> >>
> >> This would indeed be quite nice, IMHO.
> >
> > IMHO2 (that should probably be 3 or 4 by now).
> >
> > I suspect that the interface to GC will be hard to define, though. Th=
ere
> > are  several possible models, including:
> >   1. The mutator (JITted code) tells GC, "hey! I just mutated
> > something!",  whereupon GC either (a) aborts the current attempt to m=
ark
> > the heap or (b)  makes a note to re-mark the affected objects before
> > doing a sweep.   2. No one is allowed to mutate anything during the
> > marking process, so a  protocol is devised which ensures this without
> > deadlock.
> >
> > And that's only counting mark-and-sweep collectors ...
> >
> >> > Language choice for API.
> >> >  The obvious choices being:
> >> >  C     lowest common denominator
> >> >  C++   next-to-lowest common denominator :-)  provides some
> >> >        abstraction benefit, maybe
> >> >  Java  using our own tools...
> >>
> >> There are some users of Classpath who cannot execute any C code, suc=
h as
> >> Jaos and JNodeOS. If the pluggable JIT interface was in Java, these
> >> systems would be able to use it (assuming that someone writes a JITt=
er
> >> in Java, like IBM did with their Jalape=F1o/Jikes RVM).
> >>
> >> Also, I'd assume that the interface would be rather narrow in the se=
nse
> >> that it wouldn't get invoked very often in the direction VM --> JIT;
> >> probably once for each class or method to be compiled. But the JIT w=
ould
> >> presumably have to call a lot into the VM (for retrieving field offs=
ets
> >> etc.).
> >>
> >> > ABI Issues
> >>
> >> According to IBM's publications and web pages, Jikes RVM seems to ni=
cely
> >> cope with different ABIs (such as the slightly different calling
> >> conventions for AIX and MacOS X). Maybe, their code could serve as a=
n
> >> example for how to structure the JIT interface so it can cope with
> >> different ABIs.
> >>
> >> Jaos works on top of an abstraction called "object kernel", which
> >> basically is an API to garbage collection, synchronization, etc. Pat=
rik
> >> Reali might be able to tell the list more about this.
> >>
> >> > General API
> >> >
> >> > - Verifier interface?
> >> >  Does the verifier do all checking or does it impose some
> >> >  requirements on the JIT/interpreter?  (Some verifiers choose to
> >> >  delay some checking until interpretation.)
> >> >  Does the JIT want/need information already computed by the verifi=
er?
> >> >  For instance basic blocks or the type map at a given statement.
> >>
> >> I think it would be very wasteful to compute this information twice,=
 but
> >> it might be very difficult to define common data structures that are
> >> suitable for everyone. Might it be sufficient if a verifier could st=
ore
> >> some opaque reference for later use by the JIT?
> >>
> >> AegisVM writes that they have developed a modular bytecode verificat=
ion
> >> architecture, but I didn't look at this yet.
> >>
> >> Another thing that might be interesting to share is parts of a compi=
ler
> >> backend, such as assemblers.
> >>
> >> -- Sascha
> >>
> >> Sascha Brawer, brawer@dandelis.ch, http://www.dandelis.ch/people/bra=
wer/
> >>
> >>
> >>
> >>
> >> _______________________________________________
> >> Classpath mailing list
> >> Classpath@gnu.org
> >> http://mail.gnu.org/mailman/listinfo/classpath
> >
> > --
> > Chris Gray                                  /k/ Embedded Java Solutio=
ns
> > Embedded & Mobile Java, OSGi              http://www.kiffer.be/k/
> > chris.gray@kiffer.be                                      +32 477 599=
 703
> >
> >
> > _______________________________________________
> > Classpath mailing list
> > Classpath@gnu.org
> > http://mail.gnu.org/mailman/listinfo/classpath
>
> --------------------------------
> Patrik Reali
> http://www.reali.ch/~patrik/
> http://www.oberon.ethz.ch/jaos/
> http://www.classpath.org/
> http://iiop-net.sourceforge.net/

--=20
Chris Gray                                  /k/ Embedded Java Solutions
Embedded & Mobile Java, OSGi              http://www.kiffer.be/k/
chris.gray@kiffer.be                                      +32 477 599 703



From MAILER-DAEMON Mon Jan 12 18:18:12 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AgBJz-0001ai-Vx
	for mharc-classpath@gnu.org; Mon, 12 Jan 2004 18:18:11 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AgBJx-0001Zv-Mq
	for classpath@gnu.org; Mon, 12 Jan 2004 18:18:09 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AgBJR-0001TQ-9A
	for classpath@gnu.org; Mon, 12 Jan 2004 18:18:08 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AgA87-0004hd-Sd
	for classpath@gnu.org; Mon, 12 Jan 2004 17:01:51 -0500
Received: from [64.164.98.52] (helo=mtaw4.prodigy.net)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1Ag99e-0005LU-8K
	for classpath@gnu.org; Mon, 12 Jan 2004 15:59:22 -0500
Received: from bothner.com (adsl-216-102-199-253.dsl.snfc21.pacbell.net
	[216.102.199.253])
	by mtaw4.prodigy.net (8.12.10/8.12.10) with ESMTP id i0CKxJjC016299;
	Mon, 12 Jan 2004 12:59:19 -0800 (PST)
Message-ID: <40030AA6.5060608@bothner.com>
Date: Mon, 12 Jan 2004 12:59:18 -0800
From: Per Bothner <per@bothner.com>
User-Agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US;
	rv:1.5) Gecko/20031007
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Patrik Reali <reali@acm.org>
References: <87d69udk04.fsf@fleche.redhat.com>	<20040109084527.6021@smtp.mail.ch.easynet.net>
	<29974751.1073942939@[192.168.1.3]>
In-Reply-To: <29974751.1073942939@[192.168.1.3]>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: GNU Classpath <classpath@gnu.org>
Subject: Re: JIT pluggability (ABI Issues)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2004 23:18:10 -0000

Patrik Reali wrote:

> Calling Convention
> * left-to-right (as in java) or right-to-left (as in C)

Huh?  Argument evaluation order is not really part of the ABI.
C has *unspecified* evaluation order, so many implementations
have evaluated them right-to-left because that's the way the
stack grows (on most C implementations).  But this is less
relevant with optimizing compilers and register-based calling
conventions.
-- 
	--Per Bothner
per@bothner.com   http://per.bothner.com/





From MAILER-DAEMON Mon Jan 12 22:10:20 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AgEwe-0000DX-AZ
	for mharc-classpath@gnu.org; Mon, 12 Jan 2004 22:10:20 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AgEwb-0000C5-8l
	for classpath@gnu.org; Mon, 12 Jan 2004 22:10:17 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ag9Lp-0006FA-VD
	for classpath@gnu.org; Mon, 12 Jan 2004 16:12:29 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ag9Lo-0006EN-TY
	for classpath@gnu.org; Mon, 12 Jan 2004 16:11:57 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id CEAB26253B; Mon, 12 Jan 2004 20:10:25 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 62446-07; Mon, 12 Jan 2004 20:10:24 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-70-168.adsl.solnet.ch
	[212.41.70.168]) by mail01.solnet.ch (Postfix) with ESMTP
	id 676716243E; Mon, 12 Jan 2004 20:10:22 +0000 (GMT)
Received: from nbprr (reali.dnsalias.net [192.168.1.2])
	by reali.dnsalias.net (Postfix) with ESMTP
	id 223A521818; Mon, 12 Jan 2004 20:59:36 +0100 (CET)
Date: Mon, 12 Jan 2004 21:11:14 +0100
From: Patrik Reali <reali@acm.org>
To: Chris Gray <chris.gray@kiffer.be>, Sascha Brawer <brawer@dandelis.ch>,
	GNU Classpath <classpath@gnu.org>, Tom Tromey <tromey@redhat.com>
Message-ID: <28909750.1073941874@[192.168.1.3]>
In-Reply-To: <200401101029.i0AATgSX027757@pigsty.cats.cradle>
References: <87d69udk04.fsf@fleche.redhat.com>
	<20040109084527.6021@smtp.mail.ch.easynet.net>
	<200401101029.i0AATgSX027757@pigsty.cats.cradle>
X-Mailer: Mulberry/3.1.0 (Win32 Demo)
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1; format=flowed
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
X-Virus-Scanned: by SolNet
Cc: 
Subject: Re: JIT pluggability (GC Interface)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2004 03:10:18 -0000

Hi!

let me add my 0.02 cents (of euro). :-)

GC Interface:

let's divide the GCs in 2x2 categories:

* (TA) type-accurate: know where the pointers inside the objects are
* (CO) conservative: guess where the pointers inside the objects are

and

* (NC) non-concurrent: the GC is the only thread running during the=20
collection
* (CI) concurrent / incremental: the GC and the mutator run=20
(pseudo-)concurrently

These categories affect the interface between compiler, generated code, and =

the gc itself.

Static information (TA vs. CO):
* All GCs need a hook into the memory management to return the blocks to=20
the free-list.
* All GCs need to access the whole heap
* TA GCs need a root-set from which the collection starts: the list of all=20
static fields, all pointers on the stack of each thread, all pointers in=20
the CPU registers (and those in the stack when the thread is preemted) [The =

registers depend in fact on the compiler optimizations: if some value may=20
live longer in a register than in a variable then yes, otherwise if the=20
compiler ensures that all pointers in the registers are also anchored=20
somewhere in a variable, then no]
The list of static fields can be obtained through reflection; pointers on=20
the stack are more complicated to get.
* TA GCs need a type descriptor containing the pointer offsets inside each=20
type; arrays of references are also to be collected

Code Instrumentation (NC vs. CI):
* NC GCs do not need code instrumentation
* some CI GCs define code points where the GC can run
* some CI use read barriers (each pointer read operation is instrumented)
* some CI use write barriers (each pointer store operation is instrumented)
* some GCs use master-lists (each pointer points to the real pointer which=20
is present only once, thus moving an object correspond to moving a=20
master-pointer instead of each reference)


Example: Jaos + Aos Kernel
The Aos kernel provides memory allocation with a mark & sweep GC; the mark=20
operation is implemented using the pointer rotation algorithm (Deutsch=20
Waite Schorre). This is a "stop the world" non-concurrent GC (even in the=20
multiprocessor version of the kernel).
The GC information is provided by the Jaos classloader (because it performs =

the field allocation during the load); each class has a module (a runtime=20
compilation-unit) with the code, statics and a list of static pointers, and =

a type descriptor containing the pointer offsets, the method table, and the =

type hierarchy (those are then patched by the linker). The stack traversal=20
is conservative.

A few pointers:
* http://www.memorymanagement.org
* Paul Wilson; Uniprocessor Garbage Collection Techniques; Proceedings of=20
the Memory Management, International Workshop, Saint Malo, France, Sep 1992 =

(postscript 764KB; ftp://ftp.cs.utexas.edu/pub/garbage/bigsurv.ps)
* Garbage Collection in Oberon: http://www.oberon.ethz.ch/gc/
* Garbage Collection in .NET: (part 1)=20
<http://msdn.microsoft.com/msdnmag/issues/1100/GCI/GCI.asp> and (part 2)=20
<http://msdn.microsoft.com/msdnmag/nettop.asp?page=3D/msdnmag/issues/1200/GC=
I
2/GCI2.asp>
* Slides from lecture "System Software" on Garbage Collection:=20
http://www.cs.inf.ethz.ch/37-201/slides/ssw03_memorymanagement_2.pdf

I hope this clarifies more than it confuses....

-Patrik


--On Samstag, 10. Januar 2004 11:29 +0100 Chris Gray <chris.gray@kiffer.be> =

wrote:

> On Friday 09 January 2004 09:45, Sascha Brawer wrote:
>> Tom Tromey <tromey@redhat.com> wrote on Thu, 8 Jan 2004 17:48:59 -0700:
>> > [standard pluggable JIT interface]
>>
>> This would indeed be quite nice, IMHO.
>
> IMHO2 (that should probably be 3 or 4 by now).
>
> I suspect that the interface to GC will be hard to define, though. There
> are  several possible models, including:
>   1. The mutator (JITted code) tells GC, "hey! I just mutated
> something!",  whereupon GC either (a) aborts the current attempt to mark
> the heap or (b)  makes a note to re-mark the affected objects before
> doing a sweep.   2. No one is allowed to mutate anything during the
> marking process, so a  protocol is devised which ensures this without
> deadlock.
>
> And that's only counting mark-and-sweep collectors ...
>
>> > Language choice for API.
>> >  The obvious choices being:
>> >  C     lowest common denominator
>> >  C++   next-to-lowest common denominator :-)  provides some
>> >        abstraction benefit, maybe
>> >  Java  using our own tools...
>>
>> There are some users of Classpath who cannot execute any C code, such as
>> Jaos and JNodeOS. If the pluggable JIT interface was in Java, these
>> systems would be able to use it (assuming that someone writes a JITter =
in
>> Java, like IBM did with their Jalape=F1o/Jikes RVM).
>>
>> Also, I'd assume that the interface would be rather narrow in the sense
>> that it wouldn't get invoked very often in the direction VM --> JIT;
>> probably once for each class or method to be compiled. But the JIT would
>> presumably have to call a lot into the VM (for retrieving field offsets
>> etc.).
>>
>> > ABI Issues
>>
>> According to IBM's publications and web pages, Jikes RVM seems to nicely
>> cope with different ABIs (such as the slightly different calling
>> conventions for AIX and MacOS X). Maybe, their code could serve as an
>> example for how to structure the JIT interface so it can cope with
>> different ABIs.
>>
>> Jaos works on top of an abstraction called "object kernel", which
>> basically is an API to garbage collection, synchronization, etc. Patrik
>> Reali might be able to tell the list more about this.
>>
>> > General API
>> >
>> > - Verifier interface?
>> >  Does the verifier do all checking or does it impose some
>> >  requirements on the JIT/interpreter?  (Some verifiers choose to
>> >  delay some checking until interpretation.)
>> >  Does the JIT want/need information already computed by the verifier?
>> >  For instance basic blocks or the type map at a given statement.
>>
>> I think it would be very wasteful to compute this information twice, but
>> it might be very difficult to define common data structures that are
>> suitable for everyone. Might it be sufficient if a verifier could store
>> some opaque reference for later use by the JIT?
>>
>> AegisVM writes that they have developed a modular bytecode verification
>> architecture, but I didn't look at this yet.
>>
>> Another thing that might be interesting to share is parts of a compiler
>> backend, such as assemblers.
>>
>> -- Sascha
>>
>> Sascha Brawer, brawer@dandelis.ch, http://www.dandelis.ch/people/brawer/
>>
>>
>>
>>
>> _______________________________________________
>> Classpath mailing list
>> Classpath@gnu.org
>> http://mail.gnu.org/mailman/listinfo/classpath
>
> --
> Chris Gray                                  /k/ Embedded Java Solutions
> Embedded & Mobile Java, OSGi              http://www.kiffer.be/k/
> chris.gray@kiffer.be                                      +32 477 599 703
>
>
> _______________________________________________
> Classpath mailing list
> Classpath@gnu.org
> http://mail.gnu.org/mailman/listinfo/classpath
>



--------------------------------
Patrik Reali
http://www.reali.ch/~patrik/
http://www.oberon.ethz.ch/jaos/
http://www.classpath.org/
http://iiop-net.sourceforge.net/



From MAILER-DAEMON Tue Jan 13 02:37:48 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AgJ7U-0005OV-IK
	for mharc-classpath@gnu.org; Tue, 13 Jan 2004 02:37:48 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AgJ7S-0005OH-6t
	for classpath@gnu.org; Tue, 13 Jan 2004 02:37:46 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AgJ6v-0005HQ-8L
	for classpath@gnu.org; Tue, 13 Jan 2004 02:37:45 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AgJ6u-0005HD-VS
	for classpath@gnu.org; Tue, 13 Jan 2004 02:37:13 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 41B5C622BB; Tue, 13 Jan 2004 07:37:12 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 22824-02; Tue, 13 Jan 2004 07:37:11 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-70-168.adsl.solnet.ch
	[212.41.70.168]) by mail01.solnet.ch (Postfix) with ESMTP
	id 91F8A622FE; Tue, 13 Jan 2004 07:37:05 +0000 (GMT)
Received: from pcprr.elca.ch (reali.dnsalias.net [192.168.1.2])
	by reali.dnsalias.net (Postfix) with ESMTP
	id AF62A21824; Tue, 13 Jan 2004 08:26:18 +0100 (CET)
Date: Tue, 13 Jan 2004 08:37:02 +0100
From: Patrik Reali <reali@acm.org>
To: Per Bothner <per@bothner.com>
Message-ID: <62723802.1073983021@[10.40.10.54]>
In-Reply-To: <40030AA6.5060608@bothner.com>
References: <87d69udk04.fsf@fleche.redhat.com>
	<20040109084527.6021@smtp.mail.ch.easynet.net>
	<29974751.1073942939@[192.168.1.3]> <40030AA6.5060608@bothner.com>
X-Mailer: Mulberry/3.1.0 (Win32 Demo)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
X-Virus-Scanned: by SolNet
Cc: GNU Classpath <classpath@gnu.org>
Subject: Re: JIT pluggability (ABI Issues)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2004 07:37:46 -0000

Hi!

What I meant was the order parameters are pushed on the stack. Please 
excuse my previous underspecified statement.

As a side node, pushing parameters right-to-left makes the implementation 
of open parameter lists much simpler (maybe this is another reason C tends 
to use it?).

-Patrik



--On Montag, 12. Januar 2004 12:59 -0800 Per Bothner <per@bothner.com> 
wrote:

> Patrik Reali wrote:
>
>> Calling Convention
>> * left-to-right (as in java) or right-to-left (as in C)
>
> Huh?  Argument evaluation order is not really part of the ABI.
> C has *unspecified* evaluation order, so many implementations
> have evaluated them right-to-left because that's the way the
> stack grows (on most C implementations).  But this is less
> relevant with optimizing compilers and register-based calling
> conventions.
> --
> 	--Per Bothner
> per@bothner.com   http://per.bothner.com/
>
>
>




From MAILER-DAEMON Tue Jan 13 02:50:32 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AgJJo-0002xN-MU
	for mharc-classpath@gnu.org; Tue, 13 Jan 2004 02:50:32 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AgJJl-0002wx-DD
	for classpath@gnu.org; Tue, 13 Jan 2004 02:50:29 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AgJJF-0002uQ-Ov
	for classpath@gnu.org; Tue, 13 Jan 2004 02:50:28 -0500
Received: from [139.165.32.78] (helo=serv09.segi.ulg.ac.be)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AgJJF-0002uN-Bs
	for classpath@gnu.org; Tue, 13 Jan 2004 02:49:57 -0500
Received: (qmail 18176 invoked by uid 504); 13 Jan 2004 08:49:55 +0100
Received: from arnaud.vandyck@ulg.ac.be by serv09.segi.ulg.ac.be by uid 501
	with qmail-scanner-1.16 
	(clamscan: 0.60. spamassassin: 2.55.  Clear:. 
	Processed in 0.301377 secs); 13 Jan 2004 07:49:55 -0000
Received: from unknown (HELO localhost) ([139.165.77.181])
	(envelope-sender <arnaud.vandyck@ulg.ac.be>)
	by serv09.segi.ulg.ac.be (qmail-ldap-1.03) with SMTP
	for <konqueror@gmx.de>; 13 Jan 2004 08:49:55 +0100
Received: from arnaud by localhost with local (Exim 4.30)
	id 1AgJJD-0000oC-6d; Tue, 13 Jan 2004 08:49:55 +0100
To: Michael Koch <konqueror@gmx.de>
References: <E1Ag8ZE-0006sm-C2@savannah.gnu.org>
From: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
Organization: ULg, STE-Formations Informatiques
X-Face: ".{A?<Dzy|V1IPZL0O-B-~G{n+`j%t7K$Y`:u[w54'>P>_0mS1E$Wn4RK&CR)_yvw`),0&;
	?-]upzJvA]->#pP:$si]X039T'Qrd}9t=!EstonSVE1F$dtgGsRC"lyQnP+H6/g:f^d:,0@)P#xCy9?MmW[8n{8B75hA_=]O7TRZ~r9SE6CL*xpR8k4'~!5B8"|u
Date: Tue, 13 Jan 2004 08:49:55 +0100
In-Reply-To: <E1Ag8ZE-0006sm-C2@savannah.gnu.org> (Michael Koch's message of
	"Mon, 12 Jan 2004 15:21:44 -0500")
Message-ID: <87smiks2xo.fsf@oz.fapse.ulg.ac.be>
User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>
Cc: ClassPath List <classpath@gnu.org>
Subject: Re: [patch #2388] DefaultTableCellRenderer update
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2004 07:50:30 -0000

Michael Koch <noreply@savannah.gnu.org> writes:

> /**************************************************************************/
> [patch #2388] Latest Modifications:
>
> Changes by: 
> 		Michael Koch <konqueror@gmx.de>
> 'Date: 
> 		Mon 01/12/04 at 20:21 (GMT)
>
>             What     | Removed                   | Added
> ---------------------------------------------------------------------------
>               Status | Open                      | Closed
>
>
> ------------------ Additional Follow-up Comments ----------------------------
> I commited a sligtly edited patch to CVS.

Very kind, thank you! ;)

I'm a litttle busy at the moment but I'll try to rework on other parts
of Swing as soon as I can.

Cheers,

-- 
Arnaud Vandyck, STE fi, ULg
Formateur Cellule Programmation.



From MAILER-DAEMON Tue Jan 13 04:28:01 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AgKq9-0007s5-5P
	for mharc-classpath@gnu.org; Tue, 13 Jan 2004 04:28:01 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AgKq6-0007rL-H6
	for classpath@gnu.org; Tue, 13 Jan 2004 04:27:58 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AgKpa-0007kA-Jz
	for classpath@gnu.org; Tue, 13 Jan 2004 04:27:57 -0500
Received: from [213.49.17.120] (helo=pigsty.cats.cradle)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AgKpZ-0007jt-VP
	for classpath@gnu.org; Tue, 13 Jan 2004 04:27:26 -0500
Received: from there (localhost.cats.cradle [127.0.0.1])
	by pigsty.cats.cradle (8.12.6/8.11.6) with SMTP id i0D9VqSX031947;
	Tue, 13 Jan 2004 10:31:53 +0100 (CET)
	(envelope-from chris.gray@kiffer.be)
Message-Id: <200401130931.i0D9VqSX031947@pigsty.cats.cradle>
Content-Type: text/plain;
  charset="iso-8859-1"
From: Chris Gray <chris.gray@kiffer.be>
To: Patrik Reali <reali@acm.org>, Sascha Brawer <brawer@dandelis.ch>,
	GNU Classpath <classpath@gnu.org>
Date: Tue, 13 Jan 2004 10:31:52 +0100
X-Mailer: KMail [version 1.3]
References: <87d69udk04.fsf@fleche.redhat.com>
	<20040109084527.6021@smtp.mail.ch.easynet.net>
	<29974751.1073942939@[192.168.1.3]>
In-Reply-To: <29974751.1073942939@[192.168.1.3]>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Cc: Tom Tromey <tromey@redhat.com>
Subject: Re: JIT pluggability (ABI Issues)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2004 09:27:59 -0000

On Monday 12 January 2004 21:28, Patrik Reali wrote:
> * class layout (do we really need this? I guess the fields are allocated in
> the row as they are declared)

Some VMs may group all reference fields together, or try to "pack" fields 
smaller than 16 bits (boolean, byte, short, char).

-- 
Chris Gray                                  /k/ Embedded Java Solutions
Embedded & Mobile Java, OSGi              http://www.kiffer.be/k/
chris.gray@kiffer.be                                      +32 477 599 703



From MAILER-DAEMON Tue Jan 13 04:49:51 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AgLAl-0004St-75
	for mharc-classpath@gnu.org; Tue, 13 Jan 2004 04:49:19 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AgLAS-0004LV-7F
	for classpath@gnu.org; Tue, 13 Jan 2004 04:49:00 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AgL8i-0003Fu-JB
	for classpath@gnu.org; Tue, 13 Jan 2004 04:47:43 -0500
Received: from [150.29.246.133] (helo=mx1.aist.go.jp)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AgL8h-0003Fb-9F
	for classpath@gnu.org; Tue, 13 Jan 2004 04:47:11 -0500
Received: from rpsmtp1.aist.go.jp
	by mx1.aist.go.jp  with ESMTP id i0D9l5E7029146;
	Tue, 13 Jan 2004 18:47:05 +0900 (JST) env-from (shudo@computer.org)
Received: from smtp1.aist.go.jp
	by rpsmtp1.aist.go.jp  with ESMTP id i0D9l5Ua016361;
	Tue, 13 Jan 2004 18:47:05 +0900 (JST) env-from (shudo@computer.org)
Received: from aist.go.jp by smtp1.aist.go.jp  with ESMTP id i0D9l3fp027508;
	Tue, 13 Jan 2004 18:47:04 +0900 (JST) env-from (shudo@computer.org)
Date: Tue, 13 Jan 2004 18:46:23 +0900 (JST)
Message-Id: <20040113.184623.1018045554.shudo@localhost>
To: classpath@gnu.org, chris.gray@kiffer.be
From: shudo@computer.org
In-Reply-To: <200401130931.i0D9VqSX031947@pigsty.cats.cradle>
References: <20040109084527.6021@smtp.mail.ch.easynet.net>
	<29974751.1073942939@[192.168.1.3]>
	<200401130931.i0D9VqSX031947@pigsty.cats.cradle>
X-Mailer: Mew version 3.3 on XEmacs 21.4.12 (Portable Code)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: tromey@redhat.com, brawer@dandelis.ch
Subject: Re: JIT pluggability (ABI Issues)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2004 09:49:17 -0000

From: Chris Gray <chris.gray@kiffer.be>

> On Monday 12 January 2004 21:28, Patrik Reali wrote:
> > * class layout (do we really need this? I guess the fields are allocated in
> > the row as they are declared)
>
> Some VMs may group all reference fields together, or try to "pack" fields
> smaller than 16 bits (boolean, byte, short, char).

I remember Project Monty (by Lars Bak, Sun) developed such a JVM for
CLDC profile.  The JVM became CLDC HotSpot later.

And there were several researches focusing on layout of object fields.
One of them might be based on SableVM.

  Kazuyuki Shudo	shudo@computer.org	http://www.shudo.net/



From MAILER-DAEMON Tue Jan 13 07:15:22 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AgNPk-0004Y7-CD
	for mharc-classpath@gnu.org; Tue, 13 Jan 2004 07:12:56 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AgNJy-0003bC-4D
	for classpath@gnu.org; Tue, 13 Jan 2004 07:06:58 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AgNHV-00039r-CN
	for classpath@gnu.org; Tue, 13 Jan 2004 07:04:56 -0500
Received: from [217.8.192.21] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AgND7-0002JZ-Qd
	for classpath@gnu.org; Tue, 13 Jan 2004 06:59:53 -0500
Received: from [217.8.197.56] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 187914; Tue, 13 Jan 2004 13:02:51 +0100
From: Sascha Brawer <brawer@dandelis.ch>
To: GNU Classpath <classpath@gnu.org>
Date: Tue, 13 Jan 2004 12:59:40 +0100
Message-Id: <20040113115940.20129@smtp.mail.ch.easynet.net>
In-Reply-To: <200401130931.i0D9VqSX031947@pigsty.cats.cradle>
References: <200401130931.i0D9VqSX031947@pigsty.cats.cradle>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: Tromey <tromey@redhat.com>, Chris Gray <chris.gray@kiffer.be>, Tom@gnu.org
Subject: Re: JIT pluggability (ABI Issues)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2004 12:12:52 -0000

CG =3D Chris Gray <chris.gray@kiffer.be> wrote:
PR =3D Patrik Reali <reali@acm.org> wrote:

PR> * class layout (do we really need this=3F I guess the fields are
PR> allocated in the row as they are declared)

CG> Some VMs may group all reference fields together, or try to
CG> "pack" fields smaller than 16 bits (boolean, byte, short, char).

Please apologize for this kind of off-topic post, but in case anyone was=

interested in the subject, please find below a few references to
background reading. There surely exist plenty more papers in this area.

------------------------------------------

[Chilimbi et al., 1999] Trishul M. Chilimbi, Bob Davidson, and James R.
Larus. Cache-Conscious Structure Definition. In Proceedings of the ACM
SIGPLAN Conference on Programming Language Design and Implementation
(PLDI '99), May 1999, pp. 13--24.

(a) Class Splitting separates the fields of eligible classes into a
frequently and a rarely accessed part, based on instrumentation data. Th=
e
optimization is applicable to classes whose size roughly equals a cache
block (common for Java programs), provided enough variation in field
access frequency. Because of fewer cache misses, the performance of five=

Java programs has improved by 6 -- 18%. -- (b) Field Reordering could
further improve the performance of Microsoft SQL server by 3%, despite
previous cache-concious C programming. Illustrates that structure layout=

is better left to the compiler.

------------------------------------------

[Dolby and Chien, 2000] Julian Dolby and Andrew A. Chen. An Automatic
Object Inlining Optimization and its Evaluation. In Proceedings of the
ACM SIGPLAN Conference on Programming Language Design and Implementation=

(PLDI 2000), Vancouver BC, Canada, June 2000, pp. 345 - 357.

Object Inlining transforms heap data structures by fusing parent and
child objects together. It can speed up a program by reducing pointer
dereferencing and by improving memory access behavior. With the benchmar=
k
programs, 30% of objects could be inlined, leading to 12% fewer loads,
25% fewer L1 cache misses and 25% fewer read stalls.

------------------------------------------

[Kistler and Franz, 2000] Thomas Kistler and Michael Franz. Automated
Data-Member Layout of Heap Objects to Improve Memory-Hierarchy
Performance. ACM Transactions on Programming Languages and Systems
(TOPLAS) 22, No. 3, May 2000. pp. 490--505.

Instrumentation data is used to build a weighted graph whose edges
represent temporal dependencies between fields. In order to assign field=
s
to cache lines, the graph is partitioned; a second step orders the field=
s
within each partition. This Field reordering improved the performance of=

six Oberon programs by 3 to 50%.

------------------------------------------

[Shuf et al., 2001] Yefim Shuf, Mauricio J. Serrano, Manish Gupta, and
Jaswinder Pal Singh. Characterizing the Memory Behavior of Java
Workloads: A Structured View and Opportunities for Optimizations. In
Proceedings of SIGMETRICS 2001/Performance 2001, Cambridge MA, USA, June=
 2001.

Draws conclusions from detailed instrumentation of the SPEC JVM98 and
JBB2000 benchmark suites, running on a modified version of the Jalape=F1=
o
VM. The L1 data cache is less effective than for C/C++ desktop workloads=

(4% misses, compared to 1%). Object Inlining could partially fix the
problem caused by "pointer chasing." Field re-ordering is unlikely to
increase L1-cache performance for Java, because most "hot" objects fit
into a 32-byte cache line. While Data Prefetching could mitigate the L1
cache situation, TLB misses are frequent as well, and current hardware
ignores prefetching instructions if the fetched address is not in the
TLB. To increase TLB hit rate, large VM pages should be used, and class
data should be co-located (because virtual method tables contribute
noticeably to TLB misses).

-- Sascha

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





From MAILER-DAEMON Thu Jan 15 18:22:14 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhGoY-0002s6-1O
	for mharc-classpath@gnu.org; Thu, 15 Jan 2004 18:22:14 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhGoT-0002ql-4I
	for classpath@gnu.org; Thu, 15 Jan 2004 18:22:09 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhG6m-0001wY-2d
	for classpath@gnu.org; Thu, 15 Jan 2004 17:37:31 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AhEhf-00021j-Tg
	for classpath@gnu.org; Thu, 15 Jan 2004 16:07:00 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-049.ewetel.net
	[80.228.75.49])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i0FL6s1h007589;
	Thu, 15 Jan 2004 22:06:55 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AhEhp-0005By-00; Thu, 15 Jan 2004 22:07:09 +0100
From: Michael Koch <konqueror@gmx.de>
To: classpath@gnu.org
Date: Thu, 15 Jan 2004 22:10:25 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_BHwBA9BGCMXr7e6"
Message-Id: <200401152210.25169.konqueror@gmx.de>
X-CheckCompat: OK
Cc: brawer@dandelis.ch
Subject: Patch: logging.properties
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jan 2004 23:22:11 -0000


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

Hi list,


I thought about merged logging.properties from libgcj. I wrote the attached 
patch for this.

Please review and comment. Any better ideas ?


Michael

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

Index: java/util/logging/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/Makefile.am,v
retrieving revision 1.2
diff -u -b -B -r1.2 Makefile.am
--- java/util/logging/Makefile.am	6 May 2002 21:10:53 -0000	1.2
+++ java/util/logging/Makefile.am	15 Jan 2004 21:05:28 -0000
@@ -2,6 +2,9 @@
 
 SUBDIRS = 
 
+propertiesdir = $(libdir)
+properties_DATA = logging.properties
+
 EXTRA_DIST = \
 ConsoleHandler.java \
 ErrorManager.java \
Index: java/util/logging/logging.properties
===================================================================
RCS file: java/util/logging/logging.properties
diff -N java/util/logging/logging.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/util/logging/logging.properties	15 Jan 2004 21:05:28 -0000
@@ -0,0 +1,8 @@
+# Default logging properties.
+# See javadoc in java.util.logging.LogManager to information on
+# overriding these settings.  Most of the defaults are compiled in, so
+# this file is fairly minimal.
+
+# Send log records to System.err, default to INFO per documentation.
+handlers = java.util.logging.ConsoleHandler
+.level = INFO

--Boundary-00=_BHwBA9BGCMXr7e6--




From MAILER-DAEMON Fri Jan 16 00:19:10 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhMNx-0002dO-Hs
	for mharc-classpath@gnu.org; Fri, 16 Jan 2004 00:19:09 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhMNs-0002bP-9H
	for classpath@gnu.org; Fri, 16 Jan 2004 00:19:04 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhMNI-0002Vp-9d
	for classpath@gnu.org; Fri, 16 Jan 2004 00:19:00 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AhCVb-0000BD-9Z
	for classpath@gnu.org; Thu, 15 Jan 2004 13:46:23 -0500
Received: from [62.108.28.95] (helo=nescio.wildebeest.org)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AhCUi-0002Sb-HW
	for classpath@gnu.org; Thu, 15 Jan 2004 13:45:28 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1AhCTs-00025s-00; Thu, 15 Jan 2004 19:44:36 +0100
From: Mark Wielaard <mark@klomp.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <200401102349.22756.konqueror@gmx.de>
References: <200401102349.22756.konqueror@gmx.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-4OJUAGA/ahoJgDV5q9dO"
Message-Id: <1074192296.975.96.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Thu, 15 Jan 2004 19:44:56 +0100
Cc: classpath@gnu.org
Subject: Re: FYI: Patch: file stuff
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 05:19:06 -0000


--=-4OJUAGA/ahoJgDV5q9dO
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Sat, 2004-01-10 at 23:49, Michael Koch wrote:
> I wanna start a new trend on this mailing list now. I wanna ask for appro=
ving=20
> the attached patch. This patch fixes two bugs with files.

Good practice, but Don't start your subject with FYI (For Your
Information) in that case. That makes it look like you don't expect a
patch review.

> 1) java.io.File.list() uses an internal method called listInternal(). Thi=
s=20
> methods returns null in the error case. list() now converts this to a=20
> String[0] array which is similar to an empty directory. This behaviour is=
=20
> incorrect. We should return the null in the error case.

Correct. When the given file isn't a directory the spec says we must
return null (is there a Mauve test for this?). Better also update the
documentation of listInternal() to mention this fact.

> 2) Java_java_io_File_listInternal doest release local references to a new=
ly=20
> created string. This patch fixes this.

Good catch. Some JNI implementations limit the number of local
references so this could easily bite someone.

> Please review and comment.
>=20
> mjw: Okay to commit ?

Yes, please do. If you can also look after adding the comment to
listInternal() and checking whether we have a Mauve test for this case,
that would be nice.

Note that others with commit-access can also approve patches if they
want. In general it is a good idea when the original author of the code
that gets changed by a patch takes a look at it.

Cheers,

Mark

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

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

iD8DBQBABt+nxVhZCJWr9QwRAk1VAKCMXCUyn5qGos4hFXI4519ADkoQFACfSZXB
MUKc+w7t2kEiRZEo8opqEHA=
=w7dP
-----END PGP SIGNATURE-----

--=-4OJUAGA/ahoJgDV5q9dO--




From MAILER-DAEMON Fri Jan 16 01:54:00 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhNri-0004vp-RT
	for mharc-classpath@gnu.org; Fri, 16 Jan 2004 01:53:58 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhNra-0004tx-RX
	for classpath@gnu.org; Fri, 16 Jan 2004 01:53:50 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhNr1-0004lY-7y
	for classpath@gnu.org; Fri, 16 Jan 2004 01:53:46 -0500
Received: from [217.8.192.21] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AhNpd-0004Oo-0A
	for classpath@gnu.org; Fri, 16 Jan 2004 01:51:49 -0500
Received: from [217.8.197.71] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 235044 for classpath@gnu.org;
	Fri, 16 Jan 2004 07:55:13 +0100
From: Sascha Brawer <brawer@dandelis.ch>
To: GNU Classpath <classpath@gnu.org>
Date: Fri, 16 Jan 2004 07:51:43 +0100
Message-Id: <20040116065143.24274@smtp.mail.ch.easynet.net>
In-Reply-To: <200401152210.25169.konqueror@gmx.de>
References: <200401152210.25169.konqueror@gmx.de>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: Patch: logging.properties
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 06:53:52 -0000

Michael Koch <konqueror@gmx.de> wrote on Thu, 15 Jan 2004 22:10:25 +0100:

>I thought about merged logging.properties from libgcj. I wrote the attached 
>patch for this.
>
>Please review and comment. Any better ideas ?

Would you mind explaining why exactly this patch is needed? Thanks.

-- Sascha

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





From MAILER-DAEMON Fri Jan 16 02:19:36 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhOGV-0006Ed-UI
	for mharc-classpath@gnu.org; Fri, 16 Jan 2004 02:19:35 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhOGQ-0006D1-Pz
	for classpath@gnu.org; Fri, 16 Jan 2004 02:19:30 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhOFn-000646-0T
	for classpath@gnu.org; Fri, 16 Jan 2004 02:19:23 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AhOFm-00063v-Mb
	for classpath@gnu.org; Fri, 16 Jan 2004 02:18:50 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AhO3o-00007a-10
	for classpath@gnu.org; Fri, 16 Jan 2004 02:06:28 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-196.ewetel.net
	[80.228.75.196])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i0G76Ol1024662;
	Fri, 16 Jan 2004 08:06:24 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AhO3z-0006bN-00; Fri, 16 Jan 2004 08:06:39 +0100
Date: Fri, 16 Jan 2004 08:06:39 +0100
From: Michael Koch <konqueror@gmx.de>
To: Sascha Brawer <brawer@dandelis.ch>
Message-ID: <20040116070639.GA24920@mail.konqueror.de>
References: <200401152210.25169.konqueror@gmx.de>
	<20040116065143.24274@smtp.mail.ch.easynet.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20040116065143.24274@smtp.mail.ch.easynet.net>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: GNU Classpath <classpath@gnu.org>
Subject: Re: Patch: logging.properties
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 07:19:32 -0000

On Fri, Jan 16, 2004 at 07:51:43AM +0100, Sascha Brawer wrote:
> Michael Koch <konqueror@gmx.de> wrote on Thu, 15 Jan 2004 22:10:25 +0100:
> 
> >I thought about merged logging.properties from libgcj. I wrote the attached 
> >patch for this.
> >
> >Please review and comment. Any better ideas ?
> 
> Would you mind explaining why exactly this patch is needed? Thanks.

This patch is needed to add logging.properties. This file describes and
overrides the built-in defaults for java.util.logging.  It's needed to let
administrators overwrite the defaults on a global basis.

JDK/JRE does it this way, libgcj does it this way and classpath should
too. At least to get compatible in this way.


Michael



From MAILER-DAEMON Fri Jan 16 05:46:20 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhRUZ-0001tT-Qq
	for mharc-classpath@gnu.org; Fri, 16 Jan 2004 05:46:19 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhRUT-0001r7-4R
	for classpath@gnu.org; Fri, 16 Jan 2004 05:46:13 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhRGS-00075c-HG
	for classpath@gnu.org; Fri, 16 Jan 2004 05:32:16 -0500
Received: from [217.8.192.21] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AhRGQ-00074t-J8
	for classpath@gnu.org; Fri, 16 Jan 2004 05:31:42 -0500
Received: from [217.8.197.71] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 239581; Fri, 16 Jan 2004 11:34:24 +0100
From: Sascha Brawer <brawer@dandelis.ch>
To: <mkoch@mail.konqueror.de>
Date: Fri, 16 Jan 2004 11:30:54 +0100
Message-Id: <20040116103054.21705@smtp.mail.ch.easynet.net>
In-Reply-To: <20040116070639.GA24920@mail.konqueror.de>
References: <20040116070639.GA24920@mail.konqueror.de>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: GNU Classpath <classpath@gnu.org>
Subject: Re: Patch: logging.properties
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 10:46:17 -0000

Michael Koch <konqueror@gmx.de> wrote on Fri, 16 Jan 2004 08:06:39 +0100:

>> [Patch for adding logging.properties]
>>>Please review and comment. Any better ideas ?
>> 
>> Would you mind explaining why exactly this patch is needed? Thanks.
>
>This patch is needed to add logging.properties. This file describes and
>overrides the built-in defaults for java.util.logging.  It's needed to let
>administrators overwrite the defaults on a global basis.
>
>JDK/JRE does it this way, libgcj does it this way and classpath should
>too.

Umh, I know what the purpose of the logging.properties file is (I've
written the java.util.logging implementation). What bothers me is the
comment in the patch: "Most of the defaults are compiled in, so this file
is fairly minimal."

The logging framework should assign default values for _all_ properties
when the logging.properties file is not present, or if it is empty. If
the logging.properties was actually needed, this would indicate a bug in
the java.util.logging implementation. While adding the logging.properties
file would be a workaround, I'd rather like to fix the bug.

Do you have some code that does not work without the patch?

-- Sascha

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





From MAILER-DAEMON Fri Jan 16 06:30:16 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhSB4-0000xH-Ur
	for mharc-classpath@gnu.org; Fri, 16 Jan 2004 06:30:14 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhSAt-0000vZ-2h
	for classpath@gnu.org; Fri, 16 Jan 2004 06:30:03 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhS78-0000D6-AK
	for classpath@gnu.org; Fri, 16 Jan 2004 06:26:41 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AhRWH-0002GN-AA
	for classpath@gnu.org; Fri, 16 Jan 2004 05:48:05 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-196.ewetel.net
	[80.228.75.196])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i0GAm11h013848;
	Fri, 16 Jan 2004 11:48:02 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AhRWS-0008CK-00; Fri, 16 Jan 2004 11:48:16 +0100
Date: Fri, 16 Jan 2004 11:48:16 +0100
From: Michael Koch <konqueror@gmx.de>
To: Sascha Brawer <brawer@dandelis.ch>
Message-ID: <20040116104816.GB24920@mail.konqueror.de>
References: <20040116070639.GA24920@mail.konqueror.de>
	<20040116103054.21705@smtp.mail.ch.easynet.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20040116103054.21705@smtp.mail.ch.easynet.net>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: GNU Classpath <classpath@gnu.org>
Subject: Re: Patch: logging.properties
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 11:30:12 -0000

On Fri, Jan 16, 2004 at 11:30:54AM +0100, Sascha Brawer wrote:
> Michael Koch <konqueror@gmx.de> wrote on Fri, 16 Jan 2004 08:06:39 +0100:
> 
> >> [Patch for adding logging.properties]
> >>>Please review and comment. Any better ideas ?
> >> 
> >> Would you mind explaining why exactly this patch is needed? Thanks.
> >
> >This patch is needed to add logging.properties. This file describes and
> >overrides the built-in defaults for java.util.logging.  It's needed to let
> >administrators overwrite the defaults on a global basis.
> >
> >JDK/JRE does it this way, libgcj does it this way and classpath should
> >too.
> 
> Umh, I know what the purpose of the logging.properties file is (I've
> written the java.util.logging implementation). What bothers me is the
> comment in the patch: "Most of the defaults are compiled in, so this file
> is fairly minimal."
> 
> The logging framework should assign default values for _all_ properties
> when the logging.properties file is not present, or if it is empty. If
> the logging.properties was actually needed, this would indicate a bug in
> the java.util.logging implementation. While adding the logging.properties
> file would be a workaround, I'd rather like to fix the bug.
> 
> Do you have some code that does not work without the patch?

This is not to overwrite things in java.util.logging in the default
version. It's more to make the administrator aware that he can change
the defaults easily site-global. It should show the defaults in
java.util.logging too. That way the admin doesnt has to look into the
sources to see them. Thats not the case currently. The logging.properties
in Suns JRE does this. 


Michael



From MAILER-DAEMON Fri Jan 16 06:50:54 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhSV2-0003Nv-PL
	for mharc-classpath@gnu.org; Fri, 16 Jan 2004 06:50:52 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhSUu-0003M7-Gc
	for classpath@gnu.org; Fri, 16 Jan 2004 06:50:44 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhSUM-0003Ec-Gj
	for classpath@gnu.org; Fri, 16 Jan 2004 06:50:42 -0500
Received: from [217.8.192.21] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AhSUL-0003EP-UG
	for classpath@gnu.org; Fri, 16 Jan 2004 06:50:10 -0500
Received: from [217.8.197.71] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 240906; Fri, 16 Jan 2004 12:53:36 +0100
From: Sascha Brawer <brawer@dandelis.ch>
To: <mkoch@mail.konqueror.de>
Date: Fri, 16 Jan 2004 12:50:08 +0100
Message-Id: <20040116115008.5273@smtp.mail.ch.easynet.net>
In-Reply-To: <20040116104816.GB24920@mail.konqueror.de>
References: <20040116104816.GB24920@mail.konqueror.de>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: GNU Classpath <classpath@gnu.org>
Subject: Re: Patch: logging.properties
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 11:50:46 -0000

Michael Koch <konqueror@gmx.de> wrote on Fri, 16 Jan 2004 11:48:16 +0100:

>>>> [Patch for adding logging.properties]

>This is not to overwrite things in java.util.logging in the default
>version. It's more to make the administrator aware that he can change
>the defaults easily site-global. It should show the defaults in
>java.util.logging too. That way the admin doesnt has to look into the
>sources to see them. Thats not the case currently. The logging.properties
>in Suns JRE does this. 

If the only purpose of the patch is documentation, it really should have
more verbose comments. I don't think that the proposed patch would
actually help a sysadmin very much. What about the following?

# Logging Configuration
# ---------------------
# By setting properties in this file, you can change the behavior
# of the java.util.logging framework. Some examples are listed below.
#
#
# To change the logging threshold of all loggers to the value
# java.util.logging.Level.CONFIG, un-comment the following line:
#
# .level=CONFIG
#
#
# To change the logging threshold of all loggers in the "foo.bar"
# namespace to java.util.logging.Level.FINEST, un-comment the follwing
# line. This will also affect any children, such as "foo.bar.baz".
#
# foo.bar.level=FINEST
#
#
# To register a FileHandler for the "foo.bar" namespace and its
# children, un-comment the following line. By default, the FileHandler
# will write XML-formatted messages into a file "java0.log" in the
# user's home directory.
#
# foo.bar.handlers=java.util.logging.FileHandler
#
#
# To make a FileHandler use plain text instead of XML, and to place
# the log file into a different location (such as /tmp/myfile.log
# or /var/tmp/myfile.log), un-comment the following:
#
# java.util.logging.FileHandler.pattern=%t/myfile.log
# java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
#
#
# Logging can be configured in many ways. For more information, please
# look at the documentation of the java.util.logging package.

-- Sascha

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





From MAILER-DAEMON Fri Jan 16 07:48:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhSnz-0005M1-5a
	for mharc-classpath@gnu.org; Fri, 16 Jan 2004 07:10:27 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhSne-0005Kq-2z
	for classpath@gnu.org; Fri, 16 Jan 2004 07:10:06 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhSn4-0005FG-PS
	for classpath@gnu.org; Fri, 16 Jan 2004 07:10:01 -0500
Received: from [217.8.192.21] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AhSn2-0005Ee-TV
	for classpath@gnu.org; Fri, 16 Jan 2004 07:09:29 -0500
Received: from [217.8.197.71] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 241125; Fri, 16 Jan 2004 13:12:51 +0100
From: Sascha Brawer <brawer@dandelis.ch>
To: <mkoch@mail.konqueror.de>
Date: Fri, 16 Jan 2004 13:09:23 +0100
Message-Id: <20040116120923.17310@smtp.mail.ch.easynet.net>
In-Reply-To: <20040116115607.GC24920@mail.konqueror.de>
References: <20040116115607.GC24920@mail.konqueror.de>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: GNU Classpath <classpath@gnu.org>
Subject: Re: Patch: logging.properties
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 12:10:09 -0000

MK = Michael Koch <konqueror@gmx.de> wrote:
SB = Sascha Brawer <brawer@dandelis.ch> wrote:

MK> [Patch for adding logging.properties]

SB> If the only purpose of the patch is documentation, it really should have
SB> more verbose comments. I don't think that the proposed patch would
SB> actually help a sysadmin very much. What about the following?
SB>
SB> [New proposal for logging.properties; 1308 characters/37 lines]

MK> Looks great. I will use this. This should go into libgcj too. Will
MK> make sure this.

One possible problem: The logging.properties file will be read whenever
the java.util.logging framework is being used for the first time in a
JVM; it's read by java.util.logging.LogManager.<clinit>, unless some
system properties indicate to use a different file (or configuration via
a custom class).

So, a long config file will slow down the start-up time of every Java
program that uses logging either directly or indirectly. I don't think
the delay would be significant, but I thought I should mention this.

-- Sascha

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





From MAILER-DAEMON Fri Jan 16 12:06:39 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhXQc-0008VN-P1
	for mharc-classpath@gnu.org; Fri, 16 Jan 2004 12:06:38 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhTvl-0006Ib-NC
	for classpath@gnu.org; Fri, 16 Jan 2004 08:22:33 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhSdM-0004Ta-LT
	for classpath@gnu.org; Fri, 16 Jan 2004 07:00:00 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AhSZv-0003vp-Sp
	for classpath@gnu.org; Fri, 16 Jan 2004 06:55:56 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-196.ewetel.net
	[80.228.75.196])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i0GBtql1011499;
	Fri, 16 Jan 2004 12:55:52 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AhSa7-0008ON-00; Fri, 16 Jan 2004 12:56:07 +0100
Date: Fri, 16 Jan 2004 12:56:07 +0100
From: Michael Koch <konqueror@gmx.de>
To: Sascha Brawer <brawer@dandelis.ch>
Message-ID: <20040116115607.GC24920@mail.konqueror.de>
References: <20040116104816.GB24920@mail.konqueror.de>
	<20040116115008.5273@smtp.mail.ch.easynet.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20040116115008.5273@smtp.mail.ch.easynet.net>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: GNU Classpath <classpath@gnu.org>
Subject: Re: Patch: logging.properties
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 17:06:36 -0000

On Fri, Jan 16, 2004 at 12:50:08PM +0100, Sascha Brawer wrote:
> Michael Koch <konqueror@gmx.de> wrote on Fri, 16 Jan 2004 11:48:16 +0100:
> 
> >>>> [Patch for adding logging.properties]
> 
> >This is not to overwrite things in java.util.logging in the default
> >version. It's more to make the administrator aware that he can change
> >the defaults easily site-global. It should show the defaults in
> >java.util.logging too. That way the admin doesnt has to look into the
> >sources to see them. Thats not the case currently. The logging.properties
> >in Suns JRE does this. 
> 
> If the only purpose of the patch is documentation, it really should have
> more verbose comments. I don't think that the proposed patch would
> actually help a sysadmin very much. What about the following?
> 
> # Logging Configuration
> # ---------------------
> # By setting properties in this file, you can change the behavior
> # of the java.util.logging framework. Some examples are listed below.
> #
> #
> # To change the logging threshold of all loggers to the value
> # java.util.logging.Level.CONFIG, un-comment the following line:
> #
> # .level=CONFIG
> #
> #
> # To change the logging threshold of all loggers in the "foo.bar"
> # namespace to java.util.logging.Level.FINEST, un-comment the follwing
> # line. This will also affect any children, such as "foo.bar.baz".
> #
> # foo.bar.level=FINEST
> #
> #
> # To register a FileHandler for the "foo.bar" namespace and its
> # children, un-comment the following line. By default, the FileHandler
> # will write XML-formatted messages into a file "java0.log" in the
> # user's home directory.
> #
> # foo.bar.handlers=java.util.logging.FileHandler
> #
> #
> # To make a FileHandler use plain text instead of XML, and to place
> # the log file into a different location (such as /tmp/myfile.log
> # or /var/tmp/myfile.log), un-comment the following:
> #
> # java.util.logging.FileHandler.pattern=%t/myfile.log
> # java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
> #
> #
> # Logging can be configured in many ways. For more information, please
> # look at the documentation of the java.util.logging package.

Looks great. I will use this. This should go into libgcj too. Will make
sure this.


Michael



From MAILER-DAEMON Sun Jan 18 13:42:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AiHs1-0007Wk-JB
	for mharc-classpath@gnu.org; Sun, 18 Jan 2004 13:42:01 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AiHrz-0007W4-0r
	for classpath@gnu.org; Sun, 18 Jan 2004 13:41:59 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AiHrS-0007SL-6G
	for classpath@gnu.org; Sun, 18 Jan 2004 13:41:57 -0500
Received: from [62.108.28.95] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AiHrR-0007Rv-Me
	for classpath@gnu.org; Sun, 18 Jan 2004 13:41:25 -0500
Received: from slauerhoff.wildebeest.org ([192.168.1.27] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1AiHr1-0001oN-00; Sun, 18 Jan 2004 19:40:59 +0100
From: Mark Wielaard <mark@klomp.org>
To: classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-XVp43z7Z8h8irzMla8VM"
Message-Id: <1074261946.882.31.camel@localhost>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sun, 18 Jan 2004 19:41:19 +0100
Cc: debian-java@lists.debian.org
Subject: Fosdem 2004 program
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jan 2004 18:41:59 -0000


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

GNU Classpath & Friends - Free Java - Fosdem 2004 program.

We now have an official program for our meeting at Fosdem 2004.
(February 21/22, Brussel)
And an official page: http://www.fosdem.org/2004/index/dev_room_java
(Abstract for all talks will be added soon to that page.)

The schedule was constructed with the following contraints in mind:
- Saterday morning are the keynotes.
- Sunday morning is the official java track.
- The Debian people have their talks Sunday morning.
  (We share the room with them.)
- The Embedded people will probably want to attend the fbAWT talk.

Saturday morning - keynotes
http://www.fosdem.org/2004/index/schedule

Saterday afternoon:

- 14h00 -> 14h50
  GNU Classpath -- Core Classes for a Diversity of Free Java Virtual
  Machines (GNU Classpath overview and free applications/runtimes show.)
  by Sascha Brawer and  Mark Wielaard

- 15h00 -> 15h50 -
  SableVM - the Apache of Java Virtual Machines
  (Motivations and technical solutions behind the SableVM Project.)
  by Grzegorz B. Prokopski

 16h00 -> 16h50
  fbAWT - Direct to your buffer
  (Slim Abstract Window Toolkit implementation written in java that
   doesn't use any peer widget library, but has direct access to
   either a linux framebuffer or a VNC server backend.)
  by Stephane Meslin-Weber

Sunday morning - java/X & Co. tracks
http://www.fosdem.org/2004/index/schedule

Sunday afternoon:
- 14h00 -> 15h50
  Packaging Free Java Applications For Free Operating Systems
  (Comparing different packaging projects like Debian,
   Gentoo, RHUG/Naoko and JPackage, and .deb best practises.)
  See also the Wiki:
http://java.debian.net/index.php/CommonJavaPackaging
  by Dalibor Topic and Arnaud Vandyck

- 15h00 -> 17h00
  Open discussions
  - GNU Classpath 1.0 Roadmap
  - Free VM/Compiler integration/cooperation
  - Standardization and compatibility issues


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

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

iD8DBQBAB++6xVhZCJWr9QwRAgFpAJ40o2RL+LOLt1yFALdKAeqEzidISQCgp2Og
L7cKA6EG1md5NjyY/IFy7nI=
=BHFN
-----END PGP SIGNATURE-----

--=-XVp43z7Z8h8irzMla8VM--




From MAILER-DAEMON Mon Jan 19 06:39:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AiXkM-0005Jv-Tx
	for mharc-classpath@gnu.org; Mon, 19 Jan 2004 06:39:10 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AiXkH-0005I7-EY
	for classpath@gnu.org; Mon, 19 Jan 2004 06:39:05 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AiXjj-0005E3-GW
	for classpath@gnu.org; Mon, 19 Jan 2004 06:39:02 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AiXji-0005De-GV
	for classpath@gnu.org; Mon, 19 Jan 2004 06:38:30 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AiXhL-0003x7-Or
	for classpath@gnu.org; Mon, 19 Jan 2004 06:36:03 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-81-082.ewetel.net
	[80.228.81.82])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0JBZxHA000556
	for <classpath@gnu.org>; Mon, 19 Jan 2004 12:36:00 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AiXhb-0002gD-00
	for <classpath@gnu.org>; Mon, 19 Jan 2004 12:36:19 +0100
From: Michael Koch <konqueror@gmx.de>
To: classpath@gnu.org
Date: Mon, 19 Jan 2004 12:39:33 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200401191239.34582.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Update for prerquisite autoconf/automake versions ?
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jan 2004 11:39:07 -0000

Hi list,


as you probably know I updated the autoconf/automake stuff in classpath to 
work with the newest versions seemlessly (autoconf 2.59/automake 1.8.2).

Unfortunately I now found out that its broken with autoconf 2.57. I used a 
macros that replaced other obsoleted macros in 2.59 but didnt existed in 
earlier versions.

Currently we require at least 2.53. Should we now update our prerequisites to 
autoconf 2.59 or should I rework the stuff to work with 2.53 too again ?

Personally I vote for the first solution. This is in my opinion the way to go. 
End users doesnt have to use this anyway as tarballs contain the generated 
files already and for developers of the cvs version is easy to update their 
local version.


Michael




From MAILER-DAEMON Mon Jan 19 06:44:55 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AiXpu-0006R8-Aw
	for mharc-classpath@gnu.org; Mon, 19 Jan 2004 06:44:54 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AiXpp-0006Oi-Hc
	for classpath@gnu.org; Mon, 19 Jan 2004 06:44:49 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AiXpH-0006G9-Bf
	for classpath@gnu.org; Mon, 19 Jan 2004 06:44:47 -0500
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AiXpG-0006FQ-BL
	for classpath@gnu.org; Mon, 19 Jan 2004 06:44:14 -0500
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1AiXpE-0002lG-00
	for <classpath@gnu.org>; Mon, 19 Jan 2004 12:44:12 +0100
Received: from mpiat2304.ag2.mpi-sb.mpg.de
	([139.19.20.93] helo=kaffe.org ident=topic)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AiXpC-0002gp-00; Mon, 19 Jan 2004 12:44:10 +0100
Message-ID: <400BC30A.1030500@kaffe.org>
Date: Mon, 19 Jan 2004 12:44:10 +0100
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.3) Gecko/20030312
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Michael Koch <konqueror@gmx.de>
References: <200401191239.34582.konqueror@gmx.de>
In-Reply-To: <200401191239.34582.konqueror@gmx.de>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: by AMaViS perl-11
Cc: classpath@gnu.org
Subject: Re: Update for prerquisite autoconf/automake versions ?
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jan 2004 11:44:52 -0000

Hallo Michael,

Michael Koch wrote:
> Hi list,
> 
> 
> as you probably know I updated the autoconf/automake stuff in classpath to 
> work with the newest versions seemlessly (autoconf 2.59/automake 1.8.2).
> 
> Unfortunately I now found out that its broken with autoconf 2.57. I used a 
> macros that replaced other obsoleted macros in 2.59 but didnt existed in 
> earlier versions.
> 
> Currently we require at least 2.53. Should we now update our prerequisites to 
> autoconf 2.59 or should I rework the stuff to work with 2.53 too again ?
> 
> Personally I vote for the first solution. This is in my opinion the way to go. 
> End users doesnt have to use this anyway as tarballs contain the generated 
> files already and for developers of the cvs version is easy to update their 
> local version.

I'd second the first solution. Automake 2.59, if it is not already, will 
be part of the major distributions anyway.

cheers,
dalibor topic




From MAILER-DAEMON Mon Jan 19 07:36:55 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AiYeF-0005Tr-8N
	for mharc-classpath@gnu.org; Mon, 19 Jan 2004 07:36:55 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AiYeB-0005SG-Fe
	for classpath@gnu.org; Mon, 19 Jan 2004 07:36:51 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AiYIh-0002Ms-4M
	for classpath@gnu.org; Mon, 19 Jan 2004 07:15:11 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AiYCf-0001XF-Qv
	for classpath@gnu.org; Mon, 19 Jan 2004 07:08:25 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AiXz1-0000Ck-6m
	for classpath@gnu.org; Mon, 19 Jan 2004 06:54:19 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-81-082.ewetel.net
	[80.228.81.82])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0JBsHUa025588
	for <classpath@gnu.org>; Mon, 19 Jan 2004 12:54:17 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AiXzI-0002i7-00
	for <classpath@gnu.org>; Mon, 19 Jan 2004 12:54:36 +0100
From: Michael Koch <konqueror@gmx.de>
To: classpath@gnu.org
Date: Mon, 19 Jan 2004 12:57:51 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <200401191257.51907.konqueror@gmx.de>
X-CheckCompat: OK
Subject: [FOSDEM] accommodation
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jan 2004 12:36:52 -0000

Hi list,


I think it would be great if we get most of our people into the same hotel at 
FOSDEM. Dalibor Topic, Grzegorz Prokopski and I are already reserved for the 
CHAB hotel [1]. If here are people with no accommodation in Bruxelles for 
FOSDEM yet you can mail me privately and I can reserve you a bed.

There is also free accommodation in Leuven [2].


Michael


[1] http://www.ping.be/chab/en/tarif_en.htm
[2] http://lists.debian.org/debian-events-eu/2004/debian-events-eu-200401 
msg00005.html




From MAILER-DAEMON Tue Jan 20 06:11:57 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AitnZ-0004BF-0W
	for mharc-classpath@gnu.org; Tue, 20 Jan 2004 06:11:57 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AitnW-0004B0-4Z
	for classpath@gnu.org; Tue, 20 Jan 2004 06:11:54 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aitmz-00048H-LT
	for classpath@gnu.org; Tue, 20 Jan 2004 06:11:52 -0500
Received: from [217.72.192.180] (helo=smtp.web.de)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1Aitmz-00048D-81
	for classpath@gnu.org; Tue, 20 Jan 2004 06:11:21 -0500
Received: from pd9e6170d.dip.t-dialin.net ([217.230.23.13] helo=web.de)
	by smtp.web.de with asmtp (WEB.DE 4.99 #566) id 1Aitmx-0002BW-00
	for classpath@gnu.org; Tue, 20 Jan 2004 12:11:19 +0100
Message-ID: <400D0C25.2010001@web.de>
Date: Tue, 20 Jan 2004 12:08:21 +0100
From: Matthias Pfisterer <Matthias.Pfisterer@web.de>
User-Agent: Mozilla/5.0 (X11; U; Linux i586; en-US;
	rv:1.0.0) Gecko/20020623 Debian/1.0.0-0.woody.1
X-Accept-Language: en-us, en, de
MIME-Version: 1.0
To: classpath@gnu.org
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Sender: Matthias.Pfisterer@web.de
Subject: automake error
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jan 2004 11:11:54 -0000

Hi,

I'm trying to build classpath from the CVS (checked out today). I 
encounter an error when running automake:
---
artemis:~/java/classpath>automake --version
automake (GNU automake) 1.6.3
Written by Tom Tromey <tromey@redhat.com>.

Copyright 2002 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
artemis:~/java/classpath>autoconf --version
autoconf (GNU Autoconf) 2.59
Written by David J. MacKenzie and Akim Demaille.

Copyright (C) 2003 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
artemis:~/java/classpath>aclocal
artemis:~/java/classpath>autoheader
artemis:~/java/classpath>automake
configure.ac:19: `automake requires `AM_CONFIG_HEADER', not 
`AC_CONFIG_HEADER'
---
Is this a serious error, or only a warning? The file HACKING says that a 
build should work with automake 1.6. I haven't tried newer versions so far.

Matthias

-- 
Matthias Pfisterer	<mailto:Matthias.Pfisterer@web.de>
Reuchlinstrasse 28	phone ++49-711-62 87 12
D-70176 Stuttgart	(in Deutschland 0711-62 87 12)
GERMANY

Work like you don't need the money.
Love like you've never been hurt.
Dance like nobody is watching.

Java Sound Resources (examples, FAQ, applications):
http://www.jsresources.org/

Tritonus, the open source implementation of the Java Sound API:
http://www.tritonus.org/
--------------------------------------------------------------




From MAILER-DAEMON Tue Jan 20 11:02:38 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AiyKm-0003jA-7B
	for mharc-classpath@gnu.org; Tue, 20 Jan 2004 11:02:32 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AiyBq-0000b4-Up
	for classpath@gnu.org; Tue, 20 Jan 2004 10:53:18 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AiyAt-00009B-DP
	for classpath@gnu.org; Tue, 20 Jan 2004 10:52:52 -0500
Received: from [132.206.3.88] (helo=relay10.cs.mcgill.ca)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aiy45-0005xy-Fv
	for classpath@gnu.org; Tue, 20 Jan 2004 10:45:17 -0500
Received: from pinto.cs.mcgill.ca (pinto.CS.McGill.CA [132.206.3.79])
	by relay10.cs.mcgill.ca (Postfix) with ESMTP id 4844B536F32
	for <classpath@gnu.org>; Tue, 20 Jan 2004 10:45:13 -0500 (EST)
Received: from pinto.cs.mcgill.ca (dbelan2@localhost [127.0.0.1])
	by pinto.cs.mcgill.ca (8.12.3/8.12.3/Debian-6.6) with ESMTP id
	i0KFjDXd021498
	for <classpath@gnu.org>; Tue, 20 Jan 2004 10:45:13 -0500
Received: (from dbelan2@localhost)
	by pinto.cs.mcgill.ca (8.12.3/8.12.3/Debian-6.6) id i0KFjDY8021496
	for classpath@gnu.org; Tue, 20 Jan 2004 10:45:13 -0500
Date: Tue, 20 Jan 2004 10:45:13 -0500
From: David =?iso-8859-1?Q?B=E9langer?= <dbelan2@cs.mcgill.ca>
To: classpath@gnu.org
Message-ID: <20040120154512.GB21243@pinto.cs.mcgill.ca>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="pAwQNkOnpTn9IO2O"
Content-Disposition: inline
User-Agent: Mutt/1.3.28i
Content-Transfer-Encoding: 7bit
Subject: small compilation problem fix
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jan 2004 16:02:30 -0000


--pAwQNkOnpTn9IO2O
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable


Hi,

Small bug fix.  Some gtk code does not compile since it is
not official C standard code: variable declaration after statements.

The patch attached fixes it.

FYI, we just updated SableVM ( http://www.sablevm.org/ ) with a yesterday
Classpath CVS snapshot in our staging branch.
http://devel.sablevm.org/wiki/Getting for info on how to get it.


David

---

David B=E9langer
Graduate Student
School of Computer Science
McGill University
Office: MC226

Web page:   http://www.cs.mcgill.ca/~dbelan2/
Public key: http://www.cs.mcgill.ca/~dbelan2/public_key.txt


--pAwQNkOnpTn9IO2O
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
	filename="gnu_java_awt_peer_gtk_GtkChoicePeer.c.diff"

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
===================================================================
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c	(revision 1440)
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c	(working copy)
@@ -249,9 +249,11 @@
 item_activate (GtkItem *item __attribute__((unused)),
 	       struct item_event_hook_info *ie)
 {
+  jstring label;
+
   gdk_threads_leave ();
 
-  jstring label = (*gdk_env)->NewStringUTF (gdk_env, ie->label);
+  label = (*gdk_env)->NewStringUTF (gdk_env, ie->label);
   (*gdk_env)->CallVoidMethod (gdk_env, ie->peer_obj,
 			      choicePostItemEventID,
 			      label,

--pAwQNkOnpTn9IO2O--



From MAILER-DAEMON Tue Jan 20 11:33:27 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AiySu-0006a2-Pi
	for mharc-classpath@gnu.org; Tue, 20 Jan 2004 11:10:56 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AiyOh-0004yo-LV
	for classpath@gnu.org; Tue, 20 Jan 2004 11:06:35 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AiyIc-0003C6-U4
	for classpath@gnu.org; Tue, 20 Jan 2004 11:00:50 -0500
Received: from [217.72.192.209] (helo=smtp.web.de)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AiyIb-0003BX-U8
	for classpath@gnu.org; Tue, 20 Jan 2004 11:00:18 -0500
Received: from pd9e6170d.dip.t-dialin.net ([217.230.23.13] helo=web.de)
	by smtp.web.de with asmtp (WEB.DE 4.99 #566)
	id 1AiyIV-0004OO-00; Tue, 20 Jan 2004 17:00:11 +0100
Message-ID: <400D4FD0.5050001@web.de>
Date: Tue, 20 Jan 2004 16:57:04 +0100
From: Matthias Pfisterer <Matthias.Pfisterer@web.de>
User-Agent: Mozilla/5.0 (X11; U; Linux i586; en-US;
	rv:1.0.0) Gecko/20020623 Debian/1.0.0-0.woody.1
X-Accept-Language: en-us, en, de
MIME-Version: 1.0
To: Michael Koch <konqueror@gmx.de>,  classpath@gnu.org
References: <400D0C25.2010001@web.de>
	<20040120115533.GA18691@mail.konqueror.de>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Sender: Matthias.Pfisterer@web.de
Cc: 
Subject: Re: automake error
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jan 2004 16:10:54 -0000

Michael Koch wrote:
> On Tue, Jan 20, 2004 at 12:08:21PM +0100, Matthias Pfisterer wrote:
> 
>>Hi,
>>
>>I'm trying to build classpath from the CVS (checked out today). I 
>>encounter an error when running automake:
>>---
>>artemis:~/java/classpath>automake --version
>>automake (GNU automake) 1.6.3
>>Written by Tom Tromey <tromey@redhat.com>.
>>
>>Copyright 2002 Free Software Foundation, Inc.
>>This is free software; see the source for copying conditions.  There is NO
>>warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
>>artemis:~/java/classpath>autoconf --version
>>autoconf (GNU Autoconf) 2.59
>>Written by David J. MacKenzie and Akim Demaille.
>>
>>Copyright (C) 2003 Free Software Foundation, Inc.
>>This is free software; see the source for copying conditions.  There is NO
>>warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
>>artemis:~/java/classpath>aclocal
>>artemis:~/java/classpath>autoheader
>>artemis:~/java/classpath>automake
>>configure.ac:19: `automake requires `AM_CONFIG_HEADER', not 
>>`AC_CONFIG_HEADER'
>>---
>>Is this a serious error, or only a warning? The file HACKING says that a 
>>build should work with automake 1.6. I haven't tried newer versions so far.
> 
> 
> hmm, I think we need to revisit the HACKING document when Mark decided
> what to do. My local automake 1.7.9 works. I think we should at least
> require 1.7.0 then. You will also need autoconf 2.58 or higher (tested with
> 2.59). 2.57 and lower are known to be broken currently.

Ok, I installed automake 1.7.9 => no more errors.

Thanks,
Matthias

-- 
Matthias Pfisterer	<mailto:Matthias.Pfisterer@web.de>
Reuchlinstrasse 28	phone ++49-711-62 87 12
D-70176 Stuttgart	(in Deutschland 0711-62 87 12)
GERMANY

Work like you don't need the money.
Love like you've never been hurt.
Dance like nobody is watching.

Java Sound Resources (examples, FAQ, applications):
http://www.jsresources.org/

Tritonus, the open source implementation of the Java Sound API:
http://www.tritonus.org/
--------------------------------------------------------------




From MAILER-DAEMON Tue Jan 20 13:31:54 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aj0fJ-00053Z-8A
	for mharc-classpath@gnu.org; Tue, 20 Jan 2004 13:31:53 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aj0fF-00051U-Ac
	for classpath@gnu.org; Tue, 20 Jan 2004 13:31:49 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aj0W0-0002XJ-MX
	for classpath@gnu.org; Tue, 20 Jan 2004 13:22:48 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aj09B-0006qK-Pv
	for classpath@gnu.org; Tue, 20 Jan 2004 12:58:41 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id KAA25098;
	Tue, 20 Jan 2004 10:58:14 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 682D94F8245; Tue, 20 Jan 2004 10:49:20 -0700 (MST)
To: =?iso-8859-15?q?David_B=E9langer?= <dbelan2@cs.mcgill.ca>
References: <20040120154512.GB21243@pinto.cs.mcgill.ca>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Nice decor!
Date: 20 Jan 2004 10:49:20 -0700
In-Reply-To: <20040120154512.GB21243@pinto.cs.mcgill.ca>
Message-ID: <87n08ih5nj.fsf@fleche.redhat.com>
Lines: 54
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Cc: classpath@gnu.org
Subject: Re: small compilation problem fix
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jan 2004 18:31:50 -0000

>>>>> "David" == David Bélanger <dbelan2@cs.mcgill.ca> writes:

David> Small bug fix.  Some gtk code does not compile since it is
David> not official C standard code: variable declaration after statements.

Actually this is a new feature in C99.  Still, we can easily support
older versions of C.  Here's an untested patch that could be used as a
starting point...

Tom

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

	* configure.ac (JNI_CFLAGS): New subst.
	* native/jni/gtk-peer/Makefile.am (INCLUDES): Added JNI_CFLAGS.

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.1
diff -u -r1.1 configure.ac
--- configure.ac 18 Jan 2004 22:06:42 -0000 1.1
+++ configure.ac 20 Jan 2004 17:54:20 -0000
@@ -115,10 +115,13 @@
   dnl flag.
   CFLAGS="-g" 
 
+  JNI_CFLAGS=
   dnl We want warnings, lots of warnings :-)
   if test "x${GCC}" = xyes; then
     JAPHAR_GREP_CFLAGS(-Wall, [ CFLAGS="$CFLAGS -Wall" ])
+    JNI_CFLAGS=-std=c89
   fi
+  AC_SUBST(JNI_CFLAGS)
 
   dnl Check for AWT related glib/gtk/libart_lgpl
   if test "x${COMPILE_GTK_PEER}" = xyes; then
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- native/jni/gtk-peer/Makefile.am 2 Dec 2003 19:42:10 -0000 1.3
+++ native/jni/gtk-peer/Makefile.am 20 Jan 2004 17:54:42 -0000
@@ -39,7 +39,7 @@
 INCLUDES = -I. @EXTRA_INCLUDES@ \
 	   @GTK_CFLAGS@ \
 	   @LIBART_CFLAGS@ \
+	   $(JNI_CFLAGS) \
 	   -I$(top_srcdir)/native/jni/classpath \
            -I$(top_srcdir)/include \
 	   -I$(top_builddir)/include
-



From MAILER-DAEMON Tue Jan 20 13:48:24 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aj0vI-0001kD-5X
	for mharc-classpath@gnu.org; Tue, 20 Jan 2004 13:48:24 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aj0st-0001Se-3W
	for classpath@gnu.org; Tue, 20 Jan 2004 13:45:55 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aj0rs-00017h-QQ
	for classpath@gnu.org; Tue, 20 Jan 2004 13:45:24 -0500
Received: from [217.72.192.158] (helo=smtp.web.de)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1Aj0bK-0004FU-U7
	for classpath@gnu.org; Tue, 20 Jan 2004 13:27:47 -0500
Received: from pd9e6170d.dip.t-dialin.net ([217.230.23.13] helo=web.de)
	by smtp.web.de with asmtp (WEB.DE 4.99 #566) id 1Aj0bJ-000160-00
	for classpath@gnu.org; Tue, 20 Jan 2004 19:27:45 +0100
Message-ID: <400D726E.1090700@web.de>
Date: Tue, 20 Jan 2004 19:24:46 +0100
From: Matthias Pfisterer <Matthias.Pfisterer@web.de>
User-Agent: Mozilla/5.0 (X11; U; Linux i586; en-US;
	rv:1.0.0) Gecko/20020623 Debian/1.0.0-0.woody.1
X-Accept-Language: en-us, en, de
MIME-Version: 1.0
To: classpath@gnu.org
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Sender: Matthias.Pfisterer@web.de
Subject: error with old kaffe version
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jan 2004 18:48:16 -0000

Hi,

another note for the HACKING file:
I tried to build the CVS of classpath with kjc as compiler and kaffe as 
JVM to execute kjc. When using kaffe 1.0.5, I get the following error:
---
artemis:~/java/classpath>java -version
Kaffe Virtual Machine
Copyright (c) 1996-1999
Transvirtual Technologies, Inc.  All rights reserved
Engine: Just-in-time v3   Version: 1.0.5   Java Version: 1.1
artemis:~/java/classpath>make
Making all in lib
make[1]: Entering directory `/home/matthias/java/classpath/lib'
top_builddir=.. /bin/sh ./gen-classlist.sh standard
/usr/bin/java -classpath /usr/local/kaffe/lib/kjc.jar: at.dms.kjc.Main 
--classpath .: -d . @classes
Couldn't find or load essential class `java/lang/Object' 
java.lang.NoClassDefFoundError java/lang/Object
make[1]: *** [compile-classes] Aborted
make[1]: Leaving directory `/home/matthias/java/classpath/lib'
make: *** [all-recursive] Error 1
---
If I use the CVS version of kaffe, this doesn't occur. So I think the 
HACKING file should state that for this compiler/VM combo, kaffe 1.1.3 
is required.

Matthias

-- 
Matthias Pfisterer	<mailto:Matthias.Pfisterer@web.de>
Reuchlinstrasse 28	phone ++49-711-62 87 12
D-70176 Stuttgart	(in Deutschland 0711-62 87 12)
GERMANY

Work like you don't need the money.
Love like you've never been hurt.
Dance like nobody is watching.

Java Sound Resources (examples, FAQ, applications):
http://www.jsresources.org/

Tritonus, the open source implementation of the Java Sound API:
http://www.tritonus.org/
--------------------------------------------------------------




From MAILER-DAEMON Tue Jan 20 17:12:09 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aj46T-0007Zf-9R
	for mharc-classpath@gnu.org; Tue, 20 Jan 2004 17:12:09 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aj46Q-0007Z4-6c
	for classpath@gnu.org; Tue, 20 Jan 2004 17:12:06 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aj45t-0007V3-K1
	for classpath@gnu.org; Tue, 20 Jan 2004 17:12:04 -0500
Received: from [217.72.192.180] (helo=smtp.web.de)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1Aj45s-0007Uy-TT
	for classpath@gnu.org; Tue, 20 Jan 2004 17:11:33 -0500
Received: from pd9e6170d.dip.t-dialin.net ([217.230.23.13] helo=web.de)
	by smtp.web.de with asmtp (WEB.DE 4.99 #566) id 1Aj45r-0003C3-00
	for classpath@gnu.org; Tue, 20 Jan 2004 23:11:31 +0100
Message-ID: <400DA6E0.8000509@web.de>
Date: Tue, 20 Jan 2004 23:08:32 +0100
From: Matthias Pfisterer <Matthias.Pfisterer@web.de>
User-Agent: Mozilla/5.0 (X11; U; Linux i586; en-US;
	rv:1.0.0) Gecko/20020623 Debian/1.0.0-0.woody.1
X-Accept-Language: en-us, en, de
MIME-Version: 1.0
To: classpath <classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------080909010309000609090706"
Sender: Matthias.Pfisterer@web.de
Subject: more diffs
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jan 2004 22:12:07 -0000

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

Hi,

another couple of fixes (attached).

Matthias

-- 
Matthias Pfisterer	<mailto:Matthias.Pfisterer@web.de>
Reuchlinstrasse 28	phone ++49-711-62 87 12
D-70176 Stuttgart	(in Deutschland 0711-62 87 12)
GERMANY

Work like you don't need the money.
Love like you've never been hurt.
Dance like nobody is watching.

Java Sound Resources (examples, FAQ, applications):
http://www.jsresources.org/

Tritonus, the open source implementation of the Java Sound API:
http://www.tritonus.org/
--------------------------------------------------------------

--------------080909010309000609090706
Content-Type: text/plain;
 name="Position.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Position.diff"

Index: javax/swing/text/Position.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/Position.java,v
retrieving revision 1.2
diff -u -r1.2 Position.java
--- javax/swing/text/Position.java	30 Apr 2002 21:37:27 -0000	1.2
+++ javax/swing/text/Position.java	20 Jan 2004 21:24:01 -0000
@@ -40,7 +40,7 @@
 
 public interface Position
 {
-    static class Bias
+    public static final class Bias
     {
     }
     

--------------080909010309000609090706
Content-Type: text/plain;
 name="TextComponent.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="TextComponent.diff"

Index: java/awt/TextComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/TextComponent.java,v
retrieving revision 1.12
diff -u -r1.12 TextComponent.java
--- java/awt/TextComponent.java	26 Dec 2003 16:37:27 -0000	1.12
+++ java/awt/TextComponent.java	20 Jan 2004 21:53:52 -0000
@@ -235,10 +235,10 @@
   * positions are silently fixed.
   *
   * @param startSelection The new start position for the selected text.
-  * @param endSelection The new end position for the selected text.
+  * @param selectionEnd The new end position for the selected text.
   */
 public synchronized void
-select(int selectionStart, int endSelection)
+select(int selectionStart, int selectionEnd)
 {
   if (selectionStart < 0)
     selectionStart = 0;

--------------080909010309000609090706
Content-Type: text/plain;
 name="VMClass.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="VMClass.diff"

Index: vm/reference/java/lang/VMClass.java
===================================================================
RCS file: /cvsroot/classpath/classpath/vm/reference/java/lang/VMClass.java,v
retrieving revision 1.8
diff -u -r1.8 VMClass.java
--- vm/reference/java/lang/VMClass.java	17 Apr 2003 12:32:29 -0000	1.8
+++ vm/reference/java/lang/VMClass.java	20 Jan 2004 21:57:30 -0000
@@ -81,7 +81,7 @@
 
   private void initialize(int thread) throws InterruptedException
   {
-    Error error;
+    Error error = null;
 
     /* 1 */
     synchronized (this)

--------------080909010309000609090706--




From MAILER-DAEMON Tue Jan 20 22:27:33 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aj91h-0003B0-8z
	for mharc-classpath@gnu.org; Tue, 20 Jan 2004 22:27:33 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aj91d-00039L-Q7
	for classpath@gnu.org; Tue, 20 Jan 2004 22:27:29 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aj915-0002zF-Vh
	for classpath@gnu.org; Tue, 20 Jan 2004 22:27:28 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1Aj2h8-0000e0-B8
	for classpath@gnu.org; Tue, 20 Jan 2004 15:41:54 -0500
Received: from [217.72.192.209] (helo=smtp.web.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1Aj2dp-0002ZI-Js
	for classpath@gnu.org; Tue, 20 Jan 2004 15:38:29 -0500
Received: from pd9e6170d.dip.t-dialin.net ([217.230.23.13] helo=web.de)
	by smtp.web.de with asmtp (WEB.DE 4.99 #566) id 1Aj2dg-000301-00
	for classpath@gnu.org; Tue, 20 Jan 2004 21:38:20 +0100
Message-ID: <400D9109.80007@web.de>
Date: Tue, 20 Jan 2004 21:35:21 +0100
From: Matthias Pfisterer <Matthias.Pfisterer@web.de>
User-Agent: Mozilla/5.0 (X11; U; Linux i586; en-US;
	rv:1.0.0) Gecko/20020623 Debian/1.0.0-0.woody.1
X-Accept-Language: en-us, en, de
MIME-Version: 1.0
To: classpath <classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------030501040805000202070506"
Sender: Matthias.Pfisterer@web.de
Subject: bug in java.util.Map
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 03:27:31 -0000

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

Hi,

I found a minor bug in java.util.Map: the inner class Entry has to be 
public. Diff is attached.

Matthias

-- 
Matthias Pfisterer	<mailto:Matthias.Pfisterer@web.de>
Reuchlinstrasse 28	phone ++49-711-62 87 12
D-70176 Stuttgart	(in Deutschland 0711-62 87 12)
GERMANY

Work like you don't need the money.
Love like you've never been hurt.
Dance like nobody is watching.

Java Sound Resources (examples, FAQ, applications):
http://www.jsresources.org/

Tritonus, the open source implementation of the Java Sound API:
http://www.tritonus.org/
--------------------------------------------------------------

--------------030501040805000202070506
Content-Type: text/plain;
 name="Map_Entry.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Map_Entry.diff"

Index: java/util/Map.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Map.java,v
retrieving revision 1.11
diff -u -r1.11 Map.java
--- java/util/Map.java	15 Oct 2003 12:29:35 -0000	1.11
+++ java/util/Map.java	20 Jan 2004 20:34:32 -0000
@@ -264,7 +264,7 @@
    * @since 1.2
    * @status updated to 1.4
    */
-  static interface Entry
+  public static interface Entry
   {
     /**
      * Get the key corresponding to this entry.

--------------030501040805000202070506--




From MAILER-DAEMON Tue Jan 20 23:38:58 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjA8o-0004hq-8D
	for mharc-classpath@gnu.org; Tue, 20 Jan 2004 23:38:58 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aj9Yo-0004GR-Fe
	for classpath@gnu.org; Tue, 20 Jan 2004 23:01:46 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aj9PT-0001Z3-Kv
	for classpath@gnu.org; Tue, 20 Jan 2004 22:52:39 -0500
Received: from [203.12.22.20] (helo=power.connexus.net.au)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1Aj9PS-0001X5-NC
	for classpath@gnu.org; Tue, 20 Jan 2004 22:52:06 -0500
Received: from dholmeslaptop (dholmes.dltech.com.au [203.222.72.2])
	by power.connexus.net.au (8.12.4/8.11.6) with SMTP id i0L3mj7e023019;
	Wed, 21 Jan 2004 14:48:45 +1100 (EST)
	(envelope-from dholmes@dltech.com.au)
XAntiVirus: This e-mail has been scanned for viruses via the Connexus Internet
	Service
From: "David Holmes" <dholmes@dltech.com.au>
To: "Matthias Pfisterer" <Matthias.Pfisterer@web.de>,
	"classpath" <classpath@gnu.org>
Date: Wed, 21 Jan 2004 13:48:42 +1000
Message-ID: <NFBBKALFDCPFIDBNKAPCOEIEDMAA.dholmes@dltech.com.au>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: 7bit
X-Priority: 3 (Normal)
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook IMO, Build 9.0.6604 (9.0.2911.0)
In-Reply-To: <400D9109.80007@web.de>
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1165
Importance: Normal
Cc: 
Subject: RE: bug in java.util.Map
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 04:38:56 -0000

> I found a minor bug in java.util.Map: the inner class Entry
> has to be public. Diff is attached.

All interface members are implicitly public. The preferred style is to
not explicitly define them as public.

David Holmes




From MAILER-DAEMON Tue Jan 20 23:57:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjAQI-0001ko-SD
	for mharc-classpath@gnu.org; Tue, 20 Jan 2004 23:57:02 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjAQG-0001kR-75
	for classpath@gnu.org; Tue, 20 Jan 2004 23:57:00 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjAMT-0001B7-K0
	for classpath@gnu.org; Tue, 20 Jan 2004 23:53:37 -0500
Received: from [204.127.198.35] (helo=rwcrmhc11.comcast.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjAJg-0008PO-2M
	for classpath@gnu.org; Tue, 20 Jan 2004 23:50:12 -0500
Received: from byu.net (c-24-10-254-137.client.comcast.net[24.10.254.137])
	by comcast.net (rwcrmhc11) with SMTP id <20040121045005013009cacme>
	(Authid: ericblake); Wed, 21 Jan 2004 04:50:05 +0000
Message-ID: <400E050E.9050709@byu.net>
Date: Tue, 20 Jan 2004 21:50:22 -0700
From: Eric Blake <ebb9@byu.net>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
	rv:1.4) Gecko/20030624
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Matthias Pfisterer <Matthias.Pfisterer@web.de>
References: <400D9109.80007@web.de>
In-Reply-To: <400D9109.80007@web.de>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: classpath <classpath@gnu.org>
Subject: Re: bug in java.util.Map
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 04:57:00 -0000

That is not a bug. Map is an interface, so all inner types are implicitly 
public.  Our coding standard discourages redundant modifiers, so please do not 
apply this patch.

Matthias Pfisterer wrote:
> Hi,
> 
> I found a minor bug in java.util.Map: the inner class Entry has to be 
> public. Diff is attached.
> 
> Matthias
> 
> 
> ------------------------------------------------------------------------
> 
> Index: java/util/Map.java
> ===================================================================
> RCS file: /cvsroot/classpath/classpath/java/util/Map.java,v
> retrieving revision 1.11
> diff -u -r1.11 Map.java
> --- java/util/Map.java	15 Oct 2003 12:29:35 -0000	1.11
> +++ java/util/Map.java	20 Jan 2004 20:34:32 -0000
> @@ -264,7 +264,7 @@
>     * @since 1.2
>     * @status updated to 1.4
>     */
> -  static interface Entry
> +  public static interface Entry
>    {
>      /**
>       * Get the key corresponding to this entry.
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Classpath mailing list
> Classpath@gnu.org
> http://mail.gnu.org/mailman/listinfo/classpath

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

Eric Blake             ebb9@byu.net




From MAILER-DAEMON Wed Jan 21 00:17:16 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjAhx-0008Qo-Pg
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 00:15:17 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjAhY-000844-04
	for classpath@gnu.org; Wed, 21 Jan 2004 00:14:52 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjAgp-0007cA-Rl
	for classpath@gnu.org; Wed, 21 Jan 2004 00:14:39 -0500
Received: from [216.148.227.85] (helo=rwcrmhc12.comcast.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjAM6-0000wc-Jl
	for classpath@gnu.org; Tue, 20 Jan 2004 23:52:42 -0500
Received: from byu.net (c-24-10-254-137.client.comcast.net[24.10.254.137])
	by comcast.net (rwcrmhc12) with SMTP id <20040121045241014004n51ae>
	(Authid: ericblake); Wed, 21 Jan 2004 04:52:41 +0000
Message-ID: <400E05AB.7060302@byu.net>
Date: Tue, 20 Jan 2004 21:52:59 -0700
From: Eric Blake <ebb9@byu.net>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
	rv:1.4) Gecko/20030624
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Matthias Pfisterer <Matthias.Pfisterer@web.de>
References: <400D9109.80007@web.de>
In-Reply-To: <400D9109.80007@web.de>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: classpath <classpath@gnu.org>
Subject: Re: bug in java.util.Map
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 05:15:13 -0000

[Shoot, I hit send too early.]

For that matter, you should delete the static modifier.  Inner classes 
declared in an interface are implicitly 'public static'.

Matthias Pfisterer wrote:

> Hi,
> 
> I found a minor bug in java.util.Map: the inner class Entry has to be 
> public. Diff is attached.
> 
> Matthias
> 
> 
> ------------------------------------------------------------------------
> 
> Index: java/util/Map.java
> ===================================================================
> RCS file: /cvsroot/classpath/classpath/java/util/Map.java,v
> retrieving revision 1.11
> diff -u -r1.11 Map.java
> --- java/util/Map.java	15 Oct 2003 12:29:35 -0000	1.11
> +++ java/util/Map.java	20 Jan 2004 20:34:32 -0000
> @@ -264,7 +264,7 @@
>     * @since 1.2
>     * @status updated to 1.4
>     */
> -  static interface Entry
> +  public static interface Entry
>    {
>      /**
>       * Get the key corresponding to this entry.
> 
> 

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

Eric Blake             ebb9@byu.net




From MAILER-DAEMON Wed Jan 21 00:17:39 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjAip-0000ab-HY
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 00:16:11 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjAiG-0000C1-CU
	for classpath@gnu.org; Wed, 21 Jan 2004 00:15:36 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjAeU-0006PZ-BR
	for classpath@gnu.org; Wed, 21 Jan 2004 00:12:13 -0500
Received: from [204.127.198.39] (helo=rwcrmhc13.comcast.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjATL-0002WA-2k
	for classpath@gnu.org; Wed, 21 Jan 2004 00:00:11 -0500
Received: from byu.net (c-24-10-254-137.client.comcast.net[24.10.254.137])
	by comcast.net (rwcrmhc13) with SMTP id <2004012105000901500kcuine>
	(Authid: ericblake); Wed, 21 Jan 2004 05:00:09 +0000
Message-ID: <400E076A.8050008@byu.net>
Date: Tue, 20 Jan 2004 22:00:26 -0700
From: Eric Blake <ebb9@byu.net>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
	rv:1.4) Gecko/20030624
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Matthias Pfisterer <Matthias.Pfisterer@web.de>
References: <400DA6E0.8000509@web.de>
In-Reply-To: <400DA6E0.8000509@web.de>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: classpath <classpath@gnu.org>
Subject: Re: more diffs
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 05:15:59 -0000

Matthias Pfisterer wrote:

> Hi,
> 
> another couple of fixes (attached).
> 
> Matthias
> 
> 
> ------------------------------------------------------------------------
> 
>  public interface Position
>  {
> -    static class Bias
> +    public static final class Bias

Remove the static modifier, rather than adding public.  Interface member 
classes are implicitly public static.

> +++ java/awt/TextComponent.java	20 Jan 2004 21:53:52 -0000
> @@ -235,10 +235,10 @@
>    * positions are silently fixed.
>    *
>    * @param startSelection The new start position for the selected text.
               ^
If you are going to fix selectionEnd, you should fix selectionStart, too.

> -  * @param endSelection The new end position for the selected text.
> +  * @param selectionEnd The new end position for the selected text.
>    */
>  public synchronized void
> -select(int selectionStart, int endSelection)
> +select(int selectionStart, int selectionEnd)
>  {
>    if (selectionStart < 0)
>      selectionStart = 0;

Was this patch complete? You changed a parameter name, but the body of the 
method does not show any use of this updated name.

> 
> 
> ------------------------------------------------------------------------
> 
> Index: vm/reference/java/lang/VMClass.java
> ===================================================================
> RCS file: /cvsroot/classpath/classpath/vm/reference/java/lang/VMClass.java,v
> retrieving revision 1.8
> diff -u -r1.8 VMClass.java
> --- vm/reference/java/lang/VMClass.java	17 Apr 2003 12:32:29 -0000	1.8
> +++ vm/reference/java/lang/VMClass.java	20 Jan 2004 21:57:30 -0000
> @@ -81,7 +81,7 @@
>  
>    private void initialize(int thread) throws InterruptedException
>    {
> -    Error error;
> +    Error error = null;

Is this necessary?  If it was compiling correctly before your patch, then you 
have introduced an inefficiency by redundantly assigning the variable to null.

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

Eric Blake             ebb9@byu.net




From MAILER-DAEMON Wed Jan 21 04:44:26 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjEuD-0001ay-JP
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 04:44:13 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjEtw-00010B-Kf
	for classpath@gnu.org; Wed, 21 Jan 2004 04:43:56 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjEss-0007UM-K9
	for classpath@gnu.org; Wed, 21 Jan 2004 04:43:23 -0500
Received: from [217.72.192.180] (helo=smtp.web.de)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AjEsq-0007Pj-MO
	for classpath@gnu.org; Wed, 21 Jan 2004 04:42:48 -0500
Received: from pd9e619a7.dip.t-dialin.net ([217.230.25.167] helo=web.de)
	by smtp.web.de with asmtp (WEB.DE 4.99 #566)
	id 1AjEsd-0003Lg-00; Wed, 21 Jan 2004 10:42:35 +0100
Message-ID: <400E48D1.1060906@web.de>
Date: Wed, 21 Jan 2004 10:39:29 +0100
From: Matthias Pfisterer <Matthias.Pfisterer@web.de>
User-Agent: Mozilla/5.0 (X11; U; Linux i586; en-US;
	rv:1.0.0) Gecko/20020623 Debian/1.0.0-0.woody.1
X-Accept-Language: en-us, en, de
MIME-Version: 1.0
To: David Holmes <dholmes@dltech.com.au>
References: <NFBBKALFDCPFIDBNKAPCOEIEDMAA.dholmes@dltech.com.au>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Sender: Matthias.Pfisterer@web.de
Cc: classpath <classpath@gnu.org>
Subject: Re: bug in java.util.Map
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 09:44:05 -0000

David Holmes wrote:
>>I found a minor bug in java.util.Map: the inner class Entry
>>has to be public. Diff is attached.
> 
> 
> All interface members are implicitly public. The preferred style is to
> not explicitly define them as public.

Well, I prefer to be explicit. But this goes beyond a matter of taste. 
Building with kjc, I get the following errors:
---
../java/beans/PropertyChangeSupport.java:1: error:Unaccessible class 
"java/util/Map/Entry" can not be imported [JLS 7.5.1]
../java/beans/VetoableChangeSupport.java:1: error:Unaccessible class 
"java/util/Map/Entry" can not be imported [JLS 7.5.1]
../javax/swing/JDesktopPane.java:62: error:Cannot find class 
"AccessibleJComponent" [JLS 8]
---
If I add the "public", the first two errors disappear. It may be a 
compiler bug. I'll try to nail it down.

Matthias

-- 
Matthias Pfisterer	<mailto:Matthias.Pfisterer@web.de>
Reuchlinstrasse 28	phone ++49-711-62 87 12
D-70176 Stuttgart	(in Deutschland 0711-62 87 12)
GERMANY

Work like you don't need the money.
Love like you've never been hurt.
Dance like nobody is watching.

Java Sound Resources (examples, FAQ, applications):
http://www.jsresources.org/

Tritonus, the open source implementation of the Java Sound API:
http://www.tritonus.org/
--------------------------------------------------------------




From MAILER-DAEMON Wed Jan 21 05:25:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjFXW-00025w-PZ
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 05:24:50 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjFXH-0001pA-Rs
	for classpath@gnu.org; Wed, 21 Jan 2004 05:24:35 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjFWM-0000cK-Te
	for classpath@gnu.org; Wed, 21 Jan 2004 05:24:10 -0500
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjFWE-0000Xw-Pp
	for classpath@gnu.org; Wed, 21 Jan 2004 05:23:30 -0500
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----_=_NextPart_001_01C3E008.9D16E7A1"
Date: Wed, 21 Jan 2004 11:23:25 +0100
X-MIMEOLE: Produced By Microsoft Exchange V6.5.6944.0
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC04C7C2@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: yes
X-MS-TNEF-Correlator: 
Thread-Topic: Proposed patch: gnu.java.net.protocol.file.Handler
Thread-Index: AcPgCJp7hDLz2fdJSoGOgiJtq4jRgQ==
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: <classpath@gnu.org>
Subject: Proposed patch: gnu.java.net.protocol.file.Handler
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 10:24:49 -0000

This is a multi-part message in MIME format.

------_=_NextPart_001_01C3E008.9D16E7A1
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Hi,

Attached is a proposed patch to fix relative file urls ("file:foodir").

I would appreciate it, if someone could review it.

Thanks.

Regards,
Jeroen

------_=_NextPart_001_01C3E008.9D16E7A1
Content-Type: application/octet-stream;
	name="Handler.diff"
Content-Transfer-Encoding: base64
Content-Description: Handler.diff
Content-Disposition: attachment;
	filename="Handler.diff"

SW5kZXg6IGdudS9qYXZhL25ldC9wcm90b2NvbC9maWxlL0hhbmRsZXIuamF2YQ0KPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvZ251L2phdmEvbmV0L3By
b3RvY29sL2ZpbGUvSGFuZGxlci5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMw0KZGlm
ZiAtdSAtcjEuMTMgSGFuZGxlci5qYXZhDQotLS0gZ251L2phdmEvbmV0L3Byb3RvY29sL2ZpbGUv
SGFuZGxlci5qYXZhCTIgRGVjIDIwMDMgMDk6Mjg6MjEgLTAwMDAJMS4xMw0KKysrIGdudS9qYXZh
L25ldC9wcm90b2NvbC9maWxlL0hhbmRsZXIuamF2YQkyMSBKYW4gMjAwNCAxMDowNTo0MiAtMDAw
MA0KQEAgLTI1MSw4ICsyNTEsOCBAQA0KICAgICAgICAgICAgIA0KICAgICAgICAgICAgIGludCBp
ZHggPSBmaWxlLmxhc3RJbmRleE9mICgiLyIpOyAgDQogDQotICAgICAgICAgICAgaWYgKGlkeCA9
PSAtMSkgLy9jb250ZXh0IHBhdGggaXMgd2VpcmQNCi0gICAgICAgICAgICAgIGZpbGUgPSAiLyIg
KyB1cmxfc3RyaW5nOyANCisgICAgICAgICAgICBpZiAoaWR4ID09IC0xKSAvL25vIGNvbnRleHQg
cGF0aCwgbWFrZSByZWxhdGl2ZSB1cmwNCisgICAgICAgICAgICAgIGZpbGUgPSB1cmxfc3RyaW5n
OyANCiAgICAgICAgICAgICBlbHNlIGlmIChpZHggPT0gKGZpbGUubGVuZ3RoKCkgLSAxKSkNCiAg
ICAgICAgICAgICAgIC8vanVzdCBjb25jYXRlbmF0ZSB0d28gcGFydHMNCiAgICAgICAgICAgICAg
IGZpbGUgPSBmaWxlICsgdXJsX3N0cmluZzsNCg==

------_=_NextPart_001_01C3E008.9D16E7A1--



From MAILER-DAEMON Wed Jan 21 05:42:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjFmB-0001a2-5i
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 05:39:59 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjFln-0001Dj-09
	for classpath@gnu.org; Wed, 21 Jan 2004 05:39:35 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjFl2-0000n1-74
	for classpath@gnu.org; Wed, 21 Jan 2004 05:39:20 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjFkm-0000RL-JD
	for classpath@gnu.org; Wed, 21 Jan 2004 05:38:32 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-144.ewetel.net
	[80.228.82.144])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0LAcNUa009239;
	Wed, 21 Jan 2004 11:38:23 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AjFkz-0003E2-00; Wed, 21 Jan 2004 11:38:45 +0100
Date: Wed, 21 Jan 2004 11:38:45 +0100
From: Michael Koch <konqueror@gmx.de>
To: Jeroen Frijters <jeroen@sumatra.nl>
Message-ID: <20040121103845.GB11802@mail.konqueror.de>
References: <788B535AB1F9CB49BB9C229372B50ACC04C7C2@LEMBU.sumatrasoftware.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <788B535AB1F9CB49BB9C229372B50ACC04C7C2@LEMBU.sumatrasoftware.com>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: classpath@gnu.org
Subject: Re: Proposed patch: gnu.java.net.protocol.file.Handler
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 10:39:55 -0000

On Wed, Jan 21, 2004 at 11:23:25AM +0100, Jeroen Frijters wrote:
> Hi,
> 
> Attached is a proposed patch to fix relative file urls ("file:foodir").
> 
> I would appreciate it, if someone could review it.

Do you have special testcase for this ?



Michael^



From MAILER-DAEMON Wed Jan 21 06:04:35 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjG9x-0005oq-IM
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 06:04:33 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjG9v-0005oe-3V
	for classpath@gnu.org; Wed, 21 Jan 2004 06:04:31 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjG3R-0004DV-Ci
	for classpath@gnu.org; Wed, 21 Jan 2004 05:58:20 -0500
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjG3Q-0004CH-MA
	for classpath@gnu.org; Wed, 21 Jan 2004 05:57:48 -0500
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Wed, 21 Jan 2004 11:57:40 +0100
X-MIMEOLE: Produced By Microsoft Exchange V6.5.6944.0
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC04C7C6@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: Proposed patch: gnu.java.net.protocol.file.Handler
Thread-Index: AcPgCrMTfOVOUo9ESnylvaUzEFW4JAAAaeoA
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: "Michael Koch" <konqueror@gmx.de>
Cc: classpath@gnu.org
Subject: RE: Proposed patch: gnu.java.net.protocol.file.Handler
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 11:04:32 -0000

Michael Koch wrote:
> On Wed, Jan 21, 2004 at 11:23:25AM +0100, Jeroen Frijters wrote:
> > Hi,
> >=20
> > Attached is a proposed patch to fix relative file urls=20
> ("file:foodir").
> >=20
> > I would appreciate it, if someone could review it.
>=20
> Do you have special testcase for this ?

The following code failed (given a directory "foo" containing a footest
class):

URLClassLoader l =3D new URLClassLoader(new URL[] { new URL("file:foo/")
});
l.loadClass("footest");

Regards,
Jeroen



From MAILER-DAEMON Wed Jan 21 08:14:49 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjIC0-0002cT-JT
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 08:14:48 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjIBw-0002bK-4z
	for classpath@gnu.org; Wed, 21 Jan 2004 08:14:44 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjIBJ-0002WD-Qo
	for classpath@gnu.org; Wed, 21 Jan 2004 08:14:37 -0500
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjIBI-0002Vm-Sq
	for classpath@gnu.org; Wed, 21 Jan 2004 08:14:05 -0500
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1AjIBG-0006N2-00
	for <classpath@gnu.org>; Wed, 21 Jan 2004 14:14:02 +0100
Received: from mpiat2304.ag2.mpi-sb.mpg.de
	([139.19.20.93] helo=kaffe.org ident=topic)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AjIBF-0006Mr-00
	for <classpath@gnu.org>; Wed, 21 Jan 2004 14:14:01 +0100
Message-ID: <400E7B19.9060002@kaffe.org>
Date: Wed, 21 Jan 2004 14:14:01 +0100
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.3) Gecko/20030312
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: GNU Classpath <classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------020904010201020205040906"
X-Virus-Scanned: by AMaViS perl-11
Subject: Small patch for java/text/AttributedString.java
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 13:14:46 -0000

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

Hi all,

the attached patch fixes a small problem in AttributedString that 
prevented FOP from working with it on kaffe.

OK to check in?

2004-01-21  Dalibor Topic <robilad@kaffe.org>


         * libraries/javalib/java/text/AttributedString.java 
(addAttribute(AttributedCharacterIterator.Attribute,Object,int,int)):
         Use HashMap instead of Hashtable since value can be null, and
         we can not store a null value in a Hashtable.

cheers,
dalibor topic

--------------020904010201020205040906
Content-Type: text/plain;
 name="cpath-attributed-string-fop.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-attributed-string-fop.patch"

--- /var/tmp/PROJECTS/classpath//./java/text/AttributedString.java	Tue Jan 22 23:27:01 2002
+++ java/text/AttributedString.java	Mon Dec  8 17:03:29 2003
@@ -39,6 +39,7 @@
 package java.text;
 
 import java.util.Iterator;
+import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.HashSet;
 import java.util.Map;
@@ -329,7 +330,7 @@
   * of the string.
   *
   * @param attrib The attribute to add.
-  * @param value The value of the attribute.
+  * @param value The value of the attribute, which may be null.
   * @param begin_index The beginning index of the subrange.
   * @param end_index The ending index of the subrange.
   *
@@ -342,10 +343,10 @@
   if (attrib == null)
     throw new IllegalArgumentException("null attribute");
 
-  Hashtable ht = new Hashtable();
-  ht.put(attrib, value);
+  HashMap hm = new HashMap();
+  hm.put(attrib, value);
 
-  addAttributes(ht, begin_index, end_index);
+  addAttributes(hm, begin_index, end_index);
 }
 
 /*************************************************************************/

--------------020904010201020205040906--




From MAILER-DAEMON Wed Jan 21 08:35:20 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjIVi-0005qX-Md
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 08:35:10 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjIOV-0004UM-Ht
	for classpath@gnu.org; Wed, 21 Jan 2004 08:27:43 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjIHd-0003Cf-C4
	for classpath@gnu.org; Wed, 21 Jan 2004 08:21:08 -0500
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjIFo-0002wm-Jv
	for classpath@gnu.org; Wed, 21 Jan 2004 08:18:44 -0500
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1AjIFe-0007ag-00
	for <classpath@gnu.org>; Wed, 21 Jan 2004 14:18:34 +0100
Received: from mpiat2304.ag2.mpi-sb.mpg.de
	([139.19.20.93] helo=kaffe.org ident=topic)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AjIFd-0007aQ-00
	for <classpath@gnu.org>; Wed, 21 Jan 2004 14:18:33 +0100
Message-ID: <400E7C29.5000609@kaffe.org>
Date: Wed, 21 Jan 2004 14:18:33 +0100
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.3) Gecko/20030312
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: GNU Classpath <classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------030302050702030008030102"
X-Virus-Scanned: by AMaViS perl-11
Subject: Small fix for the copyright notice in
	java/text/DateFormatSymbols.java
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 13:35:02 -0000

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

Hi all,

I'm flushing my patch queue, before I resync with GNU Classpath again, 
so I found this small patch.

OK to check in?

2004-01-11  Guilhem Lavaux <guilhem@kaffe.org>

         * libraries/javalib/java/text/DateFormatSymbols.java: Fixed
	copyright notice.

cheers,
dalibor topic

--------------030302050702030008030102
Content-Type: text/plain;
 name="cpath-date-format-symbols-typo.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-date-format-symbols-typo.patch"

--- /var/tmp/PROJECTS/classpath//./java/text/DateFormatSymbols.java	Sun Aug 17 02:25:56 2003
+++ java/text/DateFormatSymbols.java	Sun Jan 11 18:55:21 2004
@@ -1,4 +1,4 @@
-/* ChoiceFormat.java -- Format over a range of numbers
+/* DateFormatSymbols.java -- Format over a range of numbers
    Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.

--------------030302050702030008030102--




From MAILER-DAEMON Wed Jan 21 08:54:04 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjImQ-00023k-En
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 08:52:26 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjIlp-0001rd-51
	for classpath@gnu.org; Wed, 21 Jan 2004 08:51:49 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjIl0-0001YB-6k
	for classpath@gnu.org; Wed, 21 Jan 2004 08:51:29 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjIkc-0001Lc-5o
	for classpath@gnu.org; Wed, 21 Jan 2004 08:50:34 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-144.ewetel.net
	[80.228.82.144])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i0LDnx1h024653;
	Wed, 21 Jan 2004 14:50:00 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AjIkP-0003mQ-00; Wed, 21 Jan 2004 14:50:21 +0100
Date: Wed, 21 Jan 2004 14:50:21 +0100
From: Michael Koch <konqueror@gmx.de>
To: Dalibor Topic <robilad@kaffe.org>
Message-ID: <20040121135021.GF13665@mail.konqueror.de>
References: <400E7B19.9060002@kaffe.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <400E7B19.9060002@kaffe.org>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: GNU Classpath <classpath@gnu.org>
Subject: Re: Small patch for java/text/AttributedString.java
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 13:52:24 -0000

On Wed, Jan 21, 2004 at 02:14:01PM +0100, Dalibor Topic wrote:
> Hi all,
> 
> the attached patch fixes a small problem in AttributedString that 
> prevented FOP from working with it on kaffe.
> 
> OK to check in?

Some questions:

Does a mauve testcase exist for this ?

Wouldnt it be good to get rid of Hashtable usage in AttributedString
then at all ? There is only one other simple usage and Hashtable
features that are not in HashMap are not needed there anyway.

> +  * @param value The value of the attribute, which may be null.

I think we omit the "which" everywhere else.


Michael



From MAILER-DAEMON Wed Jan 21 09:21:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjJ7G-0006hq-RQ
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 09:13:58 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjIoN-0002dt-Kw
	for classpath@gnu.org; Wed, 21 Jan 2004 08:54:27 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjInX-0002NS-89
	for classpath@gnu.org; Wed, 21 Jan 2004 08:54:06 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjIlT-0001iX-2M
	for classpath@gnu.org; Wed, 21 Jan 2004 08:51:27 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-144.ewetel.net
	[80.228.82.144])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0LDorUa023951;
	Wed, 21 Jan 2004 14:50:53 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AjIlH-0003mZ-00; Wed, 21 Jan 2004 14:51:15 +0100
Date: Wed, 21 Jan 2004 14:51:15 +0100
From: Michael Koch <konqueror@gmx.de>
To: Dalibor Topic <robilad@kaffe.org>
Message-ID: <20040121135115.GG13665@mail.konqueror.de>
References: <400E7C29.5000609@kaffe.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <400E7C29.5000609@kaffe.org>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: GNU Classpath <classpath@gnu.org>
Subject: Re: Small fix for the copyright notice in
	java/text/DateFormatSymbols.java
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 14:13:54 -0000

On Wed, Jan 21, 2004 at 02:18:33PM +0100, Dalibor Topic wrote:
> Hi all,
> 
> I'm flushing my patch queue, before I resync with GNU Classpath again, 
> so I found this small patch.
> 
> OK to check in?

I think, thats obvious and needs no special okay.

Michael



From MAILER-DAEMON Wed Jan 21 11:57:48 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjLfo-0003ZR-3R
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 11:57:48 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjLfj-0003Vq-2b
	for classpath@gnu.org; Wed, 21 Jan 2004 11:57:43 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjLf7-0003I7-Ms
	for classpath@gnu.org; Wed, 21 Jan 2004 11:57:37 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjLdB-0002hM-CB
	for classpath@gnu.org; Wed, 21 Jan 2004 11:55:05 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id JAA32721;
	Wed, 21 Jan 2004 09:54:58 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 0C8F54F829C; Wed, 21 Jan 2004 09:45:59 -0700 (MST)
To: Matthias Pfisterer <Matthias.Pfisterer@web.de>
References: <NFBBKALFDCPFIDBNKAPCOEIEDMAA.dholmes@dltech.com.au>
	<400E48D1.1060906@web.de>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Do I hear th' SPINNING of various WHIRRING, ROUND, and WARM
	WHIRLOMATICS?!
Date: 21 Jan 2004 09:45:58 -0700
In-Reply-To: <400E48D1.1060906@web.de>
Message-ID: <87r7xtfdx5.fsf@fleche.redhat.com>
Lines: 12
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: classpath <classpath@gnu.org>
Subject: Re: bug in java.util.Map
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 16:57:45 -0000

>>>>> "Matthias" == Matthias Pfisterer <Matthias.Pfisterer@web.de> writes:

Matthias> Building with kjc, I get the following errors:
Matthias> ../java/beans/PropertyChangeSupport.java:1: error:Unaccessible class
Matthias> "java/util/Map/Entry" can not be imported [JLS 7.5.1]

If it isn't fixable in the compiler we can add a workaround.  We
already work around some gcj bugs.  Workarounds need a comment
explaining what compiler and version they are for, though.  And of
course we'd prefer a compiler fix...

Tom



From MAILER-DAEMON Wed Jan 21 12:07:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjLpO-0007Yx-6Z
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 12:07:42 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjLpD-0007XK-Gg
	for classpath@gnu.org; Wed, 21 Jan 2004 12:07:31 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjLof-0007JC-TU
	for classpath@gnu.org; Wed, 21 Jan 2004 12:07:29 -0500
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjLof-0007J6-HZ
	for classpath@gnu.org; Wed, 21 Jan 2004 12:06:57 -0500
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1AjLoe-00085h-00
	for <classpath@gnu.org>; Wed, 21 Jan 2004 18:06:56 +0100
Received: from mpiat2304.ag2.mpi-sb.mpg.de
	([139.19.20.93] helo=kaffe.org ident=topic)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AjLob-00084o-00; Wed, 21 Jan 2004 18:06:53 +0100
Message-ID: <400EB1AD.4050209@kaffe.org>
Date: Wed, 21 Jan 2004 18:06:53 +0100
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.3) Gecko/20030312
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: tromey@redhat.com
References: <NFBBKALFDCPFIDBNKAPCOEIEDMAA.dholmes@dltech.com.au>	<400E48D1.1060906@web.de>
	<87r7xtfdx5.fsf@fleche.redhat.com>
In-Reply-To: <87r7xtfdx5.fsf@fleche.redhat.com>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: by AMaViS perl-11
Cc: classpath <classpath@gnu.org>
Subject: Re: bug in java.util.Map
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 17:07:32 -0000

Tom Tromey wrote:
>>>>>>"Matthias" == Matthias Pfisterer <Matthias.Pfisterer@web.de> writes:
> 
> 
> Matthias> Building with kjc, I get the following errors:
> Matthias> ../java/beans/PropertyChangeSupport.java:1: error:Unaccessible class
> Matthias> "java/util/Map/Entry" can not be imported [JLS 7.5.1]
> 
> If it isn't fixable in the compiler we can add a workaround.  We
> already work around some gcj bugs.  Workarounds need a comment
> explaining what compiler and version they are for, though.  And of
> course we'd prefer a compiler fix...
> 

The weird thing is that I use the unmodified source from GNU Classpath 
in kaffe's CVS  and it builds without a hitch there. So I'd be against 
adding a 'public' to it. And our java/beans/PropertyChangeSupport.java 
is the same as in classpath, as well. Weird.

I can only guess that the set of files being built together in 
classpath's build process is somewhat different from the set of files 
being build together in kaffe's build process, and that somehow triggers 
the problem.

cheers,
dalibor topic




From MAILER-DAEMON Wed Jan 21 12:34:59 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjMFn-0008Cu-JR
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 12:34:59 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjMFi-0008Bo-DQ
	for classpath@gnu.org; Wed, 21 Jan 2004 12:34:54 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjMFB-0007vr-43
	for classpath@gnu.org; Wed, 21 Jan 2004 12:34:52 -0500
Received: from [217.72.192.209] (helo=smtp.web.de)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AjMFA-0007tm-64
	for classpath@gnu.org; Wed, 21 Jan 2004 12:34:20 -0500
Received: from pd9e619a7.dip.t-dialin.net ([217.230.25.167] helo=web.de)
	by smtp.web.de with asmtp (WEB.DE 4.99 #566) id 1AjMF8-0008Jt-00
	for classpath@gnu.org; Wed, 21 Jan 2004 18:34:18 +0100
Message-ID: <400EB766.4090401@web.de>
Date: Wed, 21 Jan 2004 18:31:18 +0100
From: Matthias Pfisterer <Matthias.Pfisterer@web.de>
User-Agent: Mozilla/5.0 (X11; U; Linux i586; en-US;
	rv:1.0.0) Gecko/20020623 Debian/1.0.0-0.woody.1
X-Accept-Language: en-us, en, de
MIME-Version: 1.0
To: classpath <classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------060106050003080209060203"
Sender: Matthias.Pfisterer@web.de
Subject: "enum" variables (patch)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 17:34:56 -0000

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

Hi,

in Java 1.5, "enum" is a keyword. Therefore it can no longer be used for 
  variable names. I've made a patch that changes all variables "enum".

Matthias

-- 
Matthias Pfisterer	<mailto:Matthias.Pfisterer@web.de>
Reuchlinstrasse 28	phone ++49-711-62 87 12
D-70176 Stuttgart	(in Deutschland 0711-62 87 12)
GERMANY

Work like you don't need the money.
Love like you've never been hurt.
Dance like nobody is watching.

Java Sound Resources (examples, FAQ, applications):
http://www.jsresources.org/

Tritonus, the open source implementation of the Java Sound API:
http://www.tritonus.org/
--------------------------------------------------------------

--------------060106050003080209060203
Content-Type: text/plain;
 name="enum.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="enum.diff"

Index: external/jaxp/source/gnu/xml/aelfred2/XmlParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/external/jaxp/source/gnu/xml/aelfred2/XmlParser.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 XmlParser.java
--- external/jaxp/source/gnu/xml/aelfred2/XmlParser.java	1 Feb 2003 02:10:12 -0000	1.1.1.1
+++ external/jaxp/source/gnu/xml/aelfred2/XmlParser.java	21 Jan 2004 17:29:53 -0000
@@ -1504,7 +1504,7 @@
     {
 	String name;
 	String type;
-	String enum = null;
+	String enumStr= null;
 
 	// Read the attribute name.
 	name = readNmtoken (true);
@@ -1515,11 +1515,11 @@
 
 	// Get the string of enumerated values if necessary.
 	if ("ENUMERATION" == type || "NOTATION" == type)
-	    enum = dataBufferToString ();
+	    enumStr = dataBufferToString ();
 
 	// Read the default value.
 	requireWhitespace ();
-	parseDefault (elementName, name, type, enum);
+	parseDefault (elementName, name, type, enumStr);
     }
 
 
@@ -1616,7 +1616,7 @@
 	String elementName,
 	String name,
 	String type,
-	String enum
+	String enumStr
     ) throws Exception
     {
 	int	valueType = ATTRIBUTE_DEFAULT_SPECIFIED;
@@ -1654,11 +1654,11 @@
 	} else
 	    value = readLiteral (flags);
 	expandPE = saved;
-	setAttribute (elementName, name, type, enum, value, valueType);
+	setAttribute (elementName, name, type, enumStr, value, valueType);
 	if ("ENUMERATION" == type)
-	    type = enum;
+	    type = enumStr;
 	else if ("NOTATION" == type)
-	    type = "NOTATION " + enum;
+	    type = "NOTATION " + enumStr;
 	if (!skippedPE) handler.getDeclHandler ()
 	    .attributeDecl (elementName, name, type, defaultType, value);
     }
Index: gnu/java/beans/BeanInfoEmbryo.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/beans/BeanInfoEmbryo.java,v
retrieving revision 1.7
diff -u -r1.7 BeanInfoEmbryo.java
--- gnu/java/beans/BeanInfoEmbryo.java	23 Feb 2002 09:19:52 -0000	1.7
+++ gnu/java/beans/BeanInfoEmbryo.java	21 Jan 2004 17:29:55 -0000
@@ -78,9 +78,9 @@
 
 		PropertyDescriptor[] Aproperties = new PropertyDescriptor[properties.size()];
 		int i = 0;
-		Enumeration enum = properties.elements();
-		while(enum.hasMoreElements()) {
-			Aproperties[i] = (PropertyDescriptor)enum.nextElement();
+		Enumeration descriptors = properties.elements();
+		while(descriptors.hasMoreElements()) {
+			Aproperties[i] = (PropertyDescriptor)descriptors.nextElement();
 			if(defaultPropertyName != null && Aproperties[i].getName().equals(defaultPropertyName)) {
 				defaultProperty = i;
 			}
@@ -89,9 +89,9 @@
 
 		EventSetDescriptor[] Aevents = new EventSetDescriptor[events.size()];
 		i = 0;
-		enum = events.elements();
-		while(enum.hasMoreElements()) {
-			Aevents[i] = (EventSetDescriptor)enum.nextElement();
+		descriptors = events.elements();
+		while(descriptors.hasMoreElements()) {
+			Aevents[i] = (EventSetDescriptor)descriptors.nextElement();
 			if(defaultEventName != null && Aevents[i].getName().equals(defaultEventName)) {
 				defaultEvent = i;
 			}
Index: java/awt/im/InputContext.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/im/InputContext.java,v
retrieving revision 1.3
diff -u -r1.3 InputContext.java
--- java/awt/im/InputContext.java	11 Jul 2003 17:50:02 -0000	1.3
+++ java/awt/im/InputContext.java	21 Jan 2004 17:30:13 -0000
@@ -86,20 +86,20 @@
   private static final ArrayList descriptors = new ArrayList();
   static
   {
-    Enumeration enum;
+    Enumeration resources;
     try
       {
-        enum = ClassLoader.getSystemResources
+        resources = ClassLoader.getSystemResources
           ("META_INF/services/java.awt.im.spi.InputMethodDescriptor");
       }
     catch (IOException ex)
       {
         // XXX Should we do something else?
-        enum = EmptyEnumeration.getInstance();
+        resources = EmptyEnumeration.getInstance();
       }
-    while (enum.hasMoreElements())
+    while (resources.hasMoreElements())
       {
-        URL url = (URL) enum.nextElement();
+        URL url = (URL) resources.nextElement();
         BufferedReader in;
         String line;
         try
Index: java/io/SequenceInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/SequenceInputStream.java,v
retrieving revision 1.6
diff -u -r1.6 SequenceInputStream.java
--- java/io/SequenceInputStream.java	22 Jan 2002 22:26:59 -0000	1.6
+++ java/io/SequenceInputStream.java	21 Jan 2004 17:30:14 -0000
@@ -72,7 +72,7 @@
   private InputStream in2;
 
   /** The enum handle; not used if constructed w/ 2 explicit input streams. */
-  private Enumeration enum;
+  private Enumeration inStreams;
 
  /**
   * This method creates a new <code>SequenceInputStream</code> that obtains
@@ -84,8 +84,8 @@
   */
   public SequenceInputStream(Enumeration e)
   {
-    enum = e;
-    in = (InputStream) enum.nextElement();
+    inStreams = e;
+    in = (InputStream) inStreams.nextElement();
     in2 = null;
   }
 
@@ -204,10 +204,10 @@
   {
     InputStream nextIn = null;
 
-    if (enum != null)
+    if (inStreams != null)
       {
-        if (enum.hasMoreElements())
-	  nextIn = (InputStream) enum.nextElement();
+        if (inStreams.hasMoreElements())
+	  nextIn = (InputStream) inStreams.nextElement();
       }
     else
       if (in2 != null)
Index: java/util/zip/ZipOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/ZipOutputStream.java,v
retrieving revision 1.7
diff -u -r1.7 ZipOutputStream.java
--- java/util/zip/ZipOutputStream.java	18 Jun 2003 09:42:57 -0000	1.7
+++ java/util/zip/ZipOutputStream.java	21 Jan 2004 17:30:16 -0000
@@ -338,10 +338,10 @@
     int numEntries = 0;
     int sizeEntries = 0;
     
-    Enumeration enum = entries.elements();
-    while (enum.hasMoreElements())
+    Enumeration elements = entries.elements();
+    while (elements.hasMoreElements())
       {
-	ZipEntry entry = (ZipEntry) enum.nextElement();
+	ZipEntry entry = (ZipEntry) elements.nextElement();
 	
 	int method = entry.getMethod();
 	writeLeInt(CENSIG);
Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.4
diff -u -r1.4 BasicLookAndFeel.java
--- javax/swing/plaf/basic/BasicLookAndFeel.java	2 Jul 2003 05:21:52 -0000	1.4
+++ javax/swing/plaf/basic/BasicLookAndFeel.java	21 Jan 2004 17:30:16 -0000
@@ -205,15 +205,15 @@
   private void loadResourceBundle(UIDefaults defaults)
   {
     ResourceBundle bundle;
-    Enumeration enum;
+    Enumeration keys;
     String key;
     String value;
     bundle = ResourceBundle.getBundle("resources/basic");
     // Process Resources
-    enum = bundle.getKeys();
-    while (enum.hasMoreElements())
+    keys = bundle.getKeys();
+    while (keys.hasMoreElements())
       {
-        key = (String) enum.nextElement();
+        key = (String) keys.nextElement();
         value = bundle.getString(key);
         defaults.put(key, value);
       }
Index: javax/swing/tree/DefaultMutableTreeNode.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/tree/DefaultMutableTreeNode.java,v
retrieving revision 1.4
diff -u -r1.4 DefaultMutableTreeNode.java
--- javax/swing/tree/DefaultMutableTreeNode.java	12 Oct 2003 16:48:34 -0000	1.4
+++ javax/swing/tree/DefaultMutableTreeNode.java	21 Jan 2004 17:30:16 -0000
@@ -997,21 +997,21 @@
 	public int getLeafCount() {
 
 		// Variables
-		Enumeration	enum;
+		Enumeration	nodes;
 		int			count;
 		TreeNode	current;
 
 		// Get Enumeration of all descendants
-		enum = depthFirstEnumeration();
+		nodes = depthFirstEnumeration();
 
 		// Process Nodes
 		count = 0;
-		while (enum.hasMoreElements() == true) {
-			current = (TreeNode) enum.nextElement();
-			if (current.isLeaf() == true) {
+		while (nodes.hasMoreElements()) {
+			current = (TreeNode) nodes.nextElement();
+			if (current.isLeaf()) {
 				count++;
 			} // if
-		} // if
+		} // while
 
 		return count;
 

--------------060106050003080209060203--




From MAILER-DAEMON Wed Jan 21 12:57:19 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjMbO-0001Hq-Cl
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 12:57:18 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjMbF-0001GY-TX
	for classpath@gnu.org; Wed, 21 Jan 2004 12:57:09 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjMaj-00016k-3r
	for classpath@gnu.org; Wed, 21 Jan 2004 12:57:08 -0500
Received: from [217.72.192.151] (helo=smtp.web.de)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AjMai-00016J-LS
	for classpath@gnu.org; Wed, 21 Jan 2004 12:56:36 -0500
Received: from pd9e619a7.dip.t-dialin.net ([217.230.25.167] helo=web.de)
	by smtp.web.de with asmtp (WEB.DE 4.99 #566) id 1AjMaf-0006JU-00
	for classpath@gnu.org; Wed, 21 Jan 2004 18:56:33 +0100
Message-ID: <400EBC9E.6000603@web.de>
Date: Wed, 21 Jan 2004 18:53:34 +0100
From: Matthias Pfisterer <Matthias.Pfisterer@web.de>
User-Agent: Mozilla/5.0 (X11; U; Linux i586; en-US;
	rv:1.0.0) Gecko/20020623 Debian/1.0.0-0.woody.1
X-Accept-Language: en-us, en, de
MIME-Version: 1.0
To: classpath <classpath@gnu.org>
References: <400DA6E0.8000509@web.de>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Sender: Matthias.Pfisterer@web.de
Subject: Re: more diffs
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 17:57:10 -0000

Matthias Pfisterer wrote:
> Hi,
> 
> another couple of fixes (attached).
> 
> Matthias
> 
> 
> ------------------------------------------------------------------------
> 
> Index: javax/swing/text/Position.java
> ===================================================================
> RCS file: /cvsroot/classpath/classpath/javax/swing/text/Position.java,v
> retrieving revision 1.2
> diff -u -r1.2 Position.java
> --- javax/swing/text/Position.java	30 Apr 2002 21:37:27 -0000	1.2
> +++ javax/swing/text/Position.java	20 Jan 2004 21:24:01 -0000
> @@ -40,7 +40,7 @@
>  
>  public interface Position
>  {
> -    static class Bias
> +    public static final class Bias
>      {
>      }

The "public" is the same problem as with Map.Entry, so consider this 
obsolete. The class should still become final, however.

Matthias


-- 
Matthias Pfisterer	<mailto:Matthias.Pfisterer@web.de>
Reuchlinstrasse 28	phone ++49-711-62 87 12
D-70176 Stuttgart	(in Deutschland 0711-62 87 12)
GERMANY

Work like you don't need the money.
Love like you've never been hurt.
Dance like nobody is watching.

Java Sound Resources (examples, FAQ, applications):
http://www.jsresources.org/

Tritonus, the open source implementation of the Java Sound API:
http://www.tritonus.org/
--------------------------------------------------------------




From MAILER-DAEMON Wed Jan 21 14:14:50 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjNoP-0001JX-6H
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 14:14:49 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjNo0-0001Ap-Qu
	for classpath@gnu.org; Wed, 21 Jan 2004 14:14:24 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjNnO-0000xl-6I
	for classpath@gnu.org; Wed, 21 Jan 2004 14:14:17 -0500
Received: from [217.72.192.158] (helo=smtp.web.de)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AjNnM-0000wn-Nw
	for classpath@gnu.org; Wed, 21 Jan 2004 14:13:45 -0500
Received: from pd9e619a7.dip.t-dialin.net ([217.230.25.167] helo=web.de)
	by smtp.web.de with asmtp (WEB.DE 4.99 #566)
	id 1AjNmd-0005Ac-00; Wed, 21 Jan 2004 20:12:59 +0100
Message-ID: <400ECE81.8090609@web.de>
Date: Wed, 21 Jan 2004 20:09:53 +0100
From: Matthias Pfisterer <Matthias.Pfisterer@web.de>
User-Agent: Mozilla/5.0 (X11; U; Linux i586; en-US;
	rv:1.0.0) Gecko/20020623 Debian/1.0.0-0.woody.1
X-Accept-Language: en-us, en, de
MIME-Version: 1.0
To: Dalibor Topic <robilad@kaffe.org>
References: <NFBBKALFDCPFIDBNKAPCOEIEDMAA.dholmes@dltech.com.au>	<400E48D1.1060906@web.de>
	<87r7xtfdx5.fsf@fleche.redhat.com> <400EB1AD.4050209@kaffe.org>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Sender: Matthias.Pfisterer@web.de
Cc: tromey@redhat.com, classpath <classpath@gnu.org>
Subject: Re: bug in java.util.Map
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 19:14:44 -0000

Dalibor Topic wrote:
> Tom Tromey wrote:
> 
>>>>>>> "Matthias" == Matthias Pfisterer <Matthias.Pfisterer@web.de> writes:
>>>>>>
>>
>>
>> Matthias> Building with kjc, I get the following errors:
>> Matthias> ../java/beans/PropertyChangeSupport.java:1: 
>> error:Unaccessible class
>> Matthias> "java/util/Map/Entry" can not be imported [JLS 7.5.1]
>>
>> If it isn't fixable in the compiler we can add a workaround.  We
>> already work around some gcj bugs.  Workarounds need a comment
>> explaining what compiler and version they are for, though.  And of
>> course we'd prefer a compiler fix...
>>
> 
> The weird thing is that I use the unmodified source from GNU Classpath 
> in kaffe's CVS  and it builds without a hitch there. So I'd be against 
> adding a 'public' to it. And our java/beans/PropertyChangeSupport.java 
> is the same as in classpath, as well. Weird.
> 
> I can only guess that the set of files being built together in 
> classpath's build process is somewhat different from the set of files 
> being build together in kaffe's build process, and that somehow triggers 
> the problem.

I've localized the problem and filed a bug against kjc (on the kopi 
developers m-l). The error only occurs if the 
not-explicit-public-inner-interface is compiled together with a file 
importing it in one step.

Matthias

-- 
Matthias Pfisterer	<mailto:Matthias.Pfisterer@web.de>
Reuchlinstrasse 28	phone ++49-711-62 87 12
D-70176 Stuttgart	(in Deutschland 0711-62 87 12)
GERMANY

Work like you don't need the money.
Love like you've never been hurt.
Dance like nobody is watching.

Java Sound Resources (examples, FAQ, applications):
http://www.jsresources.org/

Tritonus, the open source implementation of the Java Sound API:
http://www.tritonus.org/
--------------------------------------------------------------




From MAILER-DAEMON Wed Jan 21 15:34:22 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjP30-00034R-PR
	for mharc-classpath@gnu.org; Wed, 21 Jan 2004 15:33:58 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjP2f-0002sO-Br
	for classpath@gnu.org; Wed, 21 Jan 2004 15:33:37 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjP25-0002Rg-2n
	for classpath@gnu.org; Wed, 21 Jan 2004 15:33:33 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjP13-00025M-NX
	for classpath@gnu.org; Wed, 21 Jan 2004 15:31:57 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-025.ewetel.net
	[80.228.82.25])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i0LKVt9u017263;
	Wed, 21 Jan 2004 21:31:55 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AjP1N-0001Og-00; Wed, 21 Jan 2004 21:32:17 +0100
Date: Wed, 21 Jan 2004 21:32:17 +0100
From: Michael Koch <konqueror@gmx.de>
To: Matthias Pfisterer <Matthias.Pfisterer@web.de>
Message-ID: <20040121203217.GA4341@mail.konqueror.de>
References: <400EB766.4090401@web.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <400EB766.4090401@web.de>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: classpath <classpath@gnu.org>
Subject: Re: "enum" variables (patch)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 20:33:53 -0000

On Wed, Jan 21, 2004 at 06:31:18PM +0100, Matthias Pfisterer wrote:
> Hi,
> 
> in Java 1.5, "enum" is a keyword. Therefore it can no longer be used for 
>  variable names. I've made a patch that changes all variables "enum".
> 
> Matthias
> 
> -- 
> Matthias Pfisterer	<mailto:Matthias.Pfisterer@web.de>
> Reuchlinstrasse 28	phone ++49-711-62 87 12
> D-70176 Stuttgart	(in Deutschland 0711-62 87 12)
> GERMANY
> 
> Work like you don't need the money.
> Love like you've never been hurt.
> Dance like nobody is watching.
> 
> Java Sound Resources (examples, FAQ, applications):
> http://www.jsresources.org/
> 
> Tritonus, the open source implementation of the Java Sound API:
> http://www.tritonus.org/
> --------------------------------------------------------------

> Index: external/jaxp/source/gnu/xml/aelfred2/XmlParser.java
> ===================================================================
> RCS file: /cvsroot/classpath/classpath/external/jaxp/source/gnu/xml/aelfred2/XmlParser.java,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 XmlParser.java
> --- external/jaxp/source/gnu/xml/aelfred2/XmlParser.java	1 Feb 2003 02:10:12 -0000	1.1.1.1
> +++ external/jaxp/source/gnu/xml/aelfred2/XmlParser.java	21 Jan 2004 17:29:53 -0000

Thats from external sources and need to get fixed upstream first. Then
we can update our copy of GNU Jaxp.

Do you have already done the copyright assignment stuff ? For such a big
contribution we need you to assign your copyright to FSF.



Michael



From MAILER-DAEMON Thu Jan 22 01:59:04 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjYnv-0008La-VI
	for mharc-classpath@gnu.org; Thu, 22 Jan 2004 01:59:03 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjYnt-0008KZ-3I
	for classpath@gnu.org; Thu, 22 Jan 2004 01:59:01 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjYnM-00087h-RD
	for classpath@gnu.org; Thu, 22 Jan 2004 01:58:59 -0500
Received: from [217.72.192.180] (helo=smtp.web.de)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AjYnM-00087L-Ct
	for classpath@gnu.org; Thu, 22 Jan 2004 01:58:28 -0500
Received: from pd9519528.dip.t-dialin.net ([217.81.149.40] helo=web.de)
	by smtp.web.de with asmtp (WEB.DE 4.99 #566)
	id 1AjYnK-0004C3-00; Thu, 22 Jan 2004 07:58:26 +0100
Message-ID: <400F73DE.1070202@web.de>
Date: Thu, 22 Jan 2004 07:55:26 +0100
From: Matthias Pfisterer <Matthias.Pfisterer@web.de>
User-Agent: Mozilla/5.0 (X11; U; Linux i586; en-US;
	rv:1.0.0) Gecko/20020623 Debian/1.0.0-0.woody.1
X-Accept-Language: en-us, en, de
MIME-Version: 1.0
To: Michael Koch <konqueror@gmx.de>
References: <400EB766.4090401@web.de> <20040121203217.GA4341@mail.konqueror.de>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Sender: Matthias.Pfisterer@web.de
Cc: classpath <classpath@gnu.org>
Subject: Re: "enum" variables (patch)
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jan 2004 06:59:01 -0000

Michael Koch wrote:
> On Wed, Jan 21, 2004 at 06:31:18PM +0100, Matthias Pfisterer wrote:
> 
>>Hi,
>>
>>in Java 1.5, "enum" is a keyword. Therefore it can no longer be used for 
>> variable names. I've made a patch that changes all variables "enum".
>>
>>Matthias

> 
>>Index: external/jaxp/source/gnu/xml/aelfred2/XmlParser.java
>>===================================================================
>>RCS file: /cvsroot/classpath/classpath/external/jaxp/source/gnu/xml/aelfred2/XmlParser.java,v
>>retrieving revision 1.1.1.1
>>diff -u -r1.1.1.1 XmlParser.java
>>--- external/jaxp/source/gnu/xml/aelfred2/XmlParser.java	1 Feb 2003 02:10:12 -0000	1.1.1.1
>>+++ external/jaxp/source/gnu/xml/aelfred2/XmlParser.java	21 Jan 2004 17:29:53 -0000
> 
> 
> Thats from external sources and need to get fixed upstream first. Then
> we can update our copy of GNU Jaxp.

Can you give me a URL or e-mail address where to send it?

> Do you have already done the copyright assignment stuff ? For such a big
> contribution we need you to assign your copyright to FSF.

Huh? Renaming a few variables is a big contribution? But ok, I need to 
do this anyway. Can you give me a pointer to some docs that tell me what 
to do in detail?

Thanks,
Matthias


-- 
Matthias Pfisterer	<mailto:Matthias.Pfisterer@web.de>
Reuchlinstrasse 28	phone ++49-711-62 87 12
D-70176 Stuttgart	(in Deutschland 0711-62 87 12)
GERMANY

Work like you don't need the money.
Love like you've never been hurt.
Dance like nobody is watching.

Java Sound Resources (examples, FAQ, applications):
http://www.jsresources.org/

Tritonus, the open source implementation of the Java Sound API:
http://www.tritonus.org/
--------------------------------------------------------------




From MAILER-DAEMON Thu Jan 22 02:46:18 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjZXd-0002Dq-Ly
	for mharc-classpath@gnu.org; Thu, 22 Jan 2004 02:46:17 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjZXX-000246-Qx
	for classpath@gnu.org; Thu, 22 Jan 2004 02:46:11 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjZWl-0001f8-Nw
	for classpath@gnu.org; Thu, 22 Jan 2004 02:45:55 -0500
Received: from [217.8.192.123] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjZWl-0001eC-3Z
	for classpath@gnu.org; Thu, 22 Jan 2004 02:45:23 -0500
Received: from [217.8.199.173] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 318588; Thu, 22 Jan 2004 08:49:25 +0100
From: Sascha Brawer <brawer@dandelis.ch>
To: Matthias Pfisterer <Matthias.Pfisterer@web.de>
Date: Thu, 22 Jan 2004 08:45:17 +0100
Message-Id: <20040122074518.15631@smtp.mail.ch.easynet.net>
In-Reply-To: <400F73DE.1070202@web.de>
References: <400F73DE.1070202@web.de>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: Wielaard <mark@klomp.org>, Mark@gnu.org, 
	GNU Classpath <classpath@gnu.org>,
	Michael Koch <konqueror@gmx.de>
Subject: Copyright assignment (was: "enum" variables (patch))
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jan 2004 07:46:16 -0000

Matthias Pfisterer <Matthias.Pfisterer@web.de> wrote on Thu, 22 Jan
2004 07:55:26 +0100:

>> [need to file a copyright assignment with the FSF]

>Huh? Renaming a few variables is a big contribution? But ok, I need to 
>do this anyway.

Some contributors of Classpath might be annoyed if their work was being
used under conditions that are not according to the terms of the license.
However, enforcing the license in court (if this was ever needed) would
be easier if the Free Software Foundation can claim to speak in the name
of all authors. For this reason, and for others that are specific to the
intellectual property system of the United States, GNU projects tend to
be a bit picky about getting signatures from all contributors. Please do
not see this as a personal offence.

See also <http://www.gnu.org/licenses/why-assign.html>.

For getting the assignment form, please send an e-mail with your name (as
it appears in your passport) and your current postal address to the
maintainer of GNU Classpath, Mark Wielaard <mark@klomp.org>.

By the way, thank you very much for your work. I think I can speak in the
name of everyone here if I say that we are looking forward to your
contributions!

-- Sascha

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





From MAILER-DAEMON Fri Jan 23 16:35:15 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ak8xM-0006sU-9G
	for mharc-classpath@gnu.org; Fri, 23 Jan 2004 16:35:12 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ak8wS-0005z9-BL
	for classpath@gnu.org; Fri, 23 Jan 2004 16:34:16 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ak8vk-0005M7-R5
	for classpath@gnu.org; Fri, 23 Jan 2004 16:34:03 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1Ak8ve-0005Fb-Hj
	for classpath@gnu.org; Fri, 23 Jan 2004 16:33:26 -0500
Received: from [32.97.182.104] (helo=e4.ny.us.ibm.com)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1Ak8ZU-0008Mo-0k
	for classpath@gnu.org; Fri, 23 Jan 2004 16:10:32 -0500
Received: from northrelay02.pok.ibm.com (northrelay02.pok.ibm.com
	[9.56.224.150])
	by e4.ny.us.ibm.com (8.12.10/8.12.2) with ESMTP id i0NLA1vM842030
	for <classpath@gnu.org>; Fri, 23 Jan 2004 16:10:01 -0500
Received: from d01ml604.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216])
	by northrelay02.pok.ibm.com (8.12.10/NCO/VER6.6) with ESMTP id
	i0NL9xnm228606
	for <classpath@gnu.org>; Fri, 23 Jan 2004 16:10:00 -0500
In-Reply-To: <1073838503.17232.56.camel@sector17.home.at>
To: classpath@gnu.org
MIME-Version: 1.0
X-Mailer: Lotus Notes Release 6.0 September 26, 2002
From: David P Grove <groved@us.ibm.com>
Message-ID: <OFCA088C3E.26EB08A3-ON85256E24.007395A1-85256E24.0074258A@us.ibm.com>
Date: Fri, 23 Jan 2004 16:08:37 -0500
X-MIMETrack: Serialize by Router on D01ML604/01/M/IBM(Release 6.5HF202 |
	December 5, 2003) at 01/23/2004 16:10:00,
	Serialize complete at 01/23/2004 16:10:00
Content-Type: multipart/alternative;
	boundary="=_alternative 0073AF3785256E24_="
Subject: Re: [PATCH] 64-bit dtoa - strtod fix
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jan 2004 21:35:09 -0000

This is a multipart message in MIME format.
--=_alternative 0073AF3785256E24_=
Content-Type: text/plain; charset="US-ASCII"

Hi,

        It looks like this patch may have gotten dropped; Could someone 
please apply it;  it fixes a problem we've also observed with the 64 bit 
port of Jikes RVM.

thanks,

--dave





Christian Thalinger <twisti@complang.tuwien.ac.at>
Sent by: classpath-bounces+groved=us.ibm.com@gnu.org
01/11/2004 11:28 AM
 
        To:     classpath@gnu.org
        cc: 
        Subject:        [PATCH] 64-bit dtoa - strtod fix


We are building a java jit called cacao
(http://www.complang.tuwien.ac.at/java/cacao/) which now uses the gnu
classpath. On our 64-bit ports we had problems with dtoa and strtod
functions. After a long night of debugging, i found the problem: it
seems that in mprec.h

#define MAX_BIGNUM_WDS 32

is too small for some floats. The amount can grow up to 48, as my
debugging showed. On i386 systems where Pack_32 is defined, it seems to
be ok. But Pack_32 does not work on 64-bit systems.

This bug is hit, when you try to execute this small code

class test {
    public static void main(String[] argv) {
        System.out.println(Double.MIN_VALUE);
    }
}

with gij (gcc-3.3.2) on x86_64. Defining

#define MAX_BIGNUM_WDS 64

shows the expected result with our jit. I don't know if 64 is a
reasonable number, but when not packing 32-bit in a long but 16-bit,
twice as much should be ok.

This is also cross-posted to java-patches@gcc.gnu.org

TWISTI

--- classpath-0.07/native/fdlibm/mprec.h        2001-11-05
03:56:47.000000000 +0100
+++ cacaodev/gnuclasspath/native/fdlibm/mprec.h 2004-01-11
17:17:55.000000000 +0100
@@ -295,7 +298,12 @@


#define MAX_BIGNUMS 16
+
+#ifndef Pack_32
+#define MAX_BIGNUM_WDS 64
+#else
#define MAX_BIGNUM_WDS 32
+#endif

struct _Jv_Bigint
{




_______________________________________________
Classpath mailing list
Classpath@gnu.org
http://mail.gnu.org/mailman/listinfo/classpath


--=_alternative 0073AF3785256E24_=
Content-Type: text/html; charset="US-ASCII"


<br><font size=2 face="sans-serif">Hi,</font>
<br>
<br><font size=2 face="sans-serif">&nbsp; &nbsp; &nbsp; &nbsp; It
looks like this patch may have gotten dropped; Could someone please apply
it; &nbsp;it fixes a problem we've also observed with the 64 bit port of
Jikes RVM.</font>
<br>
<br><font size=2 face="sans-serif">thanks,</font>
<br>
<br><font size=2 face="sans-serif">--dave</font>
<br>
<br>
<br>
<br>
<table width=100%>
<tr valign=top>
<td>
<td><font size=1 face="sans-serif"><b>Christian Thalinger &lt;twisti@complang.tuwien.ac.at&gt;</b></font>
<br><font size=1 face="sans-serif">Sent by: classpath-bounces+groved=us.ibm.com@gnu.org</font>
<p><font size=1 face="sans-serif">01/11/2004 11:28 AM</font>
<td><font size=1 face="Arial">&nbsp; &nbsp; &nbsp; &nbsp; </font>
<br><font size=1 face="sans-serif">&nbsp; &nbsp; &nbsp; &nbsp; To:
&nbsp; &nbsp; &nbsp; &nbsp;classpath@gnu.org</font>
<br><font size=1 face="sans-serif">&nbsp; &nbsp; &nbsp; &nbsp; cc:
&nbsp; &nbsp; &nbsp; &nbsp;</font>
<br><font size=1 face="sans-serif">&nbsp; &nbsp; &nbsp; &nbsp; Subject:
&nbsp; &nbsp; &nbsp; &nbsp;[PATCH] 64-bit dtoa - strtod fix</font></table>
<br>
<br>
<br><font size=2><tt>We are building a java jit called cacao<br>
(http://www.complang.tuwien.ac.at/java/cacao/) which now uses the gnu<br>
classpath. On our 64-bit ports we had problems with dtoa and strtod<br>
functions. After a long night of debugging, i found the problem: it<br>
seems that in mprec.h<br>
<br>
#define MAX_BIGNUM_WDS 32<br>
<br>
is too small for some floats. The amount can grow up to 48, as my<br>
debugging showed. On i386 systems where Pack_32 is defined, it seems to<br>
be ok. But Pack_32 does not work on 64-bit systems.<br>
<br>
This bug is hit, when you try to execute this small code<br>
<br>
class test {<br>
 &nbsp; &nbsp;public static void main(String[] argv) {<br>
 &nbsp; &nbsp; &nbsp; &nbsp;System.out.println(Double.MIN_VALUE);<br>
 &nbsp; &nbsp;}<br>
}<br>
<br>
with gij (gcc-3.3.2) on x86_64. Defining<br>
<br>
#define MAX_BIGNUM_WDS 64<br>
<br>
shows the expected result with our jit. I don't know if 64 is a<br>
reasonable number, but when not packing 32-bit in a long but 16-bit,<br>
twice as much should be ok.<br>
<br>
This is also cross-posted to java-patches@gcc.gnu.org<br>
<br>
TWISTI<br>
<br>
--- classpath-0.07/native/fdlibm/mprec.h &nbsp; &nbsp; &nbsp; &nbsp;2001-11-05<br>
03:56:47.000000000 +0100<br>
+++ cacaodev/gnuclasspath/native/fdlibm/mprec.h 2004-01-11<br>
17:17:55.000000000 +0100<br>
@@ -295,7 +298,12 @@<br>
<br>
<br>
#define MAX_BIGNUMS 16<br>
+<br>
+#ifndef Pack_32<br>
+#define MAX_BIGNUM_WDS 64<br>
+#else<br>
#define MAX_BIGNUM_WDS 32<br>
+#endif<br>
<br>
struct _Jv_Bigint<br>
{<br>
<br>
<br>
<br>
<br>
_______________________________________________<br>
Classpath mailing list<br>
Classpath@gnu.org<br>
http://mail.gnu.org/mailman/listinfo/classpath<br>
</tt></font>
<br>
--=_alternative 0073AF3785256E24_=--



From MAILER-DAEMON Sat Jan 24 03:34:31 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AkJFP-0005EZ-9N
	for mharc-classpath@gnu.org; Sat, 24 Jan 2004 03:34:31 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AkJFL-0005DO-VE
	for classpath@gnu.org; Sat, 24 Jan 2004 03:34:27 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AkJEp-0004zD-Ft
	for classpath@gnu.org; Sat, 24 Jan 2004 03:34:26 -0500
Received: from [132.206.3.88] (helo=relay10.cs.mcgill.ca)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AkJEo-0004wn-2x
	for classpath@gnu.org; Sat, 24 Jan 2004 03:33:54 -0500
Received: from navy.CS.McGill.CA (navy.CS.McGill.CA [132.206.3.43])
	by relay10.cs.mcgill.ca (Postfix) with ESMTP id 4C365536F79
	for <classpath@gnu.org>; Sat, 24 Jan 2004 03:33:52 -0500 (EST)
Received: from navy.CS.McGill.CA (dbelan2@localhost [127.0.0.1])
	by navy.CS.McGill.CA (8.12.3/8.12.3/Debian-6.6) with ESMTP id
	i0O8XqBB032334
	for <classpath@gnu.org>; Sat, 24 Jan 2004 03:33:52 -0500
Received: (from dbelan2@localhost)
	by navy.CS.McGill.CA (8.12.3/8.12.3/Debian-6.6) id i0O8XqGK032332
	for classpath@gnu.org; Sat, 24 Jan 2004 03:33:52 -0500
Date: Sat, 24 Jan 2004 03:33:52 -0500
From: David =?iso-8859-1?Q?B=E9langer?= <dbelan2@cs.mcgill.ca>
To: classpath@gnu.org
Message-ID: <20040124083351.GA32220@cs.mcgill.ca>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="X1bOJ3K7DJ5YkBrT"
Content-Disposition: inline
User-Agent: Mutt/1.3.28i
Content-Transfer-Encoding: 7bit
Subject: darwin / OS X support - revisited
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jan 2004 08:34:28 -0000


--X1bOJ3K7DJ5YkBrT
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable


Hi,

Chris Hoffmann from the JikesRVM team sent a patch some time ago for
Mac OS X support.
(see: http://mail.gnu.org/archive/html/classpath/2003-10/msg00032.html)

I adapted his work to suit more the target native framework.

Basically, what I did is:
1) Copy the Linux target directory to a Darwin directory.  (Darwin is
the name of the Unix system under Mac OS X).
2) Modified configure.ac/Makefile to use it.

Note: The diff between Darwin and Linux are quite small, basically 2
lines but I still added a arch.

Note: I am not a Darwin/OS X expert by the way.


>From the original patch:

+#if (defined( __BIG_ENDIAN__) && defined( __APPLE__ ))
+#define __IEEE_BIG_ENDIAN
+#endif=20
+
+

I did not use that.  I simply set CPPFLAGS as -D__PPC__ -D_BIG_ENDIAN
when compiling and leave that file untouched.  It may be tempting to add
a __APPLE__ beside the __AIX__, but __PPC__ is not defined by gcc and
we still need the CPPFLAGS anyway.  Unless we do a completely separte #if=
def
__APPLE__... not under the #ifdef __PPC__.


-  INIT_FIELD ("in", 0);
-  INIT_FIELD ("out", 1);
-  INIT_FIELD ("err", 2);
+  INIT_FIELD ("in", ((long long)0));
+  INIT_FIELD ("out", ((long long)1));
+  INIT_FIELD ("err", ((long long)2));

I did not do that part either.  Seem to work fine.


+#ifndef O_SYNC
+#undef TARGET_NATIVE_FILE_FILEFLAG_SYNC
+#define TARGET_NATIVE_FILE_FILEFLAG_SYNC O_FSYNC
+#endif

Here the problem is that O_FSYNC is be defined in fcntl.h.
However, fcntl.h is not included for the constant in the generic file.
On Linux works fine,
OS X don't like it.  So either the Linux fcntl.h gets included
by some other include etc.  Would need investigation.

What I did, is to add a #include in the Darwin specific target file.

Finally, for:
+#ifdef __MACH__
+typedef int    socklen_t;      =20
+#endif

I simply added it (without the #ifdef) to the network target specific
file.

David
SableVM developer

---

David B=E9langer
Graduate Student
School of Computer Science
McGill University
Office: MC226

Web page:   http://www.cs.mcgill.ca/~dbelan2/
Public key: http://www.cs.mcgill.ca/~dbelan2/public_key.txt


--X1bOJ3K7DJ5YkBrT
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="classpath.darwin.diff"

Index: native/target/Darwin/target_native_math_float.h
===================================================================
--- native/target/Darwin/target_native_math_float.h	(revision 1442)
+++ native/target/Darwin/target_native_math_float.h	(revision 1477)
@@ -0,0 +1,80 @@
+/* ???.h - ???
+   Copyright (C) 1998 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+/*
+Description: Darwin target defintions of float/double constants/
+             macros/functions
+Systems    : all
+*/
+
+#ifndef __TARGET_NATIVE_MATH_FLOAT__
+#define __TARGET_NATIVE_MATH_FLOAT__
+
+/****************************** Includes *******************************/
+/* do not move; needed here because of some macro definitions */
+#include <config.h>
+
+#include <stdlib.h>
+
+/****************** Conditional compilation switches *******************/
+
+/***************************** Constants *******************************/
+
+/***************************** Datatypes *******************************/
+
+/***************************** Variables *******************************/
+
+/****************************** Macros *********************************/
+
+/***************************** Functions *******************************/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+/* include rest of definitions from generic file (do not move it to 
+   another position!) */
+#include "target_generic_math_float.h"
+
+#endif /* __TARGET_NATIVE_MATH_FLOAT__ */
+
+/* end of file */
+

Property changes on: native/target/Darwin/target_native_math_float.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Index: native/target/Darwin/target_native_file.h
===================================================================
--- native/target/Darwin/target_native_file.h	(revision 1442)
+++ native/target/Darwin/target_native_file.h	(revision 1477)
@@ -0,0 +1,82 @@
+/* ???.h - ???
+   Copyright (C) 1998 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+/*
+Description: Darwin target defintions of file functions
+Systems    : all
+*/
+
+#ifndef __TARGET_NATIVE_FILE__
+#define __TARGET_NATIVE_FILE__
+
+/****************************** Includes *******************************/
+/* do not move; needed here because of some macro definitions */
+#include <config.h>
+
+#include <stdlib.h>
+
+/* to have definition of O_FSYNC */
+#include <fcntl.h>
+
+/****************** Conditional compilation switches *******************/
+
+/***************************** Constants *******************************/
+
+/***************************** Datatypes *******************************/
+
+/***************************** Variables *******************************/
+
+/****************************** Macros *********************************/
+
+/***************************** Functions *******************************/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+/* include rest of definitions from generic file (do not move it to 
+   another position!) */
+#include "target_generic_file.h"
+
+#endif /* __TARGET_NATIVE_FILE__ */
+
+/* end of file */
+

Property changes on: native/target/Darwin/target_native_file.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Index: native/target/Darwin/target_native.h
===================================================================
--- native/target/Darwin/target_native.h	(revision 1442)
+++ native/target/Darwin/target_native.h	(revision 1477)
@@ -0,0 +1,79 @@
+/* ???.h - ???
+   Copyright (C) 1998 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+/*
+Description: Linux target global defintions
+Systems    : all
+*/
+
+#ifndef __TARGET_NATIVE__
+#define __TARGET_NATIVE__
+
+/****************************** Includes *******************************/
+/* do not move; needed here because of some macro definitions */
+#include <config.h>
+
+#include <stdlib.h>
+
+/****************** Conditional compilation switches *******************/
+
+/***************************** Constants *******************************/
+
+/***************************** Datatypes *******************************/
+
+/***************************** Variables *******************************/
+
+/****************************** Macros *********************************/
+
+/***************************** Functions *******************************/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+/* include rest of definitions from generic file (do not move it to 
+   another position!) */
+#include "target_generic.h"
+
+#endif /* __TARGET_NATIVE__ */
+
+/* end of file */
+

Property changes on: native/target/Darwin/target_native.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Index: native/target/Darwin/target_native_math_int.h
===================================================================
--- native/target/Darwin/target_native_math_int.h	(revision 1442)
+++ native/target/Darwin/target_native_math_int.h	(revision 1477)
@@ -0,0 +1,80 @@
+/* ???.h - ???
+   Copyright (C) 1998 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+/*
+Description: Darwin target defintions of int/int64 constants/
+             macros/functions
+Systems    : all
+*/
+
+#ifndef __TARGET_NATIVE_MATH_INT__
+#define __TARGET_NATIVE_MATH_INT__
+
+/****************************** Includes *******************************/
+/* do not move; needed here because of some macro definitions */
+#include <config.h>
+
+#include <stdlib.h>
+
+/****************** Conditional compilation switches *******************/
+
+/***************************** Constants *******************************/
+
+/***************************** Datatypes *******************************/
+
+/***************************** Variables *******************************/
+
+/****************************** Macros *********************************/
+
+/***************************** Functions *******************************/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+/* include rest of definitions from generic file (do not move it to 
+   another position!) */
+#include "target_generic_math_int.h"
+
+#endif /* __TARGET_NATIVE_MATH_INT__ */
+
+/* end of file */
+

Property changes on: native/target/Darwin/target_native_math_int.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Index: native/target/Darwin/Makefile.am
===================================================================
--- native/target/Darwin/Makefile.am	(revision 1442)
+++ native/target/Darwin/Makefile.am	(revision 1477)
@@ -0,0 +1,10 @@
+## Input file for automake to generate the Makefile.in used by configure
+
+EXTRA_DIST = \
+target_native_io.h \
+target_native_misc.h \
+target_native.h \
+target_native_math_float.h \
+target_native_network.h \
+target_native_file.h \
+target_native_math_int.h

Property changes on: native/target/Darwin/Makefile.am
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Index: native/target/Darwin/target_native_io.h
===================================================================
--- native/target/Darwin/target_native_io.h	(revision 1442)
+++ native/target/Darwin/target_native_io.h	(revision 1477)
@@ -0,0 +1,78 @@
+/* ???.h - ???
+   Copyright (C) 1998 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+/*
+Description: Darwin target defintions of miscellaneous functions
+Systems    : all
+*/
+
+#ifndef __TARGET_NATIVE_IO__
+#define __TARGET_NATIVE_IO__
+
+/****************************** Includes *******************************/
+/* do not move; needed here because of some macro definitions */
+#include <config.h>
+
+#include <stdlib.h>
+
+/****************** Conditional compilation switches *******************/
+
+/***************************** Constants *******************************/
+
+/***************************** Datatypes *******************************/
+
+/***************************** Variables *******************************/
+
+/****************************** Macros *********************************/
+
+/***************************** Functions *******************************/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+/* include rest of definitions from generic file (do not move it to 
+   another position!) */
+#include "target_generic_io.h"
+
+#endif /* __TARGET_NATIVE_MISC__ */
+
+/* end of file */

Property changes on: native/target/Darwin/target_native_io.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Index: native/target/Darwin/target_native_network.h
===================================================================
--- native/target/Darwin/target_native_network.h	(revision 1442)
+++ native/target/Darwin/target_native_network.h	(revision 1477)
@@ -0,0 +1,81 @@
+/* ???.h - ???
+   Copyright (C) 1998 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+/*
+Description: Darwin target defintions of network functions
+Systems    : all
+*/
+
+#ifndef __TARGET_NATIVE_NETWORK__
+#define __TARGET_NATIVE_NETWORK__
+
+/****************************** Includes *******************************/
+/* do not move; needed here because of some macro definitions */
+#include <config.h>
+
+#include <stdlib.h>
+
+/****************** Conditional compilation switches *******************/
+
+/***************************** Constants *******************************/
+
+/***************************** Datatypes *******************************/
+
+typedef int socklen_t;
+
+/***************************** Variables *******************************/
+
+/****************************** Macros *********************************/
+
+/***************************** Functions *******************************/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+/* include rest of definitions from generic file (do not move it to 
+   another position!) */
+#include "target_generic_network.h"
+
+#endif /* __TARGET_NATIVE_NETWORK__ */
+
+/* end of file */
+

Property changes on: native/target/Darwin/target_native_network.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Index: native/target/Darwin/target_native_misc.h
===================================================================
--- native/target/Darwin/target_native_misc.h	(revision 1442)
+++ native/target/Darwin/target_native_misc.h	(revision 1477)
@@ -0,0 +1,79 @@
+/* ???.h - ???
+   Copyright (C) 1998 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+/*
+Description: Darwin target defintions of miscellaneous functions
+Systems    : all
+*/
+
+#ifndef __TARGET_NATIVE_MISC__
+#define __TARGET_NATIVE_MISC__
+
+/****************************** Includes *******************************/
+/* do not move; needed here because of some macro definitions */
+#include <config.h>
+
+#include <stdlib.h>
+
+/****************** Conditional compilation switches *******************/
+
+/***************************** Constants *******************************/
+
+/***************************** Datatypes *******************************/
+
+/***************************** Variables *******************************/
+
+/****************************** Macros *********************************/
+
+/***************************** Functions *******************************/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+/* include rest of definitions from generic file (do not move it to 
+   another position!) */
+#include "target_generic_misc.h"
+
+#endif /* __TARGET_NATIVE_MISC__ */
+
+/* end of file */
+

Property changes on: native/target/Darwin/target_native_misc.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Index: native/target/Darwin/.cvsignore
===================================================================
--- native/target/Darwin/.cvsignore	(revision 1442)
+++ native/target/Darwin/.cvsignore	(revision 1477)
@@ -0,0 +1,8 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.deps
+Makefile
+Makefile.in

Property changes on: native/target/Darwin/.cvsignore
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


Property changes on: native/target/Darwin
___________________________________________________________________
Name: svn:ignore
   + 
Makefile
Makefile.in


Index: native/target/Makefile.am
===================================================================
--- native/target/Makefile.am	(revision 1442)
+++ native/target/Makefile.am	(revision 1477)
@@ -1,5 +1,5 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-SUBDIRS = Linux generic
+SUBDIRS = Darwin Linux generic
 
 EXTRA_DIST = readme.txt
Index: configure.ac
===================================================================
--- configure.ac	(revision 1442)
+++ configure.ac	(revision 1477)
@@ -141,8 +141,15 @@
 dnl add the include files for the native abstraction layer
 dnl -----------------------------------------------------------
 
-EXTRA_INCLUDES="${EXTRA_INCLUDES} -I\$(top_srcdir)/native/target/Linux -I\$(top_srcdir)/native/target/generic"
+case $host in
+  powerpc-apple-darwin*) TARGET=Darwin
+                         ;;
+                      *) TARGET=Linux
+                         ;;
+esac
 
+EXTRA_INCLUDES="${EXTRA_INCLUDES} -I\$(top_srcdir)/native/target/${TARGET} -I\$(top_srcdir)/native/target/generic"
+
 dnl -----------------------------------------------------------
 
 if test "x${COMPILE_JNI}" = xyes; then


--X1bOJ3K7DJ5YkBrT--



From MAILER-DAEMON Tue Jan 27 05:03:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlQ4O-0000Yw-Fl
	for mharc-classpath@gnu.org; Tue, 27 Jan 2004 05:03:44 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlQ4L-0000Y5-2i
	for classpath@gnu.org; Tue, 27 Jan 2004 05:03:41 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlQ3o-0000Qx-0P
	for classpath@gnu.org; Tue, 27 Jan 2004 05:03:39 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlQ3n-0000QF-OG
	for classpath@gnu.org; Tue, 27 Jan 2004 05:03:07 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0RA32r31205;
	Tue, 27 Jan 2004 05:03:02 -0500
Received: from redhat.com (sebastian-int.corp.redhat.com [172.16.52.221])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0RA31a03998; 
	Tue, 27 Jan 2004 05:03:01 -0500
Message-ID: <40163725.9060202@redhat.com>
Date: Tue, 27 Jan 2004 05:02:13 -0500
From: graydon hoare <graydon@redhat.com>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.6b) Gecko/20031205 Thunderbird/0.4
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Sascha Brawer <brawer@dandelis.ch>
References: <3FFB1521.1060302@redhat.com>
	<20040106211704.22283@smtp.mail.ch.easynet.net>
In-Reply-To: <20040106211704.22283@smtp.mail.ch.easynet.net>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: [PATCH] fixes to swing button implementation
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 10:03:41 -0000

Sascha Brawer wrote:

 > But probably, it would best tp use
> javax.swing.event.EventListenerList here (which, by coincidence, became
> functional this afternoon...). 

I'm using this now.

> Weird. From looking at the J2SE 1.4.2 API specification, I would expect:
> 
>   protected int stateMask; // e.g. ARMED | SELECTED
>   protected int mnemonic;
>   protected String actionCommand;

yes, I've updated the model (and component, and UI, etc.) to work more 
in line with the J2SE docs. if you want to look at what I wound up 
committing, I'd certainly appreciate further commentary by mail.

> It seems strange that these colors are hard-coded. Shouldn't they come
> from the UIManager?

perhaps, I left them there because they were there when I first opened 
up this class. if it needs to be delegated I'll change it.

> A final comment: Please, please, please write documentation and Mauve
> test cases. With javax.swing.DefaultBoundedRangeModel, I've just made the
> experience myself how immensely useful this is for finding bugs, and for
> making sure that changes don't break things.

ok, the version I committed to gcj and just merged to classpath has 
extensive javadocs and is reformatted using jalopy. I have a simple 
mauve test which works but doesn't exercize every aspect of the button; 
I'll extend it across the next few days and fix up any sense in which my 
code doesn't conform with the sun stuff.

-graydon



From MAILER-DAEMON Tue Jan 27 08:49:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlTYQ-0006Un-EO
	for mharc-classpath@gnu.org; Tue, 27 Jan 2004 08:46:58 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlTXD-0006Be-Eq
	for classpath@gnu.org; Tue, 27 Jan 2004 08:45:43 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlTVr-0005bE-RZ
	for classpath@gnu.org; Tue, 27 Jan 2004 08:44:51 -0500
Received: from [64.4.37.50] (helo=hotmail.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlSyA-00066o-Mb
	for classpath@gnu.org; Tue, 27 Jan 2004 08:09:30 -0500
Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC;
	Tue, 27 Jan 2004 05:09:29 -0800
Received: from 195.224.225.50 by by10fd.bay10.hotmail.msn.com with HTTP;
	Tue, 27 Jan 2004 13:09:28 GMT
X-Originating-IP: [195.224.225.50]
X-Originating-Email: [robert_lougher@hotmail.com]
X-Sender: robert_lougher@hotmail.com
From: "Robert Lougher" <robert_lougher@hotmail.com>
To: classpath@gnu.org
Bcc: 
Date: Tue, 27 Jan 2004 13:09:28 +0000
Mime-Version: 1.0
Content-Type: text/plain; format=flowed
Message-ID: <BAY10-F50bdVJWrGW6E0001b006@hotmail.com>
X-OriginalArrivalTime: 27 Jan 2004 13:09:29.0194 (UTC)
	FILETIME=[CBECE4A0:01C3E4D6]
Subject: JamVM 1.1.1 released
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 13:46:43 -0000

Hi,

I believe a couple of people on this list have at least given JamVM a test.  
In case you're interested, JamVM 1.1.1 is finally out (see 
http://jamvm.sourceforge.net).  It's been updated to use Classpath 0.07, as 
well as using a Java 2 style system class loader as discussed last December 
(a new job delayed the release).

Other modifications include support for so-called Miranda methods, and the 
usual bugfixes and performance improvements.  In particular, 1.1.0 had a bug 
in VMClass.isInstance, which crept in during the VMClass/Class integration.  
This is now fixed.

Mark mentioned he gave JamVM 1.1.0 a go with the AWT peers.  I haven't had 
any time to do testing with 1.1.1.  However, I'd like to - Is there any test 
programs about which gives good coverage?

Thanks,

Rob.

_________________________________________________________________
Sign-up for a FREE BT Broadband connection today! 
http://www.msn.co.uk/specials/btbroadband




From MAILER-DAEMON Tue Jan 27 12:39:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlXB1-0004Sl-7g
	for mharc-classpath@gnu.org; Tue, 27 Jan 2004 12:39:03 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlXAw-0004Pu-Oy
	for classpath@gnu.org; Tue, 27 Jan 2004 12:38:58 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlXAM-0004BX-NG
	for classpath@gnu.org; Tue, 27 Jan 2004 12:38:54 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlXAL-000478-QB
	for classpath@gnu.org; Tue, 27 Jan 2004 12:38:21 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id KAA24945;
	Tue, 27 Jan 2004 10:38:13 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 28EBB4F8245; Tue, 27 Jan 2004 10:28:49 -0700 (MST)
To: "Robert Lougher" <robert_lougher@hotmail.com>
References: <BAY10-F50bdVJWrGW6E0001b006@hotmail.com>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: It's the RINSE CYCLE!!  They've ALL IGNORED the RINSE CYCLE!!
Date: 27 Jan 2004 10:28:49 -0700
In-Reply-To: <BAY10-F50bdVJWrGW6E0001b006@hotmail.com>
Message-ID: <8765exmhbi.fsf@fleche.redhat.com>
Lines: 10
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: classpath@gnu.org
Subject: Re: JamVM 1.1.1 released
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 17:39:01 -0000

>>>>> "Robert" == Robert Lougher <robert_lougher@hotmail.com> writes:

Robert> Mark mentioned he gave JamVM 1.1.0 a go with the AWT peers.  I haven't
Robert> had any time to do testing with 1.1.1.  However, I'd like to - Is
Robert> there any test programs about which gives good coverage?

Look at the "wonka" module in mauve cvs.  This is the Acunia Visual
Tester, it tests all sorts of AWT functionality.

Tom



From MAILER-DAEMON Tue Jan 27 12:55:15 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlXQg-00021B-Vn
	for mharc-classpath@gnu.org; Tue, 27 Jan 2004 12:55:14 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlXQe-0001zw-0g
	for classpath@gnu.org; Tue, 27 Jan 2004 12:55:12 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlXNa-0001As-IX
	for classpath@gnu.org; Tue, 27 Jan 2004 12:52:33 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlXN6-00014j-Vm
	for classpath@gnu.org; Tue, 27 Jan 2004 12:51:33 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id KAA31237;
	Tue, 27 Jan 2004 10:51:26 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 31B5B4F8245; Tue, 27 Jan 2004 10:42:03 -0700 (MST)
To: =?iso-8859-15?q?David_B=E9langer?= <dbelan2@cs.mcgill.ca>
References: <20040124083351.GA32220@cs.mcgill.ca>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Yow!  Am I JOGGING yet??
Date: 27 Jan 2004 10:42:03 -0700
In-Reply-To: <20040124083351.GA32220@cs.mcgill.ca>
Message-ID: <871xplmgpg.fsf@fleche.redhat.com>
Lines: 85
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Cc: classpath@gnu.org
Subject: Re: darwin / OS X support - revisited
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: tromey@redhat.com
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 17:55:13 -0000

>>>>> "David" == David Bélanger <dbelan2@cs.mcgill.ca> writes:

David> Note: The diff between Darwin and Linux are quite small,
David> basically 2 lines but I still added a arch.

Darwin is really close enough to other Unices that, IMO, we don't need
a separate architecture for it.

David> +#if (defined( __BIG_ENDIAN__) && defined( __APPLE__ ))
David> +#define __IEEE_BIG_ENDIAN
David> +#endif 

libgcj also uses fdlibm.  We've already got a lot of portability hacks
in it.  I think it would be cool if somebody merged the two.  For this
case we have:

    #if defined (__PPC__) || defined (__ppc__)
    #if (defined(_BIG_ENDIAN) && _BIG_ENDIAN) || (defined(_AIX) && _AIX) \
        || defined (__APPLE__)
    #define __IEEE_BIG_ENDIAN
    #else
    #if (defined(_LITTLE_ENDIAN) && _LITTLE_ENDIAN) || (defined(__sun__) && __sun__) || (defined(__WIN32__) && __WIN32__)
    #define __IEEE_LITTLE_ENDIAN
    #endif
    #endif
    #endif

David> It may be tempting to add
David> a __APPLE__ beside the __AIX__, but __PPC__ is not defined by gcc and
David> we still need the CPPFLAGS anyway.

I wonder if this changed at some point.  The above probably wouldn't
work unless gcc defined __PPC__.

David> Here the problem is that O_FSYNC is be defined in fcntl.h.
David> However, fcntl.h is not included for the constant in the generic file.
David> On Linux works fine,
David> OS X don't like it.  So either the Linux fcntl.h gets included
David> by some other include etc.  Would need investigation.

This is the sort of situation where you can just add a configure
check for fcntl.h and #include it.

For libgcj we do this:

    // Some POSIX systems don't have O_SYNC and O_DYSNC so we define them here.
    // Needed in java/io/natFileDescriptorPosix.cc.
    #if !defined (O_SYNC) && defined (O_FSYNC)
    #define O_SYNC O_FSYNC
    #endif
    #if !defined (O_DSYNC) && defined (O_FSYNC)
    #define O_DSYNC O_FSYNC
    #endif
    // If O_DSYNC is still not defined, use O_SYNC (needed for newlib)
    #if !defined (O_DSYNC) 
    #define O_DSYNC O_SYNC
    #endif

David> +#ifdef __MACH__
David> +typedef int    socklen_t;       
David> +#endif
David> I simply added it (without the #ifdef) to the network target specific
David> file.

It's more robust to find the required header and #include it, perhaps
conditionally.

The only really Darwin-specific change we needed in libgcj was
handling the shared library suffix:

    // Prefix and suffix for shared libraries.
    #define _Jv_platform_solib_prefix "lib"
    #if defined(__APPLE__) && defined(__MACH__) && defined(__ppc__)
    #define _Jv_platform_solib_suffix ".dylib"
    #else
    #define _Jv_platform_solib_suffix ".so"
    #endif

Everything else is handled using the ordinary configure mechanisms.  I
think this is really the best approach for classpath.  Lots of history
shows that using feature tests is much more robust.  There are only a
few situations where they aren't practical (e.g., the shared library
suffix).

Tom



From MAILER-DAEMON Tue Jan 27 15:24:15 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlZks-0002Mx-E6
	for mharc-classpath@gnu.org; Tue, 27 Jan 2004 15:24:14 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlZkj-0002LP-T8
	for classpath@gnu.org; Tue, 27 Jan 2004 15:24:05 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlZkB-0002EK-9U
	for classpath@gnu.org; Tue, 27 Jan 2004 15:24:02 -0500
Received: from [24.196.18.187] (helo=InterJet.dellroad.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlZhr-0001hC-Q6
	for classpath@gnu.org; Tue, 27 Jan 2004 15:21:07 -0500
Received: from arch20m.dellroad.org (arch20m.dellroad.org [10.2.2.20])
	by InterJet.dellroad.org (8.9.1a/8.9.1) with ESMTP id OAA29150;
	Tue, 27 Jan 2004 14:20:58 -0600 (CST)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.8/8.12.6) with ESMTP id i0RKKwoU095496;
	Tue, 27 Jan 2004 14:20:58 -0600 (CST)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.8/8.12.8/Submit) id i0RKKwli095495;
	Tue, 27 Jan 2004 14:20:58 -0600 (CST)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200401272020.i0RKKwli095495@arch20m.dellroad.org>
To: konqueror@gmx.de
Date: Tue, 27 Jan 2004 14:20:57 -0600 (CST)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Cc: classpath@gnu.org
Subject: O_SYNC/O_FSYNC fix
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 20:24:09 -0000

Hi Michael,

This is regarding the Classpath patch to fix the O_SYNC/O_FSYNC problem
with FreeBSD I reported a while ago.

I am currently unable to build from CVS because of auto* confusion
and version mismatches that I don't have time to figure out right now.

However I've tried classpath 0.07 with the patch applied (ie, this one:)

    http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/native/target/generic/target_generic_file.h.diff?r1=1.11&r2=1.12&diff_format=u

and it still does not work. The problem seems to be that when
target_generic_file.h is included, <fcntl.h> has not yet been
included. So neither of O_SYNC or O_FSYNC is defined yet, and
the result is the same (O_SYNC is chosen which is incorrect).

Not sure what the "right" fix is but the patch below does work.

Thanks,
-Archie

__________________________________________________________________________
Archie Cobbs     *    Halloo Communications    *     http://www.halloo.com

--- classpath-0.07/native/jni/java-io/FileDescriptor.c.orig	Wed Jul 30 05:11:34 2003
+++ classpath-0.07/native/jni/java-io/FileDescriptor.c	Tue Jan 27 14:16:45 2004
@@ -49,6 +49,7 @@
 #include <config.h>
 
 #include <stdlib.h>
+#include <fcntl.h>
 
 /* FIXME: Need to make configure set these for us */
 /* #define HAVE_SYS_IOCTL_H */



From MAILER-DAEMON Tue Jan 27 16:07:06 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlaQM-0003Dj-DY
	for mharc-classpath@gnu.org; Tue, 27 Jan 2004 16:07:06 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlaQH-0003CA-Vr
	for classpath@gnu.org; Tue, 27 Jan 2004 16:07:01 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlaPi-00033C-67
	for classpath@gnu.org; Tue, 27 Jan 2004 16:06:57 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlaPh-00032r-EL
	for classpath@gnu.org; Tue, 27 Jan 2004 16:06:25 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-148.ewetel.net
	[80.228.80.148])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0RL6JUc022184;
	Tue, 27 Jan 2004 22:06:21 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1Ala6k-0004yI-00; Tue, 27 Jan 2004 21:46:50 +0100
Date: Tue, 27 Jan 2004 21:46:50 +0100
From: Michael Koch <konqueror@gmx.de>
To: Archie Cobbs <archie@dellroad.org>
Message-ID: <20040127204650.GC17020@mail.konqueror.de>
References: <200401272020.i0RKKwli095495@arch20m.dellroad.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200401272020.i0RKKwli095495@arch20m.dellroad.org>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: classpath@gnu.org, konqueror@gmx.de
Subject: Re: O_SYNC/O_FSYNC fix
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 21:07:04 -0000

On Tue, Jan 27, 2004 at 02:20:57PM -0600, Archie Cobbs wrote:
> Hi Michael,
> 
> This is regarding the Classpath patch to fix the O_SYNC/O_FSYNC problem
> with FreeBSD I reported a while ago.
> 
> I am currently unable to build from CVS because of auto* confusion
> and version mismatches that I don't have time to figure out right now.

Yeah we have some autoconf/automake problems because I updated our configure system.
Using autoconf 2.59/automake 1.7.9/1.8.x should work. It does for me.
Older versions are known to be broken.

> However I've tried classpath 0.07 with the patch applied (ie, this one:)
> 
>     http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/native/target/generic/target_generic_file.h.diff?r1=1.11&r2=1.12&diff_format=u
> 
> and it still does not work. The problem seems to be that when
> target_generic_file.h is included, <fcntl.h> has not yet been
> included. So neither of O_SYNC or O_FSYNC is defined yet, and
> the result is the same (O_SYNC is chosen which is incorrect).
> 
> Not sure what the "right" fix is but the patch below does work.
> 
> Thanks,
> -Archie
> 
> __________________________________________________________________________
> Archie Cobbs     *    Halloo Communications    *     http://www.halloo.com
> 
> --- classpath-0.07/native/jni/java-io/FileDescriptor.c.orig	Wed Jul 30 05:11:34 2003
> +++ classpath-0.07/native/jni/java-io/FileDescriptor.c	Tue Jan 27 14:16:45 2004
> @@ -49,6 +49,7 @@
>  #include <config.h>
>  
>  #include <stdlib.h>
> +#include <fcntl.h>
>  
>  /* FIXME: Need to make configure set these for us */

The fix is correct but in the wrong file. I will commit the real fix
now. Thanx for reporting.


Michael



From MAILER-DAEMON Tue Jan 27 17:10:37 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlbMR-0004c1-Fe
	for mharc-classpath@gnu.org; Tue, 27 Jan 2004 17:07:07 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlbMK-0004Vh-2X
	for classpath@gnu.org; Tue, 27 Jan 2004 17:07:00 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlbLb-0003tb-OB
	for classpath@gnu.org; Tue, 27 Jan 2004 17:06:46 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlbLb-0003tX-9y
	for classpath@gnu.org; Tue, 27 Jan 2004 17:06:15 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-148.ewetel.net
	[80.228.80.148])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0RM6DUa023146
	for <classpath@gnu.org>; Tue, 27 Jan 2004 23:06:14 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AlbLY-0005I8-00
	for <classpath@gnu.org>; Tue, 27 Jan 2004 23:06:12 +0100
From: Michael Koch <konqueror@gmx.de>
To: classpath@gnu.org
Date: Tue, 27 Jan 2004 23:09:55 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200401272309.55705.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Update of autoconf/automake versions
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 22:07:04 -0000

Hello list,


I updated the versions needed to generate the configure and make files.
We now depend on autoconf 2.59 and automake 1.7.0+ (automake 1.8.0+ works 
too).


Michael




From MAILER-DAEMON Fri Jan 30 10:14:58 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AmaMC-0006Zv-Rx
	for mharc-classpath@gnu.org; Fri, 30 Jan 2004 10:14:56 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AmaLz-0006Ue-GJ
	for classpath@gnu.org; Fri, 30 Jan 2004 10:14:43 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AmaLQ-0006H7-1c
	for classpath@gnu.org; Fri, 30 Jan 2004 10:14:39 -0500
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AmaLO-0006Fw-ST
	for classpath@gnu.org; Fri, 30 Jan 2004 10:14:07 -0500
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----_=_NextPart_001_01C3E743.B2E0D19A"
Date: Fri, 30 Jan 2004 16:13:55 +0100
X-MIMEOLE: Produced By Microsoft Exchange V6.5.6944.0
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC04C82C@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: yes
X-MS-TNEF-Correlator: 
Thread-Topic: RFC: ObjectInputStream (and related classes) performance patch
Thread-Index: AcPnQ61PnsG/dTt9SLKi4BY/60JzmQ==
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: <classpath@gnu.org>
Subject: RFC: ObjectInputStream (and related classes) performance patch
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jan 2004 15:14:44 -0000

This is a multi-part message in MIME format.

------_=_NextPart_001_01C3E743.B2E0D19A
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Hi,

Attached is a proposed patch for ObjectInputStream, ObjectStreamClass
and ObjectStreamField. The main purpose is to improve performance, by
doing the reflection only once and caching the result. I also fixed some
other bugs and restructured a little.

Please review and comment.

Regards,
Jeroen

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

SW5kZXg6IGphdmEvaW8vT2JqZWN0SW5wdXRTdHJlYW0uamF2YQ0KPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZp
bGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvamF2YS9pby9PYmplY3RJbnB1dFN0cmVh
bS5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4zNg0KZGlmZiAtdSAtcjEuMzYgT2JqZWN0
SW5wdXRTdHJlYW0uamF2YQ0KLS0tIGphdmEvaW8vT2JqZWN0SW5wdXRTdHJlYW0uamF2YQk5IEph
biAyMDA0IDA4OjU5OjMwIC0wMDAwCTEuMzYNCisrKyBqYXZhL2lvL09iamVjdElucHV0U3RyZWFt
LmphdmEJMzAgSmFuIDIwMDQgMTU6MDE6MzMgLTAwMDANCkBAIC0yNDUsNyArMjQ1LDcgQEANCiAJ
ICAgICAgZHVtcEVsZW1lbnQoIlNUUklORz0iKTsNCiAJICAgICAgU3RyaW5nIHMgPSB0aGlzLnJl
YWxJbnB1dFN0cmVhbS5yZWFkVVRGKCk7DQogCSAgICAgIGR1bXBFbGVtZW50bG4ocyk7DQotCSAg
ICAgIHJldF92YWwgPSBwcm9jZXNzUmVzb2x1dGlvbihzLCBhc3NpZ25OZXdIYW5kbGUocykpOw0K
KwkgICAgICByZXRfdmFsID0gcHJvY2Vzc1Jlc29sdXRpb24obnVsbCwgcywgYXNzaWduTmV3SGFu
ZGxlKHMpKTsNCiAJICAgICAgYnJlYWs7DQogCSAgICB9DQogDQpAQCAtMjYyLDcgKzI2Miw3IEBA
DQogCSAgICAgIHJlYWRBcnJheUVsZW1lbnRzKGFycmF5LCBjb21wb25lbnRUeXBlKTsNCiAJICAg
ICAgZm9yIChpbnQgaSA9IDAsIGxlbiA9IEFycmF5LmdldExlbmd0aChhcnJheSk7IGkgPCBsZW47
IGkrKykNCiAJCWR1bXBFbGVtZW50bG4oIiAgRUxFTUVOVFsiICsgaSArICJdPSIgKyBBcnJheS5n
ZXQoYXJyYXksIGkpKTsNCi0JICAgICAgcmV0X3ZhbCA9IHByb2Nlc3NSZXNvbHV0aW9uKGFycmF5
LCBoYW5kbGUpOw0KKwkgICAgICByZXRfdmFsID0gcHJvY2Vzc1Jlc29sdXRpb24obnVsbCwgYXJy
YXksIGhhbmRsZSk7DQogCSAgICAgIGJyZWFrOw0KIAkgICAgfQ0KIA0KQEAgLTMxNSw3ICszMTUs
NyBAQA0KIAkJICBpZiAocmVhZF9mcm9tX2Jsb2NrcykNCiAJCSAgICBzZXRCbG9ja0RhdGFNb2Rl
KG9sZG1vZGUpOw0KIAkJICANCi0JCSAgcmV0X3ZhbCA9IHByb2Nlc3NSZXNvbHV0aW9uKG9iaiwg
aGFuZGxlKTsNCisJCSAgcmV0X3ZhbCA9IHByb2Nlc3NSZXNvbHV0aW9uKG9zYywgb2JqLCBoYW5k
bGUpOw0KIAkJICBicmVhazsNCiAJCX0gLy8gZW5kIGlmIChFeHRlcm5hbGl6YWJsZS5jbGFzcy5p
c0Fzc2lnbmFibGVGcm9tIChjbGF6eikpDQogCSAgICAgIA0KQEAgLTM0OSwxMSArMzQ5LDEyIEBA
DQogCQkgIC8vIHNob3VsZCBza2lwIG92ZXIgY2xhc3NlcyBpbiB0aGUgc3RyZWFtIHRoYXQgYXJl
bid0IGluIHRoZQ0KIAkJICAvLyByZWFsIGNsYXNzZXMgaGllcmFyY2h5DQogCQkgIA0KLQkJICBp
ZiAodGhpcy5jdXJyZW50T2JqZWN0U3RyZWFtQ2xhc3MuaGFzUmVhZE1ldGhvZCgpKQ0KKwkJICBN
ZXRob2QgcmVhZE9iamVjdE1ldGhvZCA9IHRoaXMuY3VycmVudE9iamVjdFN0cmVhbUNsYXNzLnJl
YWRPYmplY3RNZXRob2Q7DQorCQkgIGlmIChyZWFkT2JqZWN0TWV0aG9kICE9IG51bGwpDQogCQkg
ICAgew0KIAkJICAgICAgZmllbGRzQWxyZWFkeVJlYWQgPSBmYWxzZTsNCiAJCSAgICAgIGJvb2xl
YW4gb2xkbW9kZSA9IHNldEJsb2NrRGF0YU1vZGUodHJ1ZSk7DQotCQkgICAgICBjYWxsUmVhZE1l
dGhvZChvYmosIHRoaXMuY3VycmVudE9iamVjdFN0cmVhbUNsYXNzKTsNCisJCSAgICAgIGNhbGxS
ZWFkTWV0aG9kKHJlYWRPYmplY3RNZXRob2QsIHRoaXMuY3VycmVudE9iamVjdFN0cmVhbUNsYXNz
LmZvckNsYXNzKCksIG9iaik7DQogCQkgICAgICBzZXRCbG9ja0RhdGFNb2RlKG9sZG1vZGUpOw0K
IAkJICAgICAgZHVtcEVsZW1lbnQoIkVOREJMT0NLREFUQT8gIik7DQogCQkgICAgICB0cnkNCkBA
IC0zODIsNyArMzgzLDcgQEANCiANCiAJICAgICAgdGhpcy5jdXJyZW50T2JqZWN0ID0gbnVsbDsN
CiAJICAgICAgdGhpcy5jdXJyZW50T2JqZWN0U3RyZWFtQ2xhc3MgPSBudWxsOw0KLQkgICAgICBy
ZXRfdmFsID0gcHJvY2Vzc1Jlc29sdXRpb24ob2JqLCBoYW5kbGUpOw0KKwkgICAgICByZXRfdmFs
ID0gcHJvY2Vzc1Jlc29sdXRpb24ob3NjLCBvYmosIGhhbmRsZSk7DQogCSAgICAgIGJyZWFrOw0K
IAkgICAgfQ0KIA0KQEAgLTQ1Myw2ICs0NTQsOCBAQA0KICAgICBPYmplY3RTdHJlYW1DbGFzcyBv
c2MgPSBuZXcgT2JqZWN0U3RyZWFtQ2xhc3MobmFtZSwgdWlkLA0KIAkJCQkJCSAgZmxhZ3MsIGZp
ZWxkcyk7DQogICAgIGFzc2lnbk5ld0hhbmRsZShvc2MpOw0KKw0KKyAgICBDbGFzc0xvYWRlciBj
dXJyZW50TG9hZGVyID0gY3VycmVudExvYWRlcigpOw0KIAkgICAgICANCiAgICAgZm9yIChpbnQg
aSA9IDA7IGkgPCBmaWVsZF9jb3VudDsgaSsrKQ0KICAgICAgIHsNCkBAIC00NzMsMjggKzQ3Niwy
OSBAQA0KIAkgIGNsYXNzX25hbWUgPSBTdHJpbmcudmFsdWVPZih0eXBlX2NvZGUpOw0KIAkJICAN
CiAJZmllbGRzW2ldID0NCi0JICBuZXcgT2JqZWN0U3RyZWFtRmllbGQoZmllbGRfbmFtZSwgY2xh
c3NfbmFtZSwgY3VycmVudExvYWRlcigpKTsNCisJICBuZXcgT2JqZWN0U3RyZWFtRmllbGQoZmll
bGRfbmFtZSwgY2xhc3NfbmFtZSwgY3VycmVudExvYWRlcik7DQogICAgICAgfQ0KIAkgICAgICAN
CiAgICAgLyogTm93IHRoYXQgZmllbGRzIGhhdmUgYmVlbiByZWFkIHdlIG1heSByZXNvbHZlIHRo
ZSBjbGFzcw0KICAgICAgKiAoYW5kIHJlYWQgYW5ub3RhdGlvbiBpZiBuZWVkZWQpLiAqLw0KICAg
ICBDbGFzcyBjbGF6eiA9IHJlc29sdmVDbGFzcyhvc2MpOw0KICAgICANCisgICAgSGFzaHRhYmxl
IGZpZWxkTG9va3VwID0gbmV3IEhhc2h0YWJsZSgpOw0KKyAgICBPYmplY3RTdHJlYW1GaWVsZFtd
IHJlYWxfZmllbGRzID0gT2JqZWN0U3RyZWFtQ2xhc3MubG9va3VwKGNsYXp6KS5maWVsZHM7DQor
ICAgIGZvciAoaW50IGkgPSAwOyBpIDwgcmVhbF9maWVsZHMubGVuZ3RoOyBpKyspDQorICAgICAg
ew0KKwlmaWVsZExvb2t1cC5wdXQocmVhbF9maWVsZHNbaV0uZ2V0TmFtZSgpLCByZWFsX2ZpZWxk
c1tpXSk7DQorICAgICAgfQ0KICAgICBmb3IgKGludCBpID0gMDsgaSA8IGZpZWxkX2NvdW50OyBp
KyspDQogICAgICAgew0KLQlGaWVsZCBmOw0KLQkNCi0JdHJ5DQorCU9iamVjdFN0cmVhbUZpZWxk
IGYgPSANCisJICAgIChPYmplY3RTdHJlYW1GaWVsZClmaWVsZExvb2t1cC5nZXQoZmllbGRzW2ld
LmdldE5hbWUoKSk7DQorCWlmIChmLmdldFR5cGUoKSAhPSBmaWVsZHNbaV0uZ2V0VHlwZSgpKQ0K
IAkgIHsNCi0JICAgIGYgPSBjbGF6ei5nZXREZWNsYXJlZEZpZWxkKGZpZWxkc1tpXS5nZXROYW1l
KCkpOw0KLQkgICAgaWYgKGYgIT0gbnVsbCAmJiAhZi5nZXRUeXBlKCkuZXF1YWxzKGZpZWxkc1tp
XS5nZXRUeXBlKCkpKQ0KLQkgICAgICB0aHJvdyBuZXcgSW52YWxpZENsYXNzRXhjZXB0aW9uDQor
CSAgICB0aHJvdyBuZXcgSW52YWxpZENsYXNzRXhjZXB0aW9uDQogCQkoImludmFsaWQgZmllbGQg
dHlwZSBmb3IgIiArIGZpZWxkc1tpXS5nZXROYW1lKCkgKyAiIGluIGNsYXNzICINCi0JCSArIG5h
bWUgKyAiIChyZXF1ZXN0ZWQgd2FzIFwiIiArIGZpZWxkc1tpXS5nZXRUeXBlKCkNCi0JCSArICIg
YW5kIGZvdW5kIFwiIiArIGYuZ2V0VHlwZSgpICsgIlwiKSIpOyANCi0JICB9DQotCWNhdGNoIChO
b1N1Y2hGaWVsZEV4Y2VwdGlvbiBfKQ0KLQkgIHsNCisJCSsgbmFtZSk7IA0KIAkgIH0NCiAgICAg
ICB9DQogDQpAQCAtMTA0NSw3ICsxMDQ5LDcgQEANCiAgICAqIGRlc2VyaWFsaXppbmcgY2xhc3Mg
KGlmIHByZXNlbnQpLiBJdCBjYW5ub3QgKGFuZCBzaG91bGQgbm90KWJlIGNhbGxlZA0KICAgICog
b3V0c2lkZSBvZiBpdC4gSXRzIGdvYWwgaXMgdG8gcmVhZCBhbGwgZmllbGRzIGluIHRoZSByZWFs
IGlucHV0IHN0cmVhbQ0KICAgICogYW5kIGtlZXAgdGhlbSBhY2Nlc3NpYmxlIHRocm91Z2ggdGhl
IHtAbGluayAjR2V0RmllbGR9IGNsYXNzLiBDYWxsaW5nDQotICAgKiB0aGlzIG1ldGhvZCB3aWxs
IG5vdCBhbHRlcmF0ZSB0aGUgZGVzZXJpYWxpemluZyBvYmplY3QuDQorICAgKiB0aGlzIG1ldGhv
ZCB3aWxsIG5vdCBhbHRlciB0aGUgZGVzZXJpYWxpemluZyBvYmplY3QuDQogICAgKg0KICAgICog
QHJldHVybiBBIHZhbGlkIGZyZXNobHkgY3JlYXRlZCAnR2V0RmllbGQnIGluc3RhbmNlIHRvIGdl
dCBhY2Nlc3MgdG8NCiAgICAqIHRoZSBkZXNlcmlhbGl6ZWQgc3RyZWFtLg0KQEAgLTEzNzUsMjAg
KzEzNzksMTggQEANCiAgICAgcmV0dXJuIHRoaXMubmV4dE9JRCsrOw0KICAgfQ0KIA0KLSAgcHJp
dmF0ZSBPYmplY3QgcHJvY2Vzc1Jlc29sdXRpb24oT2JqZWN0IG9iaiwgaW50IGhhbmRsZSkNCisg
IHByaXZhdGUgT2JqZWN0IHByb2Nlc3NSZXNvbHV0aW9uKE9iamVjdFN0cmVhbUNsYXNzIG9zYywg
T2JqZWN0IG9iaiwgaW50IGhhbmRsZSkNCiAgICAgdGhyb3dzIElPRXhjZXB0aW9uDQogICB7DQot
ICAgIGlmIChvYmogaW5zdGFuY2VvZiBTZXJpYWxpemFibGUpDQorICAgIGlmIChvc2MgIT0gbnVs
bCAmJiBvYmogaW5zdGFuY2VvZiBTZXJpYWxpemFibGUpDQogICAgICAgew0KLSAgICAgICAgTWV0
aG9kIG0gPSBudWxsOyANCiAJdHJ5DQogCSAgew0KLQkgICAgQ2xhc3MgY2xhc3NBcmdzW10gPSB7
fTsNCi0JICAgIG0gPSBnZXRNZXRob2Qob2JqLmdldENsYXNzKCksICJyZWFkUmVzb2x2ZSIsIGNs
YXNzQXJncyk7DQotCSAgICBvYmogPSBtLmludm9rZShvYmosIG5ldyBPYmplY3RbXSB7fSk7CQ0K
LQkgIH0NCi0JY2F0Y2ggKE5vU3VjaE1ldGhvZEV4Y2VwdGlvbiBpZ25vcmUpDQotCSAgew0KKwkg
ICAgTWV0aG9kIG0gPSBvc2MucmVhZFJlc29sdmVNZXRob2Q7IA0KKwkgICAgaWYobSAhPSBudWxs
KQ0KKwkgICAgew0KKwkJb2JqID0gbS5pbnZva2Uob2JqLCBuZXcgT2JqZWN0W10ge30pOw0KKwkg
ICAgfQ0KIAkgIH0NCiAJY2F0Y2ggKElsbGVnYWxBY2Nlc3NFeGNlcHRpb24gaWdub3JlKQ0KIAkg
IHsNCkBAIC0xNTE5LDE1NiArMTUyMSwxNjMgQEANCiAgIHsNCiAgICAgT2JqZWN0U3RyZWFtRmll
bGRbXSBzdHJlYW1fZmllbGRzID0gc3RyZWFtX29zYy5maWVsZHM7DQogICAgIE9iamVjdFN0cmVh
bUZpZWxkW10gcmVhbF9maWVsZHMgPQ0KLSAgICAgIGxvb2t1cENsYXNzKHN0cmVhbV9vc2MuZm9y
Q2xhc3MoKSkuZmllbGRzOw0KKyAgICAgIE9iamVjdFN0cmVhbUNsYXNzLmxvb2t1cChzdHJlYW1f
b3NjLmZvckNsYXNzKCkpLmZpZWxkczsNCiANCi0gICAgYm9vbGVhbiBkZWZhdWx0X2luaXRpYWxp
emUsIHNldF92YWx1ZTsNCi0gICAgU3RyaW5nIGZpZWxkX25hbWUgPSBudWxsOw0KLSAgICBDbGFz
cyB0eXBlID0gbnVsbDsNCi0gICAgT2JqZWN0U3RyZWFtRmllbGQgc3RyZWFtX2ZpZWxkID0gbnVs
bDsNCi0gICAgT2JqZWN0U3RyZWFtRmllbGQgcmVhbF9maWVsZCA9IG51bGw7DQogICAgIGludCBz
dHJlYW1faWR4ID0gMDsNCiAgICAgaW50IHJlYWxfaWR4ID0gMDsNCiANCiAgICAgd2hpbGUgKHN0
cmVhbV9pZHggPCBzdHJlYW1fZmllbGRzLmxlbmd0aA0KLQkgICAmJiByZWFsX2lkeCA8IHJlYWxf
ZmllbGRzLmxlbmd0aCkNCisJICAgfHwgcmVhbF9pZHggPCByZWFsX2ZpZWxkcy5sZW5ndGgpDQog
ICAgICAgew0KLQlkZWZhdWx0X2luaXRpYWxpemUgPSBmYWxzZTsNCi0Jc2V0X3ZhbHVlID0gdHJ1
ZTsNCisJYm9vbGVhbiByZWFkX3ZhbHVlOw0KKwlib29sZWFuIHNldF92YWx1ZTsNCisJU3RyaW5n
IGZpZWxkX25hbWU7DQorCWNoYXIgdHlwZTsNCisJT2JqZWN0U3RyZWFtRmllbGQgcmVhbF9maWVs
ZDsNCiANCiAJaWYgKHN0cmVhbV9pZHggPT0gc3RyZWFtX2ZpZWxkcy5sZW5ndGgpDQotCSAgZGVm
YXVsdF9pbml0aWFsaXplID0gdHJ1ZTsNCi0JZWxzZQ0KIAkgIHsNCi0JICAgIHN0cmVhbV9maWVs
ZCA9IHN0cmVhbV9maWVsZHNbc3RyZWFtX2lkeF07DQotCSAgICB0eXBlID0gc3RyZWFtX2ZpZWxk
LmdldFR5cGUoKTsNCisJICAgIHJlYWxfZmllbGQgPSByZWFsX2ZpZWxkc1tyZWFsX2lkeCsrXTsN
CisJICAgIHR5cGUgPSByZWFsX2ZpZWxkLmdldFR5cGVDb2RlKCk7DQorCSAgICBmaWVsZF9uYW1l
ID0gcmVhbF9maWVsZC5nZXROYW1lKCk7DQorCSAgICByZWFkX3ZhbHVlID0gZmFsc2U7DQorCSAg
ICBzZXRfdmFsdWUgPSByZWFsX2ZpZWxkLmlzVG9TZXQoKTsNCiAJICB9DQotDQotCWlmIChyZWFs
X2lkeCA9PSByZWFsX2ZpZWxkcy5sZW5ndGgpDQotCSAgc2V0X3ZhbHVlID0gZmFsc2U7DQotCWVs
c2UNCisJZWxzZSBpZiAocmVhbF9pZHggPT0gcmVhbF9maWVsZHMubGVuZ3RoKQ0KIAkgIHsNCi0J
ICAgIHJlYWxfZmllbGQgPSByZWFsX2ZpZWxkc1tyZWFsX2lkeF07DQotCSAgICB0eXBlID0gcmVh
bF9maWVsZC5nZXRUeXBlKCk7DQotCSAgICBmaWVsZF9uYW1lID0gcmVhbF9maWVsZC5nZXROYW1l
KCk7DQorCSAgICBPYmplY3RTdHJlYW1GaWVsZCBzdHJlYW1fZmllbGQgPSBzdHJlYW1fZmllbGRz
W3N0cmVhbV9pZHgrK107DQorCSAgICB0eXBlID0gc3RyZWFtX2ZpZWxkLmdldFR5cGVDb2RlKCk7
DQorCSAgICByZWFsX2ZpZWxkID0gbnVsbDsNCisJICAgIGZpZWxkX25hbWUgPSBzdHJlYW1fZmll
bGQuZ2V0TmFtZSgpOw0KKwkgICAgcmVhZF92YWx1ZSA9IHN0cmVhbV9maWVsZC5nZXRPZmZzZXQo
KSA+PSAwOw0KKwkgICAgc2V0X3ZhbHVlID0gZmFsc2U7DQogCSAgfQ0KLQ0KLQlpZiAoc2V0X3Zh
bHVlICYmICFkZWZhdWx0X2luaXRpYWxpemUpDQorCWVsc2UNCiAJICB7DQogCSAgICBpbnQgY29t
cF92YWwgPQ0KLQkgICAgICByZWFsX2ZpZWxkLmNvbXBhcmVUbyAoc3RyZWFtX2ZpZWxkKTsNCisJ
CXJlYWxfZmllbGRzW3JlYWxfaWR4XS5jb21wYXJlVG8gKHN0cmVhbV9maWVsZHNbc3RyZWFtX2lk
eF0pOw0KIA0KIAkgICAgaWYgKGNvbXBfdmFsIDwgMCkNCiAJICAgICAgew0KLQkJZGVmYXVsdF9p
bml0aWFsaXplID0gdHJ1ZTsNCi0JCXJlYWxfaWR4Kys7DQorCQlyZWFsX2ZpZWxkID0gcmVhbF9m
aWVsZHNbcmVhbF9pZHgrK107DQorCQl0eXBlID0gcmVhbF9maWVsZC5nZXRUeXBlQ29kZSgpOw0K
KwkJZmllbGRfbmFtZSA9IHJlYWxfZmllbGQuZ2V0TmFtZSgpOw0KKwkJcmVhZF92YWx1ZSA9IGZh
bHNlOw0KKwkJc2V0X3ZhbHVlID0gcmVhbF9maWVsZC5pc1RvU2V0KCk7DQogCSAgICAgIH0NCiAJ
ICAgIGVsc2UgaWYgKGNvbXBfdmFsID4gMCkNCiAJICAgICAgew0KKwkJT2JqZWN0U3RyZWFtRmll
bGQgc3RyZWFtX2ZpZWxkID0gc3RyZWFtX2ZpZWxkc1tzdHJlYW1faWR4KytdOw0KKwkJcmVhbF9m
aWVsZCA9IG51bGw7DQorCQl0eXBlID0gc3RyZWFtX2ZpZWxkLmdldFR5cGVDb2RlKCk7DQorCQlm
aWVsZF9uYW1lID0gc3RyZWFtX2ZpZWxkLmdldE5hbWUoKTsNCisJCXJlYWRfdmFsdWUgPSBzdHJl
YW1fZmllbGQuZ2V0T2Zmc2V0KCkgPj0gMDsNCiAJCXNldF92YWx1ZSA9IGZhbHNlOw0KLQkJc3Ry
ZWFtX2lkeCsrOw0KIAkgICAgICB9DQogCSAgICBlbHNlDQogCSAgICAgIHsNCi0JCXJlYWxfaWR4
Kys7DQotCQlzdHJlYW1faWR4Kys7DQorCQlPYmplY3RTdHJlYW1GaWVsZCBzdHJlYW1fZmllbGQg
PSBzdHJlYW1fZmllbGRzW3N0cmVhbV9pZHgrK107DQorCQlyZWFsX2ZpZWxkID0gcmVhbF9maWVs
ZHNbcmVhbF9pZHgrK107DQorCQl0eXBlID0gcmVhbF9maWVsZC5nZXRUeXBlQ29kZSgpOw0KKwkJ
ZmllbGRfbmFtZSA9IHJlYWxfZmllbGQuZ2V0TmFtZSgpOw0KKwkJcmVhZF92YWx1ZSA9IHN0cmVh
bV9maWVsZC5nZXRPZmZzZXQoKSA+PSAwOw0KKwkJc2V0X3ZhbHVlID0gc3RyZWFtX2ZpZWxkLmlz
VG9TZXQoKSAmJiByZWFsX2ZpZWxkLmlzVG9TZXQoKTsNCiAJICAgICAgfQ0KIAkgIH0NCiANCi0J
aWYgKHN0cmVhbV9maWVsZC5nZXRPZmZzZXQoKSA8IDApDQorCXN3aXRjaCh0eXBlKQ0KIAkgIHsN
Ci0JICAgIGRlZmF1bHRfaW5pdGlhbGl6ZSA9IHRydWU7DQotCSAgICBzZXRfdmFsdWUgPSBmYWxz
ZTsNCi0JICB9DQotCQ0KLQlpZiAoIXN0cmVhbV9maWVsZC5pc1RvU2V0KCkpIA0KLQkgIHNldF92
YWx1ZSA9IGZhbHNlOw0KLQ0KLQl0cnkNCi0JICB7DQotCSAgICBpZiAodHlwZSA9PSBCb29sZWFu
LlRZUEUpDQorCSAgICBjYXNlICdaJzoNCiAJICAgICAgew0KIAkJYm9vbGVhbiB2YWx1ZSA9DQot
CQkgIGRlZmF1bHRfaW5pdGlhbGl6ZSA/IGZhbHNlIDogdGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVh
ZEJvb2xlYW4oKTsNCi0JCWlmICghZGVmYXVsdF9pbml0aWFsaXplICYmIHNldF92YWx1ZSkNCisJ
CSAgcmVhZF92YWx1ZSA/IHRoaXMucmVhbElucHV0U3RyZWFtLnJlYWRCb29sZWFuKCkgOiBmYWxz
ZTsNCisJCWlmIChyZWFkX3ZhbHVlICYmIHNldF92YWx1ZSkNCiAJCSAgZHVtcEVsZW1lbnRsbigi
ICAiICsgZmllbGRfbmFtZSArICI6ICIgKyB2YWx1ZSk7DQogCQlpZiAoc2V0X3ZhbHVlKQ0KLQkJ
ICBzZXRCb29sZWFuRmllbGQob2JqLCBzdHJlYW1fb3NjLmZvckNsYXNzKCksIGZpZWxkX25hbWUs
IHZhbHVlKTsNCisJCSAgcmVhbF9maWVsZC5zZXRCb29sZWFuRmllbGQob2JqLCB2YWx1ZSk7DQor
CQlicmVhazsNCiAJICAgICAgfQ0KLQkgICAgZWxzZSBpZiAodHlwZSA9PSBCeXRlLlRZUEUpDQor
CSAgICBjYXNlICdCJzoNCiAJICAgICAgew0KIAkJYnl0ZSB2YWx1ZSA9DQotCQkgIGRlZmF1bHRf
aW5pdGlhbGl6ZSA/IDAgOiB0aGlzLnJlYWxJbnB1dFN0cmVhbS5yZWFkQnl0ZSgpOw0KLQkJaWYg
KCFkZWZhdWx0X2luaXRpYWxpemUgJiYgc2V0X3ZhbHVlKQ0KKwkJICByZWFkX3ZhbHVlID8gdGhp
cy5yZWFsSW5wdXRTdHJlYW0ucmVhZEJ5dGUoKSA6IDA7DQorCQlpZiAocmVhZF92YWx1ZSAmJiBz
ZXRfdmFsdWUpDQogCQkgIGR1bXBFbGVtZW50bG4oIiAgIiArIGZpZWxkX25hbWUgKyAiOiAiICsg
dmFsdWUpOw0KIAkJaWYgKHNldF92YWx1ZSkNCi0JCSAgc2V0Qnl0ZUZpZWxkKG9iaiwgc3RyZWFt
X29zYy5mb3JDbGFzcygpLCBmaWVsZF9uYW1lLCB2YWx1ZSk7DQorCQkgIHJlYWxfZmllbGQuc2V0
Qnl0ZUZpZWxkKG9iaiwgdmFsdWUpOw0KKwkJYnJlYWs7DQogCSAgICAgIH0NCi0JICAgIGVsc2Ug
aWYgKHR5cGUgPT0gQ2hhcmFjdGVyLlRZUEUpDQorCSAgICBjYXNlICdDJzoNCiAJICAgICAgew0K
IAkJY2hhciB2YWx1ZSA9DQotCQkgIGRlZmF1bHRfaW5pdGlhbGl6ZSA/IChjaGFyKTAgOiB0aGlz
LnJlYWxJbnB1dFN0cmVhbS5yZWFkQ2hhcigpOw0KLQkJaWYgKCFkZWZhdWx0X2luaXRpYWxpemUg
JiYgc2V0X3ZhbHVlKQ0KKwkJICByZWFkX3ZhbHVlID8gdGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVh
ZENoYXIoKTogMDsNCisJCWlmIChyZWFkX3ZhbHVlICYmIHNldF92YWx1ZSkNCiAJCSAgZHVtcEVs
ZW1lbnRsbigiICAiICsgZmllbGRfbmFtZSArICI6ICIgKyB2YWx1ZSk7DQogCQlpZiAoc2V0X3Zh
bHVlKQ0KLQkJICBzZXRDaGFyRmllbGQob2JqLCBzdHJlYW1fb3NjLmZvckNsYXNzKCksIGZpZWxk
X25hbWUsIHZhbHVlKTsNCisJCSAgcmVhbF9maWVsZC5zZXRDaGFyRmllbGQob2JqLCB2YWx1ZSk7
DQorCQlicmVhazsNCiAJICAgICAgfQ0KLQkgICAgZWxzZSBpZiAodHlwZSA9PSBEb3VibGUuVFlQ
RSkNCisJICAgIGNhc2UgJ0QnOg0KIAkgICAgICB7DQogCQlkb3VibGUgdmFsdWUgPQ0KLQkJICBk
ZWZhdWx0X2luaXRpYWxpemUgPyAwIDogdGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVhZERvdWJsZSgp
Ow0KLQkJaWYgKCFkZWZhdWx0X2luaXRpYWxpemUgJiYgc2V0X3ZhbHVlKQ0KKwkJICByZWFkX3Zh
bHVlID8gdGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVhZERvdWJsZSgpIDogMDsNCisJCWlmIChyZWFk
X3ZhbHVlICYmIHNldF92YWx1ZSkNCiAJCSAgZHVtcEVsZW1lbnRsbigiICAiICsgZmllbGRfbmFt
ZSArICI6ICIgKyB2YWx1ZSk7DQogCQlpZiAoc2V0X3ZhbHVlKQ0KLQkJICBzZXREb3VibGVGaWVs
ZChvYmosIHN0cmVhbV9vc2MuZm9yQ2xhc3MoKSwgZmllbGRfbmFtZSwgdmFsdWUpOw0KKwkJICBy
ZWFsX2ZpZWxkLnNldERvdWJsZUZpZWxkKG9iaiwgdmFsdWUpOw0KKwkJYnJlYWs7DQogCSAgICAg
IH0NCi0JICAgIGVsc2UgaWYgKHR5cGUgPT0gRmxvYXQuVFlQRSkNCisJICAgIGNhc2UgJ0YnOg0K
IAkgICAgICB7DQogCQlmbG9hdCB2YWx1ZSA9DQotCQkgIGRlZmF1bHRfaW5pdGlhbGl6ZSA/IDAg
OiB0aGlzLnJlYWxJbnB1dFN0cmVhbS5yZWFkRmxvYXQoKTsNCi0JCWlmICghZGVmYXVsdF9pbml0
aWFsaXplICYmIHNldF92YWx1ZSkNCisJCSAgcmVhZF92YWx1ZSA/IHRoaXMucmVhbElucHV0U3Ry
ZWFtLnJlYWRGbG9hdCgpIDogMDsNCisJCWlmIChyZWFkX3ZhbHVlICYmIHNldF92YWx1ZSkNCiAJ
CSAgZHVtcEVsZW1lbnRsbigiICAiICsgZmllbGRfbmFtZSArICI6ICIgKyB2YWx1ZSk7DQogCQlp
ZiAoc2V0X3ZhbHVlKQ0KLQkJICBzZXRGbG9hdEZpZWxkKG9iaiwgc3RyZWFtX29zYy5mb3JDbGFz
cygpLCBmaWVsZF9uYW1lLCB2YWx1ZSk7DQorCQkgIHJlYWxfZmllbGQuc2V0RmxvYXRGaWVsZChv
YmosIHZhbHVlKTsNCisJCWJyZWFrOw0KIAkgICAgICB9DQotCSAgICBlbHNlIGlmICh0eXBlID09
IEludGVnZXIuVFlQRSkNCisJICAgIGNhc2UgJ0knOg0KIAkgICAgICB7DQogCQlpbnQgdmFsdWUg
PQ0KLQkJICBkZWZhdWx0X2luaXRpYWxpemUgPyAwIDogdGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVh
ZEludCgpOw0KLQkJaWYgKCFkZWZhdWx0X2luaXRpYWxpemUgJiYgc2V0X3ZhbHVlKQ0KKwkJICBy
ZWFkX3ZhbHVlID8gdGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVhZEludCgpIDogMDsNCisJCWlmIChy
ZWFkX3ZhbHVlICYmIHNldF92YWx1ZSkNCiAJCSAgZHVtcEVsZW1lbnRsbigiICAiICsgZmllbGRf
bmFtZSArICI6ICIgKyB2YWx1ZSk7DQogCQlpZiAoc2V0X3ZhbHVlKQ0KLQkJICBzZXRJbnRGaWVs
ZChvYmosIHN0cmVhbV9vc2MuZm9yQ2xhc3MoKSwgZmllbGRfbmFtZSwgdmFsdWUpOw0KKwkJICBy
ZWFsX2ZpZWxkLnNldEludEZpZWxkKG9iaiwgdmFsdWUpOw0KKwkJYnJlYWs7DQogCSAgICAgIH0N
Ci0JICAgIGVsc2UgaWYgKHR5cGUgPT0gTG9uZy5UWVBFKQ0KKwkgICAgY2FzZSAnSic6DQogCSAg
ICAgIHsNCiAJCWxvbmcgdmFsdWUgPQ0KLQkJICBkZWZhdWx0X2luaXRpYWxpemUgPyAwIDogdGhp
cy5yZWFsSW5wdXRTdHJlYW0ucmVhZExvbmcoKTsNCi0JCWlmICghZGVmYXVsdF9pbml0aWFsaXpl
ICYmIHNldF92YWx1ZSkNCisJCSAgcmVhZF92YWx1ZSA/IHRoaXMucmVhbElucHV0U3RyZWFtLnJl
YWRMb25nKCkgOiAwOw0KKwkJaWYgKHJlYWRfdmFsdWUgJiYgc2V0X3ZhbHVlKQ0KIAkJICBkdW1w
RWxlbWVudGxuKCIgICIgKyBmaWVsZF9uYW1lICsgIjogIiArIHZhbHVlKTsNCiAJCWlmIChzZXRf
dmFsdWUpDQotCQkgIHNldExvbmdGaWVsZChvYmosIHN0cmVhbV9vc2MuZm9yQ2xhc3MoKSwgZmll
bGRfbmFtZSwgdmFsdWUpOw0KKwkJICByZWFsX2ZpZWxkLnNldExvbmdGaWVsZChvYmosIHZhbHVl
KTsNCisJCWJyZWFrOw0KIAkgICAgICB9DQotCSAgICBlbHNlIGlmICh0eXBlID09IFNob3J0LlRZ
UEUpDQorCSAgICBjYXNlICdTJzoNCiAJICAgICAgew0KIAkJc2hvcnQgdmFsdWUgPQ0KLQkJICBk
ZWZhdWx0X2luaXRpYWxpemUgPyAoc2hvcnQpMCA6IHRoaXMucmVhbElucHV0U3RyZWFtLnJlYWRT
aG9ydCgpOw0KLQkJaWYgKCFkZWZhdWx0X2luaXRpYWxpemUgJiYgc2V0X3ZhbHVlKQ0KKwkJICBy
ZWFkX3ZhbHVlID8gdGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVhZFNob3J0KCkgOiAwOw0KKwkJaWYg
KHJlYWRfdmFsdWUgJiYgc2V0X3ZhbHVlKQ0KIAkJICBkdW1wRWxlbWVudGxuKCIgICIgKyBmaWVs
ZF9uYW1lICsgIjogIiArIHZhbHVlKTsNCiAJCWlmIChzZXRfdmFsdWUpDQotCQkgIHNldFNob3J0
RmllbGQob2JqLCBzdHJlYW1fb3NjLmZvckNsYXNzKCksIGZpZWxkX25hbWUsIHZhbHVlKTsNCisJ
CSAgcmVhbF9maWVsZC5zZXRTaG9ydEZpZWxkKG9iaiwgdmFsdWUpOw0KKwkJYnJlYWs7DQogCSAg
ICAgIH0NCi0JICAgIGVsc2UNCisJICAgIGNhc2UgJ0wnOg0KKwkgICAgY2FzZSAnWyc6DQogCSAg
ICAgIHsNCiAJCU9iamVjdCB2YWx1ZSA9DQotCQkgIGRlZmF1bHRfaW5pdGlhbGl6ZSA/IG51bGwg
OiByZWFkT2JqZWN0KCk7DQorCQkgIHJlYWRfdmFsdWUgPyByZWFkT2JqZWN0KCkgOiBudWxsOw0K
IAkJaWYgKHNldF92YWx1ZSkNCi0JCSAgc2V0T2JqZWN0RmllbGQob2JqLCBzdHJlYW1fb3NjLmZv
ckNsYXNzKCksIGZpZWxkX25hbWUsDQotCQkJCSAgcmVhbF9maWVsZC5nZXRUeXBlU3RyaW5nKCks
IHZhbHVlKTsNCisJCSAgcmVhbF9maWVsZC5zZXRPYmplY3RGaWVsZChvYmosIHZhbHVlKTsNCisJ
CWJyZWFrOw0KIAkgICAgICB9DQotCSAgfQ0KLQljYXRjaCAoTm9TdWNoRmllbGRFcnJvciBlKQ0K
LQkgIHsNCi0JICAgIGR1bXBFbGVtZW50bG4oIlhYWFggIiArIGZpZWxkX25hbWUgKyAiIGRvZXMg
bm90IGV4aXN0LiIpOw0KKwkgICAgZGVmYXVsdDoNCisJCXRocm93IG5ldyBJbnRlcm5hbEVycm9y
KCJJbnZhbGlkIHR5cGUgY29kZTogIiArIHR5cGUpOw0KIAkgIH0NCiAgICAgICB9DQogICB9DQpA
QCAtMTczMCw3MSArMTczOSwxMSBAQA0KICAgICovDQogICBwcml2YXRlIHN0YXRpYyBuYXRpdmUg
Q2xhc3NMb2FkZXIgY3VycmVudENsYXNzTG9hZGVyIChTZWN1cml0eU1hbmFnZXIgc20pOw0KIA0K
LSAgLyoqDQotICAgKiBUaGlzIG1ldGhvZCB0cmllcyB0byBhY2Nlc3MgYSBwcmVjaXNlIGZpZWxk
IGNhbGxlZCBpbiB0aGUNCi0gICAqIHNwZWNpZmllZCBjbGFzcy4gQmVmb3JlIGFjY2Vzc2luZyB0
aGUgZmllbGQsIGl0IHRyaWVzIHRvDQotICAgKiBnYWluIGNvbnRyb2wgb24gdGhpcyBmaWVsZC4g
SWYgdGhlIGZpZWxkIGlzIGVpdGhlciBkZWNsYXJlZCBhcyANCi0gICAqIG5vdCBwZXJzaXN0ZW50
IG9yIHRyYW5zaWVudCB0aGVuIGl0IHJldHVybnMgbnVsbA0KLSAgICogaW1tZWRpYXRlbHkuDQot
ICAgKg0KLSAgICogQHBhcmFtIGtsYXNzIENsYXNzIHRvIGdldCB0aGUgZmllbGQgZnJvbS4NCi0g
ICAqIEBwYXJhbSBuYW1lIE5hbWUgb2YgdGhlIGZpZWxkIHRvIGFjY2Vzcy4NCi0gICAqIEByZXR1
cm4gRmllbGQgaW5zdGFuY2UgcmVwcmVzZW50aW5nIHRoZSByZXF1ZXN0ZWQgZmllbGQuDQotICAg
KiBAdGhyb3dzIE5vU3VjaEZpZWxkRXhjZXB0aW9uIGlmIHRoZSBmaWVsZCBkb2VzIG5vdCBleGlz
dC4NCi0gICAqLw0KLSAgcHJpdmF0ZSBGaWVsZCBnZXRGaWVsZChDbGFzcyBrbGFzcywgU3RyaW5n
IG5hbWUpDQotICAgIHRocm93cyBqYXZhLmxhbmcuTm9TdWNoRmllbGRFeGNlcHRpb24NCi0gIHsN
Ci0gICAgZmluYWwgRmllbGQgZiA9IGtsYXNzLmdldERlY2xhcmVkRmllbGQobmFtZSk7DQotICAg
IE9iamVjdFN0cmVhbUZpZWxkIHNmID0gbG9va3VwQ2xhc3Moa2xhc3MpLmdldEZpZWxkKG5hbWUp
Ow0KLSAgICANCi0gICAgQWNjZXNzQ29udHJvbGxlci5kb1ByaXZpbGVnZWQobmV3IFByaXZpbGVn
ZWRBY3Rpb24oKQ0KLSAgICAgIHsNCi0JcHVibGljIE9iamVjdCBydW4oKQ0KLQl7DQotCSAgZi5z
ZXRBY2Nlc3NpYmxlKHRydWUpOw0KLQkgIHJldHVybiBudWxsOw0KLQl9DQotICAgICAgfSk7DQot
DQotICAgIC8qIFdlIGRvIG5vdCB3YW50IHRvIG1vZGlmeSB0cmFuc2llbnQgZmllbGRzLiBUaGV5
IHNob3VsZA0KLSAgICAgKiBiZSBsZWZ0IHRvIDAuDQotICAgICAqIE4uQi46IE5vdCB2YWxpZCBp
ZiB0aGUgZmllbGQgaXMgaW4gc2VyaWFsUGVyc2lzdGVudEZpZWxkcy4gDQotICAgICAqLw0KLSAg
ICBpZiAoTW9kaWZpZXIuaXNUcmFuc2llbnQoZi5nZXRNb2RpZmllcnMoKSkgJiYgIXNmLmlzUGVy
c2lzdGVudCgpKQ0KLSAgICAgIHJldHVybiBudWxsOw0KLSAgIA0KLSAgICByZXR1cm4gZjsNCi0g
IH0NCi0NCi0gIHByaXZhdGUgc3RhdGljIE1ldGhvZCBnZXRNZXRob2QgKENsYXNzIGtsYXNzLCBT
dHJpbmcgbmFtZSwgQ2xhc3MgYXJnc1tdKQ0KLSAgICB0aHJvd3MgamF2YS5sYW5nLk5vU3VjaE1l
dGhvZEV4Y2VwdGlvbg0KLSAgew0KLSAgICBmaW5hbCBNZXRob2QgbSA9IGtsYXNzLmdldERlY2xh
cmVkTWV0aG9kKG5hbWUsIGFyZ3MpOw0KLSAgICBBY2Nlc3NDb250cm9sbGVyLmRvUHJpdmlsZWdl
ZChuZXcgUHJpdmlsZWdlZEFjdGlvbigpDQotICAgICAgew0KLQlwdWJsaWMgT2JqZWN0IHJ1bigp
DQotCXsNCi0JICBtLnNldEFjY2Vzc2libGUodHJ1ZSk7DQotCSAgcmV0dXJuIG51bGw7DQotCX0N
Ci0gICAgICB9KTsNCi0gICAgcmV0dXJuIG07DQotICB9DQotDQotICBwcml2YXRlIHZvaWQgY2Fs
bFJlYWRNZXRob2QgKE9iamVjdCBvYmosIE9iamVjdFN0cmVhbUNsYXNzIG9zYykgdGhyb3dzIElP
RXhjZXB0aW9uDQorICBwcml2YXRlIHZvaWQgY2FsbFJlYWRNZXRob2QgKE1ldGhvZCByZWFkT2Jq
ZWN0LCBDbGFzcyBrbGFzcywgT2JqZWN0IG9iaikgdGhyb3dzIElPRXhjZXB0aW9uDQogICB7DQot
ICAgIENsYXNzIGtsYXNzID0gb3NjLmZvckNsYXNzKCk7DQogICAgIHRyeQ0KICAgICAgIHsNCi0J
Q2xhc3MgY2xhc3NBcmdzW10gPSB7T2JqZWN0SW5wdXRTdHJlYW0uY2xhc3N9Ow0KLQlNZXRob2Qg
bSA9IGdldE1ldGhvZCAoa2xhc3MsICJyZWFkT2JqZWN0IiwgY2xhc3NBcmdzKTsNCi0JT2JqZWN0
IGFyZ3NbXSA9IHt0aGlzfTsNCi0JbS5pbnZva2Uob2JqLCBhcmdzKTsNCi0gICAgICB9DQotICAg
IGNhdGNoIChOb1N1Y2hNZXRob2RFeGNlcHRpb24gbnNtZSkNCi0gICAgICB7DQotCS8vIE5vdGhp
bmcuDQorCXJlYWRPYmplY3QuaW52b2tlKG9iaiwgbmV3IE9iamVjdFtdIHsgdGhpcyB9KTsNCiAg
ICAgICB9DQogICAgIGNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHgpDQogICAgICAg
ew0KQEAgLTE4MjMsMjY1ICsxNzcyLDcgQEANCiANCiAgIHByaXZhdGUgbmF0aXZlIHZvaWQgY2Fs
bENvbnN0cnVjdG9yIChDbGFzcyBjbGF6eiwgT2JqZWN0IG9iaik7DQogDQotICAvKioNCi0gICAq
IFRoaXMgbWV0aG9kIHdyaXRlcyBhICJib29sZWFuIiB2YWx1ZSA8Y29kZT52YWw8L2NvZGU+IGlu
IHRoZSBzcGVjaWZpZWQgZmllbGQNCi0gICAqIG9mIHRoZSBpbnN0YW5jZSA8Y29kZT5vYmo8L2Nv
ZGU+IG9mIHRoZSB0eXBlIDxjb2RlPmtsYXNzPC9jb2RlPi4NCi0gICAqDQotICAgKiBAcGFyYW0g
b2JqIEluc3RhbmNlIHRvIHNldHVwLg0KLSAgICogQHBhcmFtIGtsYXNzIENsYXNzIHR5cGUgb2Yg
dGhlIHNwZWNpZmllZCBpbnN0YW5jZS4NCi0gICAqIEBwYXJhbSBmaWVsZF9uYW1lIE5hbWUgb2Yg
dGhlIGZpZWxkIGluIHRoZSBzcGVjaWZpZWQgY2xhc3MgdHlwZS4NCi0gICAqIEBwYXJhbSB2YWwg
VGhlIGJvb2xlYW4gdmFsdWUgdG8gd3JpdGUgaW50byB0aGUgZmllbGQuDQotICAgKiBAdGhyb3dz
IEludmFsaWRDbGFzc0V4Y2VwdGlvbiBpZiB0aGUgc3BlY2lmaWVkIGZpZWxkIGhhcyBub3QgdGhl
IHJlcXVpcmVkIHR5cGUuDQotICAgKiBAdGhyb3dzIElPRXhjZXB0aW9uIGlmIHRoZXJlIGlzIG5v
IGZpZWxkIG9mIHRoYXQgbmFtZSBpbiB0aGUgc3BlY2lmaWVkIGNsYXNzLg0KLSAgICovDQotICBw
cml2YXRlIHZvaWQgc2V0Qm9vbGVhbkZpZWxkKE9iamVjdCBvYmosIENsYXNzIGtsYXNzLCBTdHJp
bmcgZmllbGRfbmFtZSwNCi0JCQkJYm9vbGVhbiB2YWwpIHRocm93cyBJT0V4Y2VwdGlvbiwgSW52
YWxpZENsYXNzRXhjZXB0aW9uDQotICB7DQotICAgIHRyeQ0KLSAgICAgIHsNCi0JRmllbGQgZiA9
IGdldEZpZWxkKGtsYXNzLCBmaWVsZF9uYW1lKTsNCi0JZi5zZXRCb29sZWFuKG9iaiwgdmFsKTsN
Ci0gICAgICB9DQotICAgIGNhdGNoIChJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24gXykNCi0gICAg
ICB7DQotCXRocm93IG5ldyBJbnZhbGlkQ2xhc3NFeGNlcHRpb24oImluY29tcGF0aWJsZSBmaWVs
ZCB0eXBlIGZvciAiICsga2xhc3MuZ2V0TmFtZSgpICsgIi4iICsgZmllbGRfbmFtZSk7DQotICAg
ICAgfQ0KLSAgICBjYXRjaCAoRXhjZXB0aW9uIF8pDQotICAgICAgew0KLSAgICAgIH0gICAgDQot
ICB9DQotDQotICAvKioNCi0gICAqIFRoaXMgbWV0aG9kIHdyaXRlcyBhICJieXRlIiB2YWx1ZSA8
Y29kZT52YWw8L2NvZGU+IGluIHRoZSBzcGVjaWZpZWQgZmllbGQNCi0gICAqIG9mIHRoZSBpbnN0
YW5jZSA8Y29kZT5vYmo8L2NvZGU+IG9mIHRoZSB0eXBlIDxjb2RlPmtsYXNzPC9jb2RlPi4NCi0g
ICAqDQotICAgKiBAcGFyYW0gb2JqIEluc3RhbmNlIHRvIHNldHVwLg0KLSAgICogQHBhcmFtIGts
YXNzIENsYXNzIHR5cGUgb2YgdGhlIHNwZWNpZmllZCBpbnN0YW5jZS4NCi0gICAqIEBwYXJhbSBm
aWVsZF9uYW1lIE5hbWUgb2YgdGhlIGZpZWxkIGluIHRoZSBzcGVjaWZpZWQgY2xhc3MgdHlwZS4N
Ci0gICAqIEBwYXJhbSB2YWwgVGhlIGJ5dGUgdmFsdWUgdG8gd3JpdGUgaW50byB0aGUgZmllbGQu
DQotICAgKiBAdGhyb3dzIEludmFsaWRDbGFzc0V4Y2VwdGlvbiBpZiB0aGUgc3BlY2lmaWVkIGZp
ZWxkIGhhcyBub3QgdGhlIHJlcXVpcmVkIHR5cGUuDQotICAgKiBAdGhyb3dzIElPRXhjZXB0aW9u
IGlmIHRoZXJlIGlzIG5vIGZpZWxkIG9mIHRoYXQgbmFtZSBpbiB0aGUgc3BlY2lmaWVkIGNsYXNz
Lg0KLSAgICovDQotICBwcml2YXRlIHZvaWQgc2V0Qnl0ZUZpZWxkKE9iamVjdCBvYmosIENsYXNz
IGtsYXNzLCBTdHJpbmcgZmllbGRfbmFtZSwNCi0JCQkgICAgIGJ5dGUgdmFsKSB0aHJvd3MgSU9F
eGNlcHRpb24sIEludmFsaWRDbGFzc0V4Y2VwdGlvbg0KLSAgew0KLSAgICB0cnkNCi0gICAgICB7
DQotCUZpZWxkIGYgPSBnZXRGaWVsZChrbGFzcywgZmllbGRfbmFtZSk7DQotCWYuc2V0Qnl0ZShv
YmosIHZhbCk7DQotICAgICAgfQ0KLSAgICBjYXRjaCAoSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9u
IF8pDQotICAgICAgew0KLQl0aHJvdyBuZXcgSW52YWxpZENsYXNzRXhjZXB0aW9uKCJpbmNvbXBh
dGlibGUgZmllbGQgdHlwZSBmb3IgIiArIGtsYXNzLmdldE5hbWUoKSArICIuIiArIGZpZWxkX25h
bWUpOw0KLSAgICAgIH0NCi0gICAgY2F0Y2ggKEV4Y2VwdGlvbiBfKQ0KLSAgICAgIHsNCi0gICAg
ICB9ICAgIA0KLSAgfQ0KLQ0KLSAgLyoqDQotICAgKiBUaGlzIG1ldGhvZCB3cml0ZXMgYSAiY2hh
cmFjdGVyIiB2YWx1ZSA8Y29kZT52YWw8L2NvZGU+IGluIHRoZSBzcGVjaWZpZWQgZmllbGQNCi0g
ICAqIG9mIHRoZSBpbnN0YW5jZSA8Y29kZT5vYmo8L2NvZGU+IG9mIHRoZSB0eXBlIDxjb2RlPmts
YXNzPC9jb2RlPi4NCi0gICAqDQotICAgKiBAcGFyYW0gb2JqIEluc3RhbmNlIHRvIHNldHVwLg0K
LSAgICogQHBhcmFtIGtsYXNzIENsYXNzIHR5cGUgb2YgdGhlIHNwZWNpZmllZCBpbnN0YW5jZS4N
Ci0gICAqIEBwYXJhbSBmaWVsZF9uYW1lIE5hbWUgb2YgdGhlIGZpZWxkIGluIHRoZSBzcGVjaWZp
ZWQgY2xhc3MgdHlwZS4NCi0gICAqIEBwYXJhbSB2YWwgVGhlIGNoYXJhY3RlciB2YWx1ZSB0byB3
cml0ZSBpbnRvIHRoZSBmaWVsZC4NCi0gICAqIEB0aHJvd3MgSW52YWxpZENsYXNzRXhjZXB0aW9u
IGlmIHRoZSBzcGVjaWZpZWQgZmllbGQgaGFzIG5vdCB0aGUgcmVxdWlyZWQgdHlwZS4NCi0gICAq
IEB0aHJvd3MgSU9FeGNlcHRpb24gaWYgdGhlcmUgaXMgbm8gZmllbGQgb2YgdGhhdCBuYW1lIGlu
IHRoZSBzcGVjaWZpZWQgY2xhc3MuDQotICAgKi8NCi0gIHByaXZhdGUgdm9pZCBzZXRDaGFyRmll
bGQoT2JqZWN0IG9iaiwgQ2xhc3Mga2xhc3MsIFN0cmluZyBmaWVsZF9uYW1lLA0KLQkJCSAgICAg
Y2hhciB2YWwpIHRocm93cyBJT0V4Y2VwdGlvbiwgSW52YWxpZENsYXNzRXhjZXB0aW9uDQotICB7
DQotICAgIHRyeQ0KLSAgICAgIHsNCi0JRmllbGQgZiA9IGdldEZpZWxkKGtsYXNzLCBmaWVsZF9u
YW1lKTsNCi0JZi5zZXRDaGFyKG9iaiwgdmFsKTsNCi0gICAgICB9DQotICAgIGNhdGNoIChJbGxl
Z2FsQXJndW1lbnRFeGNlcHRpb24gXykNCi0gICAgICB7DQotCXRocm93IG5ldyBJbnZhbGlkQ2xh
c3NFeGNlcHRpb24oImluY29tcGF0aWJsZSBmaWVsZCB0eXBlIGZvciAiICsga2xhc3MuZ2V0TmFt
ZSgpICsgIi4iICsgZmllbGRfbmFtZSk7DQotICAgICAgfQ0KLSAgICBjYXRjaCAoRXhjZXB0aW9u
IF8pDQotICAgICAgew0KLSAgICAgIH0gICAgDQotICB9DQotDQotICAvKioNCi0gICAqIFRoaXMg
bWV0aG9kIHdyaXRlcyBhICJkb3VibGUiIHZhbHVlIDxjb2RlPnZhbDwvY29kZT4gaW4gdGhlIHNw
ZWNpZmllZCBmaWVsZA0KLSAgICogb2YgdGhlIGluc3RhbmNlIDxjb2RlPm9iajwvY29kZT4gb2Yg
dGhlIHR5cGUgPGNvZGU+a2xhc3M8L2NvZGU+Lg0KLSAgICoNCi0gICAqIEBwYXJhbSBvYmogSW5z
dGFuY2UgdG8gc2V0dXAuDQotICAgKiBAcGFyYW0ga2xhc3MgQ2xhc3MgdHlwZSBvZiB0aGUgc3Bl
Y2lmaWVkIGluc3RhbmNlLg0KLSAgICogQHBhcmFtIGZpZWxkX25hbWUgTmFtZSBvZiB0aGUgZmll
bGQgaW4gdGhlIHNwZWNpZmllZCBjbGFzcyB0eXBlLg0KLSAgICogQHBhcmFtIHZhbCBUaGUgZG91
YmxlIHZhbHVlIHRvIHdyaXRlIGludG8gdGhlIGZpZWxkLg0KLSAgICogQHRocm93cyBJbnZhbGlk
Q2xhc3NFeGNlcHRpb24gaWYgdGhlIHNwZWNpZmllZCBmaWVsZCBoYXMgbm90IHRoZSByZXF1aXJl
ZCB0eXBlLg0KLSAgICogQHRocm93cyBJT0V4Y2VwdGlvbiBpZiB0aGVyZSBpcyBubyBmaWVsZCBv
ZiB0aGF0IG5hbWUgaW4gdGhlIHNwZWNpZmllZCBjbGFzcy4NCi0gICAqLw0KLSAgcHJpdmF0ZSB2
b2lkIHNldERvdWJsZUZpZWxkKE9iamVjdCBvYmosIENsYXNzIGtsYXNzLCBTdHJpbmcgZmllbGRf
bmFtZSwNCi0JCQkgICAgICAgZG91YmxlIHZhbCkgdGhyb3dzIElPRXhjZXB0aW9uLCBJbnZhbGlk
Q2xhc3NFeGNlcHRpb24NCi0gIHsNCi0gICAgdHJ5DQotICAgICAgew0KLQlGaWVsZCBmID0gZ2V0
RmllbGQoa2xhc3MsIGZpZWxkX25hbWUpOw0KLQlmLnNldERvdWJsZShvYmosIHZhbCk7DQotICAg
ICAgfQ0KLSAgICBjYXRjaCAoSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uIF8pDQotICAgICAgew0K
LQl0aHJvdyBuZXcgSW52YWxpZENsYXNzRXhjZXB0aW9uKCJpbmNvbXBhdGlibGUgZmllbGQgdHlw
ZSBmb3IgIiArIGtsYXNzLmdldE5hbWUoKSArICIuIiArIGZpZWxkX25hbWUpOw0KLSAgICAgIH0N
Ci0gICAgY2F0Y2ggKEV4Y2VwdGlvbiBfKQ0KLSAgICAgIHsNCi0gICAgICB9ICAgIA0KLSAgfQ0K
LQ0KLSAgLyoqDQotICAgKiBUaGlzIG1ldGhvZCB3cml0ZXMgYSAiZmxvYXQiIHZhbHVlIDxjb2Rl
PnZhbDwvY29kZT4gaW4gdGhlIHNwZWNpZmllZCBmaWVsZA0KLSAgICogb2YgdGhlIGluc3RhbmNl
IDxjb2RlPm9iajwvY29kZT4gb2YgdGhlIHR5cGUgPGNvZGU+a2xhc3M8L2NvZGU+Lg0KLSAgICoN
Ci0gICAqIEBwYXJhbSBvYmogSW5zdGFuY2UgdG8gc2V0dXAuDQotICAgKiBAcGFyYW0ga2xhc3Mg
Q2xhc3MgdHlwZSBvZiB0aGUgc3BlY2lmaWVkIGluc3RhbmNlLg0KLSAgICogQHBhcmFtIGZpZWxk
X25hbWUgTmFtZSBvZiB0aGUgZmllbGQgaW4gdGhlIHNwZWNpZmllZCBjbGFzcyB0eXBlLg0KLSAg
ICogQHBhcmFtIHZhbCBUaGUgZmxvYXQgdmFsdWUgdG8gd3JpdGUgaW50byB0aGUgZmllbGQuDQot
ICAgKiBAdGhyb3dzIEludmFsaWRDbGFzc0V4Y2VwdGlvbiBpZiB0aGUgc3BlY2lmaWVkIGZpZWxk
IGhhcyBub3QgdGhlIHJlcXVpcmVkIHR5cGUuDQotICAgKiBAdGhyb3dzIElPRXhjZXB0aW9uIGlm
IHRoZXJlIGlzIG5vIGZpZWxkIG9mIHRoYXQgbmFtZSBpbiB0aGUgc3BlY2lmaWVkIGNsYXNzLg0K
LSAgICovDQotICBwcml2YXRlIHZvaWQgc2V0RmxvYXRGaWVsZChPYmplY3Qgb2JqLCBDbGFzcyBr
bGFzcywgU3RyaW5nIGZpZWxkX25hbWUsDQotCQkJICAgICAgZmxvYXQgdmFsKSB0aHJvd3MgSU9F
eGNlcHRpb24sIEludmFsaWRDbGFzc0V4Y2VwdGlvbg0KLSAgew0KLSAgICB0cnkNCi0gICAgICB7
DQotCUZpZWxkIGYgPSBnZXRGaWVsZChrbGFzcywgZmllbGRfbmFtZSk7DQotCWYuc2V0RmxvYXQo
b2JqLCB2YWwpOw0KLSAgICAgIH0NCi0gICAgY2F0Y2ggKElsbGVnYWxBcmd1bWVudEV4Y2VwdGlv
biBfKQ0KLSAgICAgIHsNCi0JdGhyb3cgbmV3IEludmFsaWRDbGFzc0V4Y2VwdGlvbigiaW5jb21w
YXRpYmxlIGZpZWxkIHR5cGUgZm9yICIgKyBrbGFzcy5nZXROYW1lKCkgKyAiLiIgKyBmaWVsZF9u
YW1lKTsNCi0gICAgICB9DQotICAgIGNhdGNoIChFeGNlcHRpb24gXykNCi0gICAgICB7DQotICAg
ICAgfSAgICANCi0gIH0NCi0NCi0gIC8qKg0KLSAgICogVGhpcyBtZXRob2Qgd3JpdGVzIGFuICJp
bnRlZ2VyIiB2YWx1ZSA8Y29kZT52YWw8L2NvZGU+IGluIHRoZSBzcGVjaWZpZWQgZmllbGQNCi0g
ICAqIG9mIHRoZSBpbnN0YW5jZSA8Y29kZT5vYmo8L2NvZGU+IG9mIHRoZSB0eXBlIDxjb2RlPmts
YXNzPC9jb2RlPi4NCi0gICAqDQotICAgKiBAcGFyYW0gb2JqIEluc3RhbmNlIHRvIHNldHVwLg0K
LSAgICogQHBhcmFtIGtsYXNzIENsYXNzIHR5cGUgb2YgdGhlIHNwZWNpZmllZCBpbnN0YW5jZS4N
Ci0gICAqIEBwYXJhbSBmaWVsZF9uYW1lIE5hbWUgb2YgdGhlIGZpZWxkIGluIHRoZSBzcGVjaWZp
ZWQgY2xhc3MgdHlwZS4NCi0gICAqIEBwYXJhbSB2YWwgVGhlIGludGVnZXIgdmFsdWUgdG8gd3Jp
dGUgaW50byB0aGUgZmllbGQuDQotICAgKiBAdGhyb3dzIEludmFsaWRDbGFzc0V4Y2VwdGlvbiBp
ZiB0aGUgc3BlY2lmaWVkIGZpZWxkIGhhcyBub3QgdGhlIHJlcXVpcmVkIHR5cGUuDQotICAgKiBA
dGhyb3dzIElPRXhjZXB0aW9uIGlmIHRoZXJlIGlzIG5vIGZpZWxkIG9mIHRoYXQgbmFtZSBpbiB0
aGUgc3BlY2lmaWVkIGNsYXNzLg0KLSAgICovDQotICBwcml2YXRlIHZvaWQgc2V0SW50RmllbGQo
T2JqZWN0IG9iaiwgQ2xhc3Mga2xhc3MsIFN0cmluZyBmaWVsZF9uYW1lLA0KLQkJCSAgICBpbnQg
dmFsKSB0aHJvd3MgSU9FeGNlcHRpb24sIEludmFsaWRDbGFzc0V4Y2VwdGlvbg0KLSAgew0KLSAg
ICB0cnkNCi0gICAgICB7DQotCUZpZWxkIGYgPSBnZXRGaWVsZChrbGFzcywgZmllbGRfbmFtZSk7
DQotCWYuc2V0SW50KG9iaiwgdmFsKTsNCi0gICAgICB9DQotICAgIGNhdGNoIChJbGxlZ2FsQXJn
dW1lbnRFeGNlcHRpb24gXykNCi0gICAgICB7DQotCXRocm93IG5ldyBJbnZhbGlkQ2xhc3NFeGNl
cHRpb24oImluY29tcGF0aWJsZSBmaWVsZCB0eXBlIGZvciAiICsga2xhc3MuZ2V0TmFtZSgpICsg
Ii4iICsgZmllbGRfbmFtZSk7DQotICAgICAgfQ0KLSAgICBjYXRjaCAoRXhjZXB0aW9uIF8pDQot
ICAgICAgew0KLSAgICAgIH0gICAgDQotICB9DQotDQotICAvKioNCi0gICAqIFRoaXMgbWV0aG9k
IHdyaXRlcyB0aGUgbG9uZyB2YWx1ZSA8Y29kZT52YWw8L2NvZGU+IGluIHRoZSBzcGVjaWZpZWQg
ZmllbGQNCi0gICAqIG9mIHRoZSBpbnN0YW5jZSA8Y29kZT5vYmo8L2NvZGU+IG9mIHRoZSB0eXBl
IDxjb2RlPmtsYXNzPC9jb2RlPi4NCi0gICAqDQotICAgKiBAcGFyYW0gb2JqIEluc3RhbmNlIHRv
IHNldHVwLg0KLSAgICogQHBhcmFtIGtsYXNzIENsYXNzIHR5cGUgb2YgdGhlIHNwZWNpZmllZCBp
bnN0YW5jZS4NCi0gICAqIEBwYXJhbSBmaWVsZF9uYW1lIE5hbWUgb2YgdGhlIGZpZWxkIGluIHRo
ZSBzcGVjaWZpZWQgY2xhc3MgdHlwZS4NCi0gICAqIEBwYXJhbSB2YWwgVGhlIGxvbmcgdmFsdWUg
dG8gd3JpdGUgaW50byB0aGUgZmllbGQuDQotICAgKiBAdGhyb3dzIEludmFsaWRDbGFzc0V4Y2Vw
dGlvbiBpZiB0aGUgc3BlY2lmaWVkIGZpZWxkIGhhcyBub3QgdGhlIHJlcXVpcmVkIHR5cGUuDQot
ICAgKiBAdGhyb3dzIElPRXhjZXB0aW9uIGlmIHRoZXJlIGlzIG5vIGZpZWxkIG9mIHRoYXQgbmFt
ZSBpbiB0aGUgc3BlY2lmaWVkIGNsYXNzLg0KLSAgICovDQotICBwcml2YXRlIHZvaWQgc2V0TG9u
Z0ZpZWxkKE9iamVjdCBvYmosIENsYXNzIGtsYXNzLCBTdHJpbmcgZmllbGRfbmFtZSwNCi0JCQkg
ICAgIGxvbmcgdmFsKSB0aHJvd3MgSU9FeGNlcHRpb24sIEludmFsaWRDbGFzc0V4Y2VwdGlvbg0K
LSAgew0KLSAgICB0cnkNCi0gICAgICB7DQotCUZpZWxkIGYgPSBnZXRGaWVsZChrbGFzcywgZmll
bGRfbmFtZSk7DQotCWYuc2V0TG9uZyhvYmosIHZhbCk7DQotICAgICAgfQ0KLSAgICBjYXRjaCAo
SWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uIF8pDQotICAgICAgew0KLQl0aHJvdyBuZXcgSW52YWxp
ZENsYXNzRXhjZXB0aW9uKCJpbmNvbXBhdGlibGUgZmllbGQgdHlwZSBmb3IgIiArIGtsYXNzLmdl
dE5hbWUoKSArICIuIiArIGZpZWxkX25hbWUpOw0KLSAgICAgIH0NCi0gICAgY2F0Y2ggKEV4Y2Vw
dGlvbiBfKQ0KLSAgICAgIHsNCi0gICAgICB9ICAgIA0KLSAgfQ0KLQ0KLSAgLyoqDQotICAgKiBU
aGlzIG1ldGhvZCB3cml0ZXMgYSAic2hvcnQiIHZhbHVlIDxjb2RlPnZhbDwvY29kZT4gaW4gdGhl
IHNwZWNpZmllZCBmaWVsZA0KLSAgICogb2YgdGhlIGluc3RhbmNlIDxjb2RlPm9iajwvY29kZT4g
b2YgdGhlIHR5cGUgPGNvZGU+a2xhc3M8L2NvZGU+Lg0KLSAgICoNCi0gICAqIEBwYXJhbSBvYmog
SW5zdGFuY2UgdG8gc2V0dXAuDQotICAgKiBAcGFyYW0ga2xhc3MgQ2xhc3MgdHlwZSBvZiB0aGUg
c3BlY2lmaWVkIGluc3RhbmNlLg0KLSAgICogQHBhcmFtIGZpZWxkX25hbWUgTmFtZSBvZiB0aGUg
ZmllbGQgaW4gdGhlIHNwZWNpZmllZCBjbGFzcyB0eXBlLg0KLSAgICogQHBhcmFtIHZhbCBUaGUg
c2hvcnQgdmFsdWUgdG8gd3JpdGUgaW50byB0aGUgZmllbGQuDQotICAgKiBAdGhyb3dzIEludmFs
aWRDbGFzc0V4Y2VwdGlvbiBpZiB0aGUgc3BlY2lmaWVkIGZpZWxkIGhhcyBub3QgdGhlIHJlcXVp
cmVkIHR5cGUuDQotICAgKiBAdGhyb3dzIElPRXhjZXB0aW9uIGlmIHRoZXJlIGlzIG5vIGZpZWxk
IG9mIHRoYXQgbmFtZSBpbiB0aGUgc3BlY2lmaWVkIGNsYXNzLg0KLSAgICovDQotICBwcml2YXRl
IHZvaWQgc2V0U2hvcnRGaWVsZChPYmplY3Qgb2JqLCBDbGFzcyBrbGFzcywgU3RyaW5nIGZpZWxk
X25hbWUsDQotCQkJICAgICAgc2hvcnQgdmFsKSB0aHJvd3MgSU9FeGNlcHRpb24sIEludmFsaWRD
bGFzc0V4Y2VwdGlvbg0KLSAgew0KLSAgICB0cnkNCi0gICAgICB7DQotCUZpZWxkIGYgPSBnZXRG
aWVsZChrbGFzcywgZmllbGRfbmFtZSk7DQotCWYuc2V0U2hvcnQob2JqLCB2YWwpOw0KLSAgICAg
IH0NCi0gICAgY2F0Y2ggKElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbiBfKQ0KLSAgICAgIHsNCi0J
dGhyb3cgbmV3IEludmFsaWRDbGFzc0V4Y2VwdGlvbigiaW5jb21wYXRpYmxlIGZpZWxkIHR5cGUg
Zm9yICIgKyBrbGFzcy5nZXROYW1lKCkgKyAiLiIgKyBmaWVsZF9uYW1lKTsNCi0gICAgICB9DQot
ICAgIGNhdGNoIChFeGNlcHRpb24gXykNCi0gICAgICB7DQotICAgICAgfSAgICANCi0gIH0NCi0N
Ci0gIC8qKg0KLSAgICogVGhpcyBtZXRob2Qgd3JpdGVzIGFuICJvYmplY3QiIHZhbHVlIDxjb2Rl
PnZhbDwvY29kZT4gaW4gdGhlIHNwZWNpZmllZCBmaWVsZA0KLSAgICogb2YgdGhlIGluc3RhbmNl
IDxjb2RlPm9iajwvY29kZT4gb2YgdGhlIHR5cGUgPGNvZGU+a2xhc3M8L2NvZGU+Lg0KLSAgICoN
Ci0gICAqIEBwYXJhbSBvYmogSW5zdGFuY2UgdG8gc2V0dXAuDQotICAgKiBAcGFyYW0ga2xhc3Mg
Q2xhc3MgdHlwZSBvZiB0aGUgc3BlY2lmaWVkIGluc3RhbmNlLg0KLSAgICogQHBhcmFtIGZpZWxk
X25hbWUgTmFtZSBvZiB0aGUgZmllbGQgaW4gdGhlIHNwZWNpZmllZCBjbGFzcyB0eXBlLg0KLSAg
ICogQHBhcmFtIHZhbCBUaGUgIm9iamVjdCIgdmFsdWUgdG8gd3JpdGUgaW50byB0aGUgZmllbGQu
DQotICAgKiBAdGhyb3dzIEludmFsaWRDbGFzc0V4Y2VwdGlvbiBpZiB0aGUgc3BlY2lmaWVkIGZp
ZWxkIGhhcyBub3QgdGhlIHJlcXVpcmVkIHR5cGUuDQotICAgKiBAdGhyb3dzIElPRXhjZXB0aW9u
IGlmIHRoZXJlIGlzIG5vIGZpZWxkIG9mIHRoYXQgbmFtZSBpbiB0aGUgc3BlY2lmaWVkIGNsYXNz
Lg0KLSAgICovDQotICBwcml2YXRlIHZvaWQgc2V0T2JqZWN0RmllbGQoT2JqZWN0IG9iaiwgQ2xh
c3Mga2xhc3MsIFN0cmluZyBmaWVsZF9uYW1lLA0KLQkJCSAgICAgICBTdHJpbmcgdHlwZV9jb2Rl
LCBPYmplY3QgdmFsKSB0aHJvd3MgSU9FeGNlcHRpb24sIEludmFsaWRDbGFzc0V4Y2VwdGlvbg0K
LSAgew0KLSAgICB0cnkNCi0gICAgICB7DQotIAlGaWVsZCBmID0gZ2V0RmllbGQoa2xhc3MsIGZp
ZWxkX25hbWUpOw0KLQlPYmplY3RTdHJlYW1GaWVsZCBvZiA9IG5ldyBPYmplY3RTdHJlYW1GaWVs
ZChmaWVsZF9uYW1lLCBmLmdldFR5cGUoKSk7DQotCQ0KLQlpZiAob2YuZ2V0VHlwZVN0cmluZygp
ID09IG51bGwgfHwNCi0JICAgICFvZi5nZXRUeXBlU3RyaW5nKCkuZXF1YWxzKHR5cGVfY29kZSkp
DQotICAgICAgICAgIHRocm93IG5ldyBJbnZhbGlkQ2xhc3NFeGNlcHRpb24oImluY29tcGF0aWJs
ZSBmaWVsZCB0eXBlIGZvciAiICsga2xhc3MuZ2V0TmFtZSgpICsgIi4iICsgZmllbGRfbmFtZSk7
DQotIAlmLnNldChvYmosIHZhbCk7DQotICAgICAgfQ0KLSAgICBjYXRjaCAoSW52YWxpZENsYXNz
RXhjZXB0aW9uIGUpDQotICAgICAgew0KLQl0aHJvdyBlOw0KLSAgICAgIH0NCi0gICAgY2F0Y2gg
KEV4Y2VwdGlvbiBfKQ0KLSAgICAgIHsNCi0gICAgICB9DQotICB9DQotDQogICBwcml2YXRlIHN0
YXRpYyBmaW5hbCBpbnQgQlVGRkVSX1NJWkUgPSAxMDI0Ow0KLSAgcHJpdmF0ZSBzdGF0aWMgZmlu
YWwgQ2xhc3NbXSByZWFkT2JqZWN0UGFyYW1zID0geyBPYmplY3RJbnB1dFN0cmVhbS5jbGFzcyB9
Ow0KIA0KICAgcHJpdmF0ZSBEYXRhSW5wdXRTdHJlYW0gcmVhbElucHV0U3RyZWFtOw0KICAgcHJp
dmF0ZSBEYXRhSW5wdXRTdHJlYW0gZGF0YUlucHV0U3RyZWFtOw0KSW5kZXg6IGphdmEvaW8vT2Jq
ZWN0U3RyZWFtQ2xhc3MuamF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNz
cGF0aC9jbGFzc3BhdGgvamF2YS9pby9PYmplY3RTdHJlYW1DbGFzcy5qYXZhLHYNCnJldHJpZXZp
bmcgcmV2aXNpb24gMS4yOQ0KZGlmZiAtdSAtcjEuMjkgT2JqZWN0U3RyZWFtQ2xhc3MuamF2YQ0K
LS0tIGphdmEvaW8vT2JqZWN0U3RyZWFtQ2xhc3MuamF2YQkzMCBEZWMgMjAwMyAxNTo1NzowNSAt
MDAwMAkxLjI5DQorKysgamF2YS9pby9PYmplY3RTdHJlYW1DbGFzcy5qYXZhCTMwIEphbiAyMDA0
IDE1OjAxOjMzIC0wMDAwDQpAQCAtNDUsOSArNDUsMTEgQEANCiBpbXBvcnQgamF2YS5sYW5nLnJl
ZmxlY3QuTWV0aG9kOw0KIGltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5Nb2RpZmllcjsNCiBpbXBv
cnQgamF2YS5sYW5nLnJlZmxlY3QuUHJveHk7DQoraW1wb3J0IGphdmEuc2VjdXJpdHkuQWNjZXNz
Q29udHJvbGxlcjsNCiBpbXBvcnQgamF2YS5zZWN1cml0eS5EaWdlc3RPdXRwdXRTdHJlYW07DQog
aW1wb3J0IGphdmEuc2VjdXJpdHkuTWVzc2FnZURpZ2VzdDsNCiBpbXBvcnQgamF2YS5zZWN1cml0
eS5Ob1N1Y2hBbGdvcml0aG1FeGNlcHRpb247DQoraW1wb3J0IGphdmEuc2VjdXJpdHkuUHJpdmls
ZWdlZEFjdGlvbjsNCiBpbXBvcnQgamF2YS5zZWN1cml0eS5TZWN1cml0eTsNCiBpbXBvcnQgamF2
YS51dGlsLkFycmF5czsNCiBpbXBvcnQgamF2YS51dGlsLkNvbXBhcmF0b3I7DQpAQCAtMTkyLDI5
ICsxOTQsNiBAQA0KICAgICByZXR1cm4gKGZsYWdzICYgT2JqZWN0U3RyZWFtQ29uc3RhbnRzLlND
X1dSSVRFX01FVEhPRCkgIT0gMDsNCiAgIH0NCiANCi0NCi0gIC8vIFJldHVybnMgdHJ1ZSBpZmYg
dGhlIGNsYXNzIHRoYXQgdGhpcyBPYmplY3RTdHJlYW1DbGFzcyByZXByZXNlbnRzDQotICAvLyBo
YXMgdGhlIGZvbGxvd2luZyBtZXRob2Q6DQotICAvLw0KLSAgLy8gcHJpdmF0ZSB2b2lkIHJlYWRP
YmplY3QgKE9iamVjdE91dHB1dFN0cmVhbSkNCi0gIC8vDQotICAvLyBUaGlzIG1ldGhvZCBpcyB1
c2VkIGJ5IHRoZSBjbGFzcyB0byBvdmVycmlkZSBkZWZhdWx0DQotICAvLyBzZXJpYWxpemF0aW9u
IGJlaGF2aW9yLg0KLSAgYm9vbGVhbiBoYXNSZWFkTWV0aG9kKCkNCi0gIHsNCi0gICAgdHJ5DQot
ICAgICAgew0KLQlDbGFzc1tdIHJlYWRPYmplY3RQYXJhbXMgPSB7IE9iamVjdElucHV0U3RyZWFt
LmNsYXNzIH07DQotCWZvckNsYXNzKCkuZ2V0RGVjbGFyZWRNZXRob2QoInJlYWRPYmplY3QiLCBy
ZWFkT2JqZWN0UGFyYW1zKTsNCi0JcmV0dXJuIHRydWU7DQotICAgICAgfQ0KLSAgICBjYXRjaCAo
Tm9TdWNoTWV0aG9kRXhjZXB0aW9uIGUpDQotICAgICAgew0KLQlyZXR1cm4gZmFsc2U7DQotICAg
ICAgfQ0KLSAgfQ0KLQ0KLQ0KICAgLy8gUmV0dXJucyB0cnVlIGlmZiB0aGUgY2xhc3MgdGhhdCB0
aGlzIE9iamVjdFN0cmVhbUNsYXNzIHJlcHJlc2VudHMNCiAgIC8vIGltcGxlbWVudHMgU2VyaWFs
aXphYmxlIGJ1dCBkb2VzICpub3QqIGltcGxlbWVudCBFeHRlcm5hbGl6YWJsZS4NCiAgIGJvb2xl
YW4gaXNTZXJpYWxpemFibGUoKQ0KQEAgLTMwNiw2ICsyODUsOCBAQA0KICAgew0KICAgICB0aGlz
LmNsYXp6ID0gY2w7DQogDQorICAgIGNhY2hlTWV0aG9kcygpOw0KKw0KICAgICBsb25nIGNsYXNz
X3VpZCA9IGdldENsYXNzVUlEKGNsKTsNCiAgICAgaWYgKHVpZCA9PSAwKQ0KICAgICAgIHVpZCA9
IGNsYXNzX3VpZDsNCkBAIC00NTIsNiArNDMzLDUwIEBADQogICAgICAgZmllbGRzW2ldLnNldE9m
ZnNldChvYmplY3RGaWVsZENvdW50KyspOw0KICAgfQ0KIA0KKyAgcHJpdmF0ZSBNZXRob2QgZmlu
ZE1ldGhvZChNZXRob2RbXSBtZXRob2RzLCBTdHJpbmcgbmFtZSwgQ2xhc3NbXSBwYXJhbXMsDQor
CQkJICAgIENsYXNzIHJldHVyblR5cGUpDQorICB7DQorb3V0ZXI6DQorICAgIGZvcihpbnQgaSA9
IDA7IGkgPCBtZXRob2RzLmxlbmd0aDsgaSsrKQ0KKyAgICB7DQorCWlmKG1ldGhvZHNbaV0uZ2V0
TmFtZSgpLmVxdWFscyhuYW1lKSAmJg0KKwkgICBtZXRob2RzW2ldLmdldFJldHVyblR5cGUoKSA9
PSByZXR1cm5UeXBlKQ0KKwl7DQorCSAgICBDbGFzc1tdIG1wID0gbWV0aG9kc1tpXS5nZXRQYXJh
bWV0ZXJUeXBlcygpOw0KKwkgICAgaWYobXAubGVuZ3RoID09IHBhcmFtcy5sZW5ndGgpDQorCSAg
ICB7DQorCQlmb3IoaW50IGogPSAwOyBqIDwgbXAubGVuZ3RoOyBqKyspDQorCQl7DQorCQkgICAg
aWYobXBbal0gIT0gcGFyYW1zW2pdKQ0KKwkJICAgIHsNCisJCQljb250aW51ZSBvdXRlcjsNCisJ
CSAgICB9DQorCQl9DQorCQlmaW5hbCBNZXRob2QgbSA9IG1ldGhvZHNbaV07DQorCQlBY2Nlc3ND
b250cm9sbGVyLmRvUHJpdmlsZWdlZChuZXcgUHJpdmlsZWdlZEFjdGlvbigpDQorCQl7DQorCQkg
ICAgcHVibGljIE9iamVjdCBydW4oKQ0KKwkJICAgIHsNCisJCQltLnNldEFjY2Vzc2libGUodHJ1
ZSk7DQorCQkJcmV0dXJuIG51bGw7DQorCQkgICAgfQ0KKwkJfSk7DQorCQlyZXR1cm4gbTsNCisJ
ICAgIH0NCisJfQ0KKyAgICB9DQorICAgIHJldHVybiBudWxsOw0KKyAgfQ0KKw0KKyAgcHJpdmF0
ZSB2b2lkIGNhY2hlTWV0aG9kcygpDQorICB7DQorICAgIE1ldGhvZFtdIG1ldGhvZHMgPSBmb3JD
bGFzcygpLmdldERlY2xhcmVkTWV0aG9kcygpOw0KKyAgICByZWFkT2JqZWN0TWV0aG9kID0gZmlu
ZE1ldGhvZChtZXRob2RzLCAicmVhZE9iamVjdCIsDQorCQkJCSAgbmV3IENsYXNzW10geyBPYmpl
Y3RJbnB1dFN0cmVhbS5jbGFzcyB9LA0KKwkJCQkgIFZvaWQuVFlQRSk7DQorICAgIHJlYWRSZXNv
bHZlTWV0aG9kID0gZmluZE1ldGhvZChtZXRob2RzLCAicmVhZFJlc29sdmUiLA0KKwkJCQkgICBu
ZXcgQ2xhc3NbMF0sIE9iamVjdC5jbGFzcyk7DQorICB9DQogDQogICBwcml2YXRlIE9iamVjdFN0
cmVhbUNsYXNzKENsYXNzIGNsKQ0KICAgew0KQEAgLTQ2MCw2ICs0ODUsNyBAQA0KICAgICBpc1By
b3h5Q2xhc3MgPSBQcm94eS5pc1Byb3h5Q2xhc3MoY2wpOw0KIA0KICAgICBjbGF6eiA9IGNsOw0K
KyAgICBjYWNoZU1ldGhvZHMoKTsNCiAgICAgbmFtZSA9IGNsLmdldE5hbWUoKTsNCiAgICAgc2V0
RmxhZ3MoY2wpOw0KICAgICBzZXRGaWVsZHMoY2wpOw0KQEAgLTUwOCw5ICs1MzQsMTYgQEANCiAN
CiAgICAgdHJ5DQogICAgICAgew0KLQlGaWVsZCBzZXJpYWxQZXJzaXN0ZW50RmllbGRzID0NCisJ
ZmluYWwgRmllbGQgc2VyaWFsUGVyc2lzdGVudEZpZWxkcyA9DQogCSAgY2wuZ2V0RGVjbGFyZWRG
aWVsZCgic2VyaWFsUGVyc2lzdGVudEZpZWxkcyIpOw0KLQlzZXJpYWxQZXJzaXN0ZW50RmllbGRz
LnNldEFjY2Vzc2libGUodHJ1ZSk7DQorCUFjY2Vzc0NvbnRyb2xsZXIuZG9Qcml2aWxlZ2VkKG5l
dyBQcml2aWxlZ2VkQWN0aW9uKCkNCisJew0KKwkgICAgcHVibGljIE9iamVjdCBydW4oKQ0KKwkg
ICAgew0KKwkJc2VyaWFsUGVyc2lzdGVudEZpZWxkcy5zZXRBY2Nlc3NpYmxlKHRydWUpOw0KKwkJ
cmV0dXJuIG51bGw7DQorCSAgICB9DQorCX0pOw0KIAlpbnQgbW9kaWZpZXJzID0gc2VyaWFsUGVy
c2lzdGVudEZpZWxkcy5nZXRNb2RpZmllcnMoKTsNCiANCiAJaWYgKE1vZGlmaWVyLmlzU3RhdGlj
KG1vZGlmaWVycykNCkBAIC01NTMsMTIgKzU4NiwyOCBAQA0KICAgICBmb3IgKGludCBmcm9tID0g
MCwgdG8gPSAwOyBmcm9tIDwgYWxsX2ZpZWxkcy5sZW5ndGg7IGZyb20rKykNCiAgICAgICBpZiAo
YWxsX2ZpZWxkc1tmcm9tXSAhPSBudWxsKQ0KIAl7DQotCSAgRmllbGQgZiA9IGFsbF9maWVsZHNb
ZnJvbV07DQotCSAgZmllbGRzW3RvXSA9IG5ldyBPYmplY3RTdHJlYW1GaWVsZChmLmdldE5hbWUo
KSwgZi5nZXRUeXBlKCkpOw0KKwkgIGZpbmFsIEZpZWxkIGYgPSBhbGxfZmllbGRzW2Zyb21dOw0K
KwkgIEFjY2Vzc0NvbnRyb2xsZXIuZG9Qcml2aWxlZ2VkKG5ldyBQcml2aWxlZ2VkQWN0aW9uKCkN
CisJICB7DQorCSAgICAgIHB1YmxpYyBPYmplY3QgcnVuKCkNCisJICAgICAgew0KKwkJICBmLnNl
dEFjY2Vzc2libGUodHJ1ZSk7DQorCQkgIHJldHVybiBudWxsOw0KKwkgICAgICB9DQorCSAgfSk7
DQorCSAgZmllbGRzW3RvXSA9IG5ldyBPYmplY3RTdHJlYW1GaWVsZChhbGxfZmllbGRzW2Zyb21d
KTsNCiAJICB0bysrOw0KIAl9DQogDQogICAgIEFycmF5cy5zb3J0KGZpZWxkcyk7DQorICAgIC8v
IE1ha2Ugc3VyZSB3ZSBkb24ndCBoYXZlIGFueSBkdXBsaWNhdGUgZmllbGQgbmFtZXMNCisgICAg
Ly8gKFN1biBKREsgMS40LjEuIHRocm93cyBhbiBJbnRlcm5hbCBFcnJvciBhcyB3ZWxsKQ0KKyAg
ICBmb3IgKGludCBpID0gMTsgaSA8IGZpZWxkcy5sZW5ndGg7IGkrKykNCisgICAgICB7DQorCWlm
KGZpZWxkc1tpIC0gMV0uZ2V0TmFtZSgpLmVxdWFscyhmaWVsZHNbaV0uZ2V0TmFtZSgpKSkNCisJ
ICAgIHRocm93IG5ldyBJbnRlcm5hbEVycm9yKCJEdXBsaWNhdGUgZmllbGQgIiArIA0KKwkJCWZp
ZWxkc1tpXS5nZXROYW1lKCkgKyAiIGluIGNsYXNzICIgKyBjbC5nZXROYW1lKCkpOw0KKyAgICAg
IH0NCiAgICAgY2FsY3VsYXRlT2Zmc2V0cygpOw0KICAgfQ0KIA0KQEAgLTU3MSw4ICs2MjAsMTUg
QEANCiAJLy8gVXNlIGdldERlY2xhcmVkRmllbGQgcmF0aGVyIHRoYW4gZ2V0RmllbGQsIHNpbmNl
IHNlcmlhbFZlcnNpb25VSUQNCiAJLy8gbWF5IG5vdCBiZSBwdWJsaWMgQU5EIHdlIG9ubHkgd2Fu
dCB0aGUgc2VyaWFsVmVyc2lvblVJRCBvZiB0aGlzDQogCS8vIGNsYXNzLCBub3QgYSBzdXBlcmNs
YXNzIG9yIGludGVyZmFjZS4NCi0JRmllbGQgc3VpZCA9IGNsLmdldERlY2xhcmVkRmllbGQoInNl
cmlhbFZlcnNpb25VSUQiKTsNCi0Jc3VpZC5zZXRBY2Nlc3NpYmxlKHRydWUpOw0KKwlmaW5hbCBG
aWVsZCBzdWlkID0gY2wuZ2V0RGVjbGFyZWRGaWVsZCgic2VyaWFsVmVyc2lvblVJRCIpOw0KKwlB
Y2Nlc3NDb250cm9sbGVyLmRvUHJpdmlsZWdlZChuZXcgUHJpdmlsZWdlZEFjdGlvbigpDQorCXsN
CisJICAgIHB1YmxpYyBPYmplY3QgcnVuKCkNCisJICAgIHsNCisJCXN1aWQuc2V0QWNjZXNzaWJs
ZSh0cnVlKTsNCisJCXJldHVybiBudWxsOw0KKwkgICAgfQ0KKwl9KTsNCiAJaW50IG1vZGlmaWVy
cyA9IHN1aWQuZ2V0TW9kaWZpZXJzKCk7DQogDQogCWlmIChNb2RpZmllci5pc1N0YXRpYyhtb2Rp
ZmllcnMpDQpAQCAtNzYwLDYgKzgxNiw4IEBADQogICBwcml2YXRlIFN0cmluZyBuYW1lOw0KICAg
cHJpdmF0ZSBsb25nIHVpZDsNCiAgIHByaXZhdGUgYnl0ZSBmbGFnczsNCisgIE1ldGhvZCByZWFk
T2JqZWN0TWV0aG9kOw0KKyAgTWV0aG9kIHJlYWRSZXNvbHZlTWV0aG9kOw0KIA0KICAgLy8gdGhp
cyBmaWVsZCBpcyBwYWNrYWdlIHByb3RlY3RlZCBzbyB0aGF0IE9iamVjdElucHV0U3RyZWFtIGFu
ZA0KICAgLy8gT2JqZWN0T3V0cHV0U3RyZWFtIGNhbiBhY2Nlc3MgaXQgZGlyZWN0bHkNCkluZGV4
OiBqYXZhL2lvL09iamVjdFN0cmVhbUZpZWxkLmphdmENCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAv
Y3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2phdmEvaW8vT2JqZWN0U3RyZWFtRmllbGQuamF2
YSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTINCmRpZmYgLXUgLXIxLjEyIE9iamVjdFN0cmVh
bUZpZWxkLmphdmENCi0tLSBqYXZhL2lvL09iamVjdFN0cmVhbUZpZWxkLmphdmEJMjcgRGVjIDIw
MDMgMjI6NDg6NTggLTAwMDAJMS4xMg0KKysrIGphdmEvaW8vT2JqZWN0U3RyZWFtRmllbGQuamF2
YQkzMCBKYW4gMjAwNCAxNTowMTozMyAtMDAwMA0KQEAgLTM4LDYgKzM4LDggQEANCiANCiBwYWNr
YWdlIGphdmEuaW87DQogDQoraW1wb3J0IGphdmEubGFuZy5yZWZsZWN0LkZpZWxkOw0KK2ltcG9y
dCBqYXZhLmxhbmcucmVmbGVjdC5Nb2RpZmllcjsNCiBpbXBvcnQgZ251LmphdmEubGFuZy5yZWZs
ZWN0LlR5cGVTaWduYXR1cmU7DQogDQogLyoqDQpAQCAtNTQsNiArNTYsMTQgQEANCiAgIHByaXZh
dGUgYm9vbGVhbiB1bnNoYXJlZDsNCiAgIHByaXZhdGUgYm9vbGVhbiBwZXJzaXN0ZW50ID0gZmFs
c2U7DQogICBwcml2YXRlIGJvb2xlYW4gdG9zZXQgPSB0cnVlOw0KKyAgcHJpdmF0ZSBGaWVsZCBm
aWVsZDsNCisNCisgIE9iamVjdFN0cmVhbUZpZWxkIChGaWVsZCBmaWVsZCkNCisgIHsNCisgICAg
dGhpcyAoZmllbGQuZ2V0TmFtZSgpLCBmaWVsZC5nZXRUeXBlKCkpOw0KKyAgICB0aGlzLmZpZWxk
ID0gZmllbGQ7DQorICAgIHRvc2V0ID0gIU1vZGlmaWVyLmlzRmluYWwoZmllbGQuZ2V0TW9kaWZp
ZXJzKCkpOw0KKyAgfQ0KIA0KICAgLyoqDQogICAgKiBUaGlzIGNvbnN0cnVjdG9yIGNyZWF0ZXMg
YW4gT2JqZWN0U3RyZWFtRmllbGQgaW5zdGFuY2UgDQpAQCAtMTA1LDcgKzExNSw2IEBADQogICAg
ICAgfQ0KICAgICBjYXRjaChDbGFzc05vdEZvdW5kRXhjZXB0aW9uIGUpDQogICAgICAgew0KLSAg
ICAgICAgdHlwZSA9IE9iamVjdC5jbGFzczsgLy9GSVhNRTogPz8/DQogICAgICAgfQ0KICAgfQ0K
ICAgDQpAQCAtMTI4LDcgKzEzNyw2IEBADQogICAgICAgfQ0KICAgICBjYXRjaChDbGFzc05vdEZv
dW5kRXhjZXB0aW9uIGUpDQogICAgICAgew0KLSAgICAgICAgdHlwZSA9IE9iamVjdC5jbGFzczsg
Ly8gQUxTTyBGSVhNRSANCiAgICAgICB9DQogICB9DQogDQpAQCAtMTc2LDcgKzE4NCw3IEBADQog
ICBwdWJsaWMgU3RyaW5nIGdldFR5cGVTdHJpbmcgKCkNCiAgIHsNCiAgICAgLy8gdXNlIGludGVy
bigpDQotICAgIGlmICh0aGlzLnR5cGUuaXNQcmltaXRpdmUoKSkNCisgICAgaWYgKGlzUHJpbWl0
aXZlKCkpDQogICAgICAgcmV0dXJuIG51bGw7DQogICAgIHJldHVybiB0eXBlbmFtZS5pbnRlcm4o
KTsNCiAgIH0NCkBAIC0yMjUsNyArMjMzLDcgQEANCiAgICAqLw0KICAgcHVibGljIGJvb2xlYW4g
aXNQcmltaXRpdmUgKCkNCiAgIHsNCi0gICAgcmV0dXJuIHR5cGUuaXNQcmltaXRpdmUgKCk7DQor
ICAgIHJldHVybiB0eXBlICE9IG51bGwgJiYgdHlwZS5pc1ByaW1pdGl2ZSgpOw0KICAgfQ0KIA0K
ICAgcHVibGljIGludCBjb21wYXJlVG8gKE9iamVjdCBvKQ0KQEAgLTI5OSw1ICszMDcsMTEyIEBA
DQogICB7DQogICAgIHJldHVybiAiT2JqZWN0U3RyZWFtRmllbGQ8ICIgKyB0eXBlICsgIiAiICsg
bmFtZSArICIgPiI7DQogICB9DQotfQ0KIA0KKyAgZmluYWwgdm9pZCBzZXRCb29sZWFuRmllbGQo
T2JqZWN0IG9iaiwgYm9vbGVhbiB2YWwpDQorICB7DQorICAgICAgdHJ5DQorICAgICAgew0KKwkg
IGZpZWxkLnNldEJvb2xlYW4ob2JqLCB2YWwpOw0KKyAgICAgIH0NCisgICAgICBjYXRjaChJbGxl
Z2FsQWNjZXNzRXhjZXB0aW9uIHgpDQorICAgICAgew0KKwkgIHRocm93IG5ldyBJbnRlcm5hbEVy
cm9yKHguZ2V0TWVzc2FnZSgpKTsNCisgICAgICB9DQorICB9DQorDQorICBmaW5hbCB2b2lkIHNl
dEJ5dGVGaWVsZChPYmplY3Qgb2JqLCBieXRlIHZhbCkNCisgIHsNCisgICAgICB0cnkNCisgICAg
ICB7DQorCSAgZmllbGQuc2V0Qnl0ZShvYmosIHZhbCk7DQorICAgICAgfQ0KKyAgICAgIGNhdGNo
KElsbGVnYWxBY2Nlc3NFeGNlcHRpb24geCkNCisgICAgICB7DQorCSAgdGhyb3cgbmV3IEludGVy
bmFsRXJyb3IoeC5nZXRNZXNzYWdlKCkpOw0KKyAgICAgIH0NCisgIH0NCisNCisgIGZpbmFsIHZv
aWQgc2V0Q2hhckZpZWxkKE9iamVjdCBvYmosIGNoYXIgdmFsKQ0KKyAgew0KKyAgICAgIHRyeQ0K
KyAgICAgIHsNCisJICBmaWVsZC5zZXRDaGFyKG9iaiwgdmFsKTsNCisgICAgICB9DQorICAgICAg
Y2F0Y2goSWxsZWdhbEFjY2Vzc0V4Y2VwdGlvbiB4KQ0KKyAgICAgIHsNCisJICB0aHJvdyBuZXcg
SW50ZXJuYWxFcnJvcih4LmdldE1lc3NhZ2UoKSk7DQorICAgICAgfQ0KKyAgfQ0KKw0KKyAgZmlu
YWwgdm9pZCBzZXRTaG9ydEZpZWxkKE9iamVjdCBvYmosIHNob3J0IHZhbCkNCisgIHsNCisgICAg
ICB0cnkNCisgICAgICB7DQorCSAgZmllbGQuc2V0U2hvcnQob2JqLCB2YWwpOw0KKyAgICAgIH0N
CisgICAgICBjYXRjaChJbGxlZ2FsQWNjZXNzRXhjZXB0aW9uIHgpDQorICAgICAgew0KKwkgIHRo
cm93IG5ldyBJbnRlcm5hbEVycm9yKHguZ2V0TWVzc2FnZSgpKTsNCisgICAgICB9DQorICB9DQor
DQorICBmaW5hbCB2b2lkIHNldEludEZpZWxkKE9iamVjdCBvYmosIGludCB2YWwpDQorICB7DQor
ICAgICAgdHJ5DQorICAgICAgew0KKwkgIGZpZWxkLnNldEludChvYmosIHZhbCk7DQorICAgICAg
fQ0KKyAgICAgIGNhdGNoKElsbGVnYWxBY2Nlc3NFeGNlcHRpb24geCkNCisgICAgICB7DQorCSAg
dGhyb3cgbmV3IEludGVybmFsRXJyb3IoeC5nZXRNZXNzYWdlKCkpOw0KKyAgICAgIH0NCisgIH0N
CisNCisgIGZpbmFsIHZvaWQgc2V0TG9uZ0ZpZWxkKE9iamVjdCBvYmosIGxvbmcgdmFsKQ0KKyAg
ew0KKyAgICAgIHRyeQ0KKyAgICAgIHsNCisJICBmaWVsZC5zZXRMb25nKG9iaiwgdmFsKTsNCisg
ICAgICB9DQorICAgICAgY2F0Y2goSWxsZWdhbEFjY2Vzc0V4Y2VwdGlvbiB4KQ0KKyAgICAgIHsN
CisJICB0aHJvdyBuZXcgSW50ZXJuYWxFcnJvcih4LmdldE1lc3NhZ2UoKSk7DQorICAgICAgfQ0K
KyAgfQ0KKw0KKyAgZmluYWwgdm9pZCBzZXRGbG9hdEZpZWxkKE9iamVjdCBvYmosIGZsb2F0IHZh
bCkNCisgIHsNCisgICAgICB0cnkNCisgICAgICB7DQorCSAgZmllbGQuc2V0RmxvYXQob2JqLCB2
YWwpOw0KKyAgICAgIH0NCisgICAgICBjYXRjaChJbGxlZ2FsQWNjZXNzRXhjZXB0aW9uIHgpDQor
ICAgICAgew0KKwkgIHRocm93IG5ldyBJbnRlcm5hbEVycm9yKHguZ2V0TWVzc2FnZSgpKTsNCisg
ICAgICB9DQorICB9DQorDQorICBmaW5hbCB2b2lkIHNldERvdWJsZUZpZWxkKE9iamVjdCBvYmos
IGRvdWJsZSB2YWwpDQorICB7DQorICAgICAgdHJ5DQorICAgICAgew0KKwkgIGZpZWxkLnNldERv
dWJsZShvYmosIHZhbCk7DQorICAgICAgfQ0KKyAgICAgIGNhdGNoKElsbGVnYWxBY2Nlc3NFeGNl
cHRpb24geCkNCisgICAgICB7DQorCSAgdGhyb3cgbmV3IEludGVybmFsRXJyb3IoeC5nZXRNZXNz
YWdlKCkpOw0KKyAgICAgIH0NCisgIH0NCisNCisgIGZpbmFsIHZvaWQgc2V0T2JqZWN0RmllbGQo
T2JqZWN0IG9iaiwgT2JqZWN0IHZhbCkNCisgIHsNCisgICAgdHJ5DQorICAgICAgew0KKwlmaWVs
ZC5zZXQob2JqLCB2YWwpOw0KKyAgICAgIH0NCisgICAgY2F0Y2goSWxsZWdhbEFjY2Vzc0V4Y2Vw
dGlvbiB4KQ0KKyAgICAgIHsNCisJdGhyb3cgbmV3IEludGVybmFsRXJyb3IoeC5nZXRNZXNzYWdl
KCkpOw0KKyAgICAgIH0NCisgIH0NCit9DQo=

------_=_NextPart_001_01C3E743.B2E0D19A--



From MAILER-DAEMON Fri Jan 30 11:22:24 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AmbGb-0007Ai-8t
	for mharc-classpath@gnu.org; Fri, 30 Jan 2004 11:13:13 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AmbG3-0006yx-Ss
	for classpath@gnu.org; Fri, 30 Jan 2004 11:12:39 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AmbFA-0006kj-Rz
	for classpath@gnu.org; Fri, 30 Jan 2004 11:12:16 -0500
Received: from [217.8.192.21] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AmbFA-0006jh-Dn
	for classpath@gnu.org; Fri, 30 Jan 2004 11:11:44 -0500
Received: from [217.114.112.140] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 489229 for classpath@gnu.org;
	Fri, 30 Jan 2004 17:16:37 +0100
From: Sascha Brawer <brawer@dandelis.ch>
To: GNU Classpath <classpath@gnu.org>
Date: Fri, 30 Jan 2004 17:11:38 +0100
Message-Id: <20040130161138.2297@smtp.mail.ch.easynet.net>
In-Reply-To: <788B535AB1F9CB49BB9C229372B50ACC04C82C@LEMBU.sumatrasoftware.com>
References: <788B535AB1F9CB49BB9C229372B50ACC04C82C@LEMBU.sumatrasoftware.com>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: RFC: ObjectInputStream (and related classes) performance patch
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jan 2004 16:13:07 -0000

Jeroen Frijters <jeroen@sumatra.nl> wrote on Fri, 30 Jan 2004 16:13:55 +0100:

>+    Hashtable fieldLookup = new Hashtable();

A micro-optimization: All accesses to java.util.Hashtable are thread-
safe, which constitutes an overhead. Using java.util.HashMap would be
slightly faster.

-- Sascha

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





From MAILER-DAEMON Fri Jan 30 11:42:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ambhc-0002hL-VE
	for mharc-classpath@gnu.org; Fri, 30 Jan 2004 11:41:08 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ambgx-0001eU-W4
	for classpath@gnu.org; Fri, 30 Jan 2004 11:40:27 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AmbgA-0000Q7-FS
	for classpath@gnu.org; Fri, 30 Jan 2004 11:40:09 -0500
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ambfk-0008Vd-7B
	for classpath@gnu.org; Fri, 30 Jan 2004 11:39:12 -0500
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Fri, 30 Jan 2004 17:38:05 +0100
X-MIMEOLE: Produced By Microsoft Exchange V6.5.6944.0
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC04C82D@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: RFC: ObjectInputStream (and related classes) performance patch
Thread-Index: AcPnTM/bshC08IFPT9Gp0ModVEbNeAAAmrcA
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: "Sascha Brawer" <brawer@dandelis.ch>, "GNU Classpath" <classpath@gnu.org>
Cc: 
Subject: RE: RFC: ObjectInputStream (and related classes) performance patch
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jan 2004 16:41:01 -0000

Sascha Brawer wrote:
> Jeroen Frijters <jeroen@sumatra.nl> wrote on Fri, 30 Jan 2004=20
> 16:13:55 +0100:
>=20
> >+    Hashtable fieldLookup =3D new Hashtable();
>=20
> A micro-optimization: All accesses to java.util.Hashtable are thread-
> safe, which constitutes an overhead. Using java.util.HashMap would be
> slightly faster.

I actually considered that, but I didn't want to introduce another
dependency (the current code already uses Hashtable).

Thanks for looking at the code.

Regards,
Jeroen



From MAILER-DAEMON Fri Jan 30 14:35:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AmePu-0006vf-3J
	for mharc-classpath@gnu.org; Fri, 30 Jan 2004 14:35:02 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AmePr-0006uy-3L
	for classpath@gnu.org; Fri, 30 Jan 2004 14:34:59 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AmePL-0006hK-8z
	for classpath@gnu.org; Fri, 30 Jan 2004 14:34:58 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AmePK-0006gC-Q1
	for classpath@gnu.org; Fri, 30 Jan 2004 14:34:26 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0UJYKb26132;
	Fri, 30 Jan 2004 14:34:20 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0UJYJa12935; 
	Fri, 30 Jan 2004 14:34:19 -0500
Received: from toby.toronto.redhat.com (toby.toronto.redhat.com [172.16.14.35])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0UJYJXd024991; Fri, 30 Jan 2004 14:34:19 -0500
From: Olga Rodimina <rodimina@redhat.com>
To: java-patches@gcc.gnu.org
Content-Type: multipart/mixed; boundary="=-2l2PrMU0oeAnZszGeNFh"
Organization: 
Message-Id: <1075491258.12488.44.camel@toby.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 30 Jan 2004 14:34:18 -0500
Cc: classpath@gnu.org
Subject: [PATCH] Fixes to AffineTransform
X-BeenThere: classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Discussion of the implemenation of the core Java class libraries
	<classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/classpath>
List-Post: <mailto:classpath@gnu.org>
List-Help: <mailto:classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/classpath>,
	<mailto:classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jan 2004 19:34:59 -0000


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

Hi,

Here is the patch that fixes few errors in the AffineTransform class. 
It corrects a small error in shear transformation and fixes
createInverse() to return correct inverse matrix.



Olga.

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

? .snprj
? libjava.proj
? patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2631
diff -c -p -u -r1.2631 ChangeLog
--- ChangeLog	30 Jan 2004 13:43:14 -0000	1.2631
+++ ChangeLog	30 Jan 2004 19:27:24 -0000
@@ -1,3 +1,11 @@
+2004-01-30  Olga Rodimina  <rodimina@redhat.com>
+
+	* java/awt/geom/AffineTransform.java: 
+	(shear): Fixed few errors that caused shear
+	transformation to be performed incorrectly.
+	(createInverse): Fixed to return correct
+	inverse of the given matrix.
+
 2004-01-30  Mohan Embar  <gnustuff@thisiscool.com>
 
 	* gnu/java/net/PlainSocketImpl.java 
Index: java/awt/geom/AffineTransform.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/geom/AffineTransform.java,v
retrieving revision 1.7
diff -c -p -u -r1.7 AffineTransform.java
--- java/awt/geom/AffineTransform.java	17 Sep 2003 19:06:55 -0000	1.7
+++ java/awt/geom/AffineTransform.java	30 Jan 2004 19:27:26 -0000
@@ -738,9 +738,9 @@ public class AffineTransform implements 
    */
   public void shear(double shx, double shy)
   {
-    double n00 = m00 + shx * m01;
+    double n00 = m00 + shy * m01;
     double n01 = shx * m00 + m01;
-    double n10 = m10 * shy + m11;
+    double n10 = m10 + shy * m11;
     double n11 = shx * m10 + m11;
     m00 = n00;
     m01 = n01;
@@ -996,6 +996,38 @@ public class AffineTransform implements 
    * map multiple points to the same line or point). A transform exists only
    * if getDeterminant() has a non-zero value.
    *
+   * The inverse is calculated as:
+   * 
+   * <pre>
+   *
+   * Let A be the matrix for which we want to find the inverse:
+   *
+   * A = [ m00 m01 m02 ]
+   *     [ m10 m11 m12 ]
+   *     [ 0   0   1   ] 
+   *
+   *
+   *                 1    
+   * inverse (A) =  ---   x  adjoint(A) 
+   *                det 
+   *
+   *
+   *
+   *             =   1       [  m11  -m01   m01*m12-m02*m11  ]
+   *                ---   x  [ -m10   m00  -m00*m12+m10*m02  ]
+   *                det      [  0     0     m00*m11-m10*m01  ]
+   *
+   *
+   *
+   *             = [  m11/det  -m01/det   m01*m12-m02*m11/det ]
+   *               [ -m10/det   m00/det  -m00*m12+m10*m02/det ]
+   *               [   0           0          1               ]
+   *
+   *
+   * </pre>
+   *
+   *
+   *
    * @return a new inverse transform
    * @throws NoninvertibleTransformException if inversion is not possible
    * @see #getDeterminant()
@@ -1006,8 +1038,15 @@ public class AffineTransform implements 
     double det = getDeterminant();
     if (det == 0)
       throw new NoninvertibleTransformException("can't invert transform");
-    return new AffineTransform(m11 / det, -m10 / det, m01 / det, -m00 / det,
-                               -m02, -m12);
+    
+    double im00 = m11 / det;
+    double im10 = -m10 / det;
+    double im01 = -m01 / det;
+    double im11 = m00 / det;
+    double im02 = (m01 * m12 - m02 * m11) / det;
+    double im12 = (-m00 * m12 + m10 * m02) / det;
+    
+    return new AffineTransform (im00, im10, im01, im11, im02, im12);
   }
 
   /**

--=-2l2PrMU0oeAnZszGeNFh--




