Re: [cp-patches] FYI: javax.tools stuff
On Wed, Jan 09, 2008 at 11:13:00PM +0100, Roman Kennke wrote:
I'm beginning the implementation of javax.tools with two interfaces.
2006-01-09 Roman Kennke [EMAIL PROTECTED]
* javax/tools/Diagnostic.java,
* javax/tools/DiagnosticListener.java:
New interfaces.
Hmmm, that doesnt fit the patch below somehow ;-)
Cheers,
Michael
/Roman
--
http://kennke.org/blog/
Index: gnu/java/awt/peer/x/XWindowPeer.java
===
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/x/XWindowPeer.java,v
retrieving revision 1.5
diff -u -1 -0 -r1.5 XWindowPeer.java
--- gnu/java/awt/peer/x/XWindowPeer.java 20 Sep 2007 14:01:09 -
1.5
+++ gnu/java/awt/peer/x/XWindowPeer.java 9 Jan 2008 22:05:08 -
@@ -54,20 +54,21 @@
import java.awt.Rectangle;
import java.awt.event.PaintEvent;
import java.awt.event.WindowEvent;
import java.awt.image.VolatileImage;
import gnu.x11.Atom;
import gnu.x11.Window;
import gnu.x11.event.Event;
import gnu.java.awt.font.OpenTypeFontPeer;
+import gnu.java.awt.peer.ClasspathFontPeer;
import gnu.java.awt.peer.swing.SwingWindowPeer;
public class XWindowPeer
extends SwingWindowPeer
{
private static int standardSelect = Event.BUTTON_PRESS_MASK
| Event.BUTTON_RELEASE_MASK
| Event.POINTER_MOTION_MASK
//| Event.RESIZE_REDIRECT_MASK
@@ -283,22 +284,21 @@
return (Insets) insets.clone();
}
/**
* Returns the font metrics for the specified font.
*
* @return the font metrics for the specified font
*/
public FontMetrics getFontMetrics(Font font)
{
-// FIXME: Fix this for X fonts.
-OpenTypeFontPeer fontPeer = (OpenTypeFontPeer) font.getPeer();
+ClasspathFontPeer fontPeer = (ClasspathFontPeer) font.getPeer();
return fontPeer.getFontMetrics(font);
}
/**
* Unregisters the window in the event pump when it is closed.
*/
protected void finalize()
{
XGraphicsDevice dev = XToolkit.getDefaultDevice();
dev.getEventPump().unregisterWindow(xwindow);
[cp-patches] Fix alsa support with GCC 4.2
Hello list, I just committed the attached patch. It removes the @ERROR_CFLAGS@ variable from AM_CFLAGS in native/jni/midi-alsa/Makefile.am. In general it would be possible to suppress the warning with -Wno-address. But this option was introduced with GCC 4.2 and earlier versions fail because they dont know that option. Cheers, Michael 2007-09-08 Michael Koch [EMAIL PROTECTED] * native/jni/midi-alsa/Makefile.am (AM_CFLAGS): Removed @ERROR_CFLAGS@ to not fail build with GCC 4.2. Index: native/jni/midi-alsa/Makefile.am === RCS file: /sources/classpath/classpath/native/jni/midi-alsa/Makefile.am,v retrieving revision 1.5 diff -a -u -r1.5 Makefile.am --- native/jni/midi-alsa/Makefile.am 5 Apr 2007 12:05:48 - 1.5 +++ native/jni/midi-alsa/Makefile.am 8 Sep 2007 07:00:28 - @@ -8,5 +8,5 @@ libgjsmalsa_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version AM_LDFLAGS = @CLASSPATH_MODULE@ -AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config --cflags-only-I alsa` -AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ `pkg-config --cflags-only-other alsa` +AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config --cflags-only-I alsa` +AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ `pkg-config --cflags-only-other alsa`
Re: [cp-patches] Guidelines for annotations?
On Fri, Mar 09, 2007 at 08:25:37PM +0100, Mario Torre wrote: Il giorno ven, 09/03/2007 alle 10.35 -0800, Keith Seitz ha scritto: @Override public void foo(); I suggest this one. It seems more clear to me. +1 Cheers, Michael -- .''`. | Michael Koch [EMAIL PROTECTED] : :' : | Free Java Developer http://www.classpath.org `. `' | `-| 1024D/BAC5 4B28 D436 95E6 F2E0 BD11 5923 A008 2763 483B
Re: [cp-patches] Guidelines for annotations?
On Fri, Mar 09, 2007 at 12:05:42PM -0800, Keith Seitz wrote: Tom Tromey wrote: Mario == Mario Torre [EMAIL PROTECTED] writes: @Override public void foo(); Me too. Three votes... maybe the motion passes? :) So that's several votes for this style already. One last question: what about comments/javadoc? 1) Before @Override /** * foo */ 2) After /** * foo */ @Override I presume most people would prefer #1? +1 for 2. Michael -- .''`. | Michael Koch [EMAIL PROTECTED] : :' : | Free Java Developer http://www.classpath.org `. `' | `-| 1024D/BAC5 4B28 D436 95E6 F2E0 BD11 5923 A008 2763 483B
Re: [cp-patches] FYI: JTable fixlet:Mail Message possibly broken?
On Tue, Jul 25, 2006 at 08:42:58AM +0200, Audrius Meskauskas wrote: The Thunderbird cannot open the attached patch which should be even not compressed. I can easily open all other patches, including the patch on LightweightDispatcher form Roman today. I would suggest to resend for the peace of mind. Its a 0-byte diff. This just means no changes. :-) Michael -- http://www.worldforge.org/
Re: [cp-patches] FYI: X peers
On Sat, Jul 01, 2006 at 10:33:10AM +0200, Roman Kennke wrote: Hi Raif, Am Samstag, den 01.07.2006, 09:24 +1000 schrieb Raif S. Naffah: hello Roman, On Friday 30 June 2006 01:27, Roman Kennke wrote: I checked in the Escher-based X peers and added some configury for enabling it. To build the X peers you need the most recent Escher library, to be found here: http://kennke.org/~roman/escher-0.3.0.jar Configure with: --with-escher=/path/to/escher-0.3.0.jar --enable-local-sockets would it make sense to create a new folder, say external-jars and include the latest escher (and other java-only external dependencies) jar(s) there. --with-escher can use that jar/location by default, otherwise the full path to a distro's/user's location of that jar can be fed to configure. This makes sense. I am all for it. Mark proposed to put jars that are (optionally) needed for classpath on http://builder.classpath.org/ somewhere. What do others think? Don't put jars without sources into classpath releases. Otherwise Distros will need to alter the upstream tarball and remove this. And altering removes the feature that people can easily check if the upstream sources used by a distro is really what upstream released. Michael -- http://www.worldforge.org/
Re: [cp-patches] FYI: X peers
On Sat, Jul 01, 2006 at 08:22:46PM +1000, Raif S. Naffah wrote: hello Michael, On Saturday 01 July 2006 20:05, Michael Koch wrote: On Sat, Jul 01, 2006 at 10:33:10AM +0200, Roman Kennke wrote: Am Samstag, den 01.07.2006, 09:24 +1000 schrieb Raif S. Naffah: On Friday 30 June 2006 01:27, Roman Kennke wrote: I checked in the Escher-based X peers and added some configury for enabling it. To build the X peers you need the most recent Escher library, to be found here: http://kennke.org/~roman/escher-0.3.0.jar Configure with: --with-escher=/path/to/escher-0.3.0.jar --enable-local-sockets would it make sense to create a new folder, say external-jars and include the latest escher (and other java-only external dependencies) jar(s) there. --with-escher can use that jar/location by default, otherwise the full path to a distro's/user's location of that jar can be fed to configure. This makes sense. I am all for it. Mark proposed to put jars that are (optionally) needed for classpath on http://builder.classpath.org/ somewhere. What do others think? Don't put jars without sources into classpath releases. Otherwise Distros will need to alter the upstream tarball and remove this. And altering removes the feature that people can easily check if the upstream sources used by a distro is really what upstream released. would including the jar of the sources --e.g. escher-0.3.0.jar and escher-0.3.0-src.jar-- address that concern. Not for Debian as this makes it impossible to patch security issues easily. Cheers, Michael -- http://www.worldforge.org/
Re: [cp-patches] X/Escher peers
On Thu, Jun 29, 2006 at 11:28:52PM +0100, Andrew John Hughes wrote: I second that. Putting it in external/ would be best, at least until the distributions pick up on it and start including it in a uniform way. I second that too. But please do it in a way where distros can decide the use the one in external/ or the system installed escher. Michael -- http://www.worldforge.org/
Re: [cp-patches] RFC: GConf preference api backend
On Tue, Jun 20, 2006 at 08:29:04PM +0200, Mario Torre wrote: Using a root of /apps/java makes it clear we are storing java things there, if Sun implements a GConf based backend (or if someone likes my standalone plugin :) they likely will use this name (apps is standard for application in GConf, java is actually the name of the application, all java application are registered as java, isn't it?). Other than that, I have no objections against it, so changing this name is ok for me. We normally avoid the term java as its a registered trademark. We normally prefer the term classpath in our community. There are other opinions like Java is an island (MJ Ray on debian-legal ML). Cheers, Michael -- http://www.worldforge.org/
Re: [cp-patches] RFC: GConf preference api backend
On Sun, Jun 18, 2006 at 11:15:26AM +0200, Mark Wielaard wrote: Hi Michael, On Sat, 2006-06-17 at 18:07 +0200, Michael Koch wrote: As Mario has no CVS access yet I commited this for him. If you commit something for someone else you MUST make sure that it compiles cleanly, even with --enable-Werror and --enable-regen-headers The following fixes the build: Sigh. As Tom approved it and Mario told me its fine I just commited it. Another excercise for me not to just do this. Isn't --enable-Werror the default anyway? Cheers, Michael -- http://www.worldforge.org/
Re: [cp-patches] RFC: GConf preference api backend
On Fri, Jun 16, 2006 at 01:56:13PM -0400, Thomas Fitzsimmons wrote: Thanks for this contribution! (FWIW, I wouldn't object if you wanted to make this the default backend now). Please commit, As Mario has no CVS access yet I commited this for him. Cheers, Michael -- http://www.worldforge.org/
Re: [cp-patches] [generics] Patch: RFC: import jsr166
On Thu, Jun 08, 2006 at 10:34:57AM +0200, Jeroen Frijters wrote: Also, I've cleaned up my version of AnnotationInvocationHandler and will post it shortly. That would be great, then I can post my jamvm patch to use this too. Cheers, Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/
Re: [cp-patches] RFC: AnnotationInvocationHandler
On Thu, Jun 08, 2006 at 11:05:53AM +0200, Jeroen Frijters wrote: Hi, As promised here is my cleaned up version of AnnotationInvocationHandler. I intend to check this into the trunk. Thanks. Please use a Unix file encoding when checking it in (line endings). Cheers Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/
Re: [cp-patches] FYI: rename libjawtgnu.so to libjawt.so
On Fri, May 26, 2006 at 01:50:10PM -0400, Thomas Fitzsimmons wrote: Hi, applications that use the AWT Native Interface refer to libjawt.so. For binary compatibility with other AWT Native Interface implementations our .so must be named the same. Note to packagers: libjawt.so should be installed in VM-specific directory rather than directly in /usr/lib. Proprietary VMs put their libjawt.so implementations in VM-specific directories but search /usr/lib first. If GNU Classpath's libjawt.so is installed in /usr/lib it will create problems for people using a proprietary VM to run AWT Native Interface apps. This should also be mentioned in the NEWS file. Cheers, Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/
Re: [cp-patches] FYI: Socket timeout impl and fix
On Sat, May 13, 2006 at 04:54:02PM +0200, Sven de Marothy wrote: On Sat, 2006-05-13 at 13:54 +0200, Robert Schuster wrote: Hi, could you test whether Socket.setSoTimeout() really sets the send and receive timeout? I did, and it seems to work fine for me (A difference in 3 minutes and 1 second timeout when you're setting it to 1 second is quite noticable). Note that from what I read though, not all socket implementations necessarily support this stuff. AFAIK Linux is the only one. If we want to stay portable we need to use select() and wait for the time of the timeout. In libgcj its already handled this way. Thats the safest. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/
Re: [cp-patches] FYI: Socket timeout impl and fix
On Sat, May 13, 2006 at 05:11:16PM +0200, Sven de Marothy wrote: On Sat, 2006-05-13 at 16:58 +0200, Michael Koch wrote: AFAIK Linux is the only one. If we want to stay portable we need to use select() and wait for the time of the timeout. In libgcj its already handled this way. Thats the safest. Actually, I don't think we need to stay portable though. The JDK docs say: Some non-standard implmentation of this method may ignore the specified timeout. So.. Presumably, Solaris supports it too. But we don't need to though. Anyway, this is still better than before when it didn't work at all :) Well, it will still be broken an most if not all non-Linux Unices. Even on older (2.4 or older) Linuxes it will be broken. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/
Re: [cp-patches] RFC: defaultLocale changes
On Tue, Apr 11, 2006 at 05:40:17PM +0200, Christian Thalinger wrote:
On Wed, Mar 22, 2006 at 11:23:50AM +0100, Christian Thalinger wrote:
On Tue, 2006-03-14 at 16:56 +0100, Michael Koch wrote:
Together with a mauve testcase that proves this I'm fine with it. :-)
(as I told you on IRC)
Ok, I'm unable to write a mauve testcase for that. The problem is:
$ cat test.java
import java.util.*;
public class test {
public static void main(String[] argv) {
System.out.println(Locale.getDefault());
}
}
[EMAIL PROTECTED]:~/src/cacao$ env | grep LANG
[EMAIL PROTECTED]:~/src/cacao$ cacao test
en
[EMAIL PROTECTED]:~/src/cacao$ java1.4 test
en_US
[EMAIL PROTECTED]:~/src/cacao$ cacao -Duser.country=YY test
en
[EMAIL PROTECTED]:~/src/cacao$ java1.4 -Duser.country=YY test
en_YY
That makes some problems in mauve tests.
Hey!
I really don't want to forget that bugfix... Can we get that in?
Please do.
Cheers,
Michael
--
http://www.worldforge.org/
Re: [cp-patches] Generating jarsigner script
On Sun, Mar 26, 2006 at 04:08:30PM +1100, Raif S. Naffah wrote: +# -* bash *- + +java gnu.classpath.tools.jarsigner.Main $@ You should add a a shebang line to this file: #!/bin/sh The questions is if we should hardcode java or better check for a java executable in configure.ac and use $(JAVA) in the script. Index: configure.ac === RCS file: /cvsroot/classpath/classpath/configure.ac,v retrieving revision 1.139 diff -u -r1.139 configure.ac --- configure.ac 10 Mar 2006 01:36:10 - 1.139 +++ configure.ac 26 Mar 2006 04:59:44 - @@ -248,6 +248,8 @@ AC_PROG_CC AC_PROG_CPP +AC_PATH_PROGS(BASH, bash sh) I think we can depend on the fact that a posix compatible shell is installed on the system when configure can be run. And there is no need to depend on bash. We need no bashisms. BTW: Its good that you start this discussion now as I soon want to import my policytool replacement. ;-) Cheers, Michael -- http://www.worldforge.org/
Re: [cp-patches] Re: RFC: gdkpixbuf looking vs main gdk lock
On Mon, Mar 20, 2006 at 01:28:30PM -0500, Thomas Fitzsimmons wrote: On Mon, 2006-03-20 at 19:20 +0100, Mark Wielaard wrote: Hi Rob, On Mon, 2006-03-20 at 15:37 +, Robert Lougher wrote: On 3/20/06, Mark Wielaard [EMAIL PROTECTED] wrote: Done. If you have a scroll mouse please try out WW2D with Cacao (I didn't get it working with jamvm yet, which seems to crash after loading jawt). What version of JamVM are you using (i.e. is it CVS or a released version)? Can you give details as to how to reproduce? Sorry for the vague bug report. It is with the last release of jamvm 1.4.2. To be really honest I cannot remember how to recreate the libjawt.so from the one in /usr/local/classpath/lib/classpath The jogl library is very specific in how it wants this named and loaded. If you have that (Christian/Tom?) then you can replicate the issue with the instructions (just replace cacao with jamvm) of http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=348504 We use this invocation in java-gcj-compat: echo | gcc -shared -O2 -fPIC -o libjawt.so -Wl,-soname,libjawt.so -xc - -lgcjawt to create a binary-compatible replacement for Sun's libjawt.so. (Note that libgcj's version of libjawtgnu.so is called libgcjawt.so. I would like to change this and have all free runtime environments standardize on the name libjawtgnu.so). Why do we use another name then libjawt.so anyway? The lib is put into $prefix/lib/classpath anyway and will never collide with SUNs. And we dont need do such a hack as Tom mentioned for java-gcj-compat (which is not really needed either, IMO). When classpath uses a different name every runtime depending on it need do some hack to rename it to libjawt.so again as real world apps do System.loadLibrary(jawt);. Cheers, Michael -- http://www.worldforge.org/
Re: [cp-patches] [Patch] locale data update - part 2
On Mon, Mar 20, 2006 at 03:33:42PM +0100, Mark Wielaard wrote: Hi Michael, On Sun, 2006-03-19 at 22:40 +, Michael Koch wrote: I just commited another update for the locale data update to CLDR 1.3. The only things still missing is the update of the currency formats and the new locales. Could you take a quick look at the following regressions (and one improvement!) pointed out by builder.classpath.org? On Mon, 2006-03-20 at 11:07 +, [EMAIL PROTECTED] wrote: Baseline from: Mon Mar 20 00:20:23 UTC 2006 Regressions: FAIL: gnu.testlet.java.lang.Thread.sleep: Interrupted sleep (number 2) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 1) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 10) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 11) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 12) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 15) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 16) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 17) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 2) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 20) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 21) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 22) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 23) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 24) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 25) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 5) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 6) FAIL: gnu.testlet.locales.LocaleTest: numberformats locale: fi_FI (number 7) Improvements: PASS: gnu.testlet.java.text.SimpleDateFormat.regress: CDT (number 1) The sleep one seems spurious and not important. It certainly isn't caused by the locale update. I commited a fixed test to mauve. The problem is that this testcase checks that classpath returns the correct data are returned. Unfortunately the old correct data were incorrect with. Cheers, Michael -- http://www.worldforge.org/
Re: [cp-patches] Re: [commit-cp] classpath ./ChangeLog gnu/java/lang/ClassHelper... [generics-branch]
On Sat, Mar 25, 2006 at 04:41:02PM +, Andrew John Hughes wrote: On Sat, 2006-03-25 at 10:41 +0100, Mark Wielaard wrote: Hi Andrew, Nice to see you update the generics branch. But can you post to the patches list when you do so others are kept in the loop? I am curious why just this batch of patches. Please go ahead with sending patch summarizes as you did in the past. That is verbose and noisy enough. ;-) Cheers, Michael -- http://www.worldforge.org/
[cp-patches] [Patch] added news entry about cldr 1.3 update
Hello list, I added a news entry to our NEWS file that we now support CLDR 1.3. Cheers, Michael 2006-03-25 Michael Koch [EMAIL PROTECTED] * NEWS: Added item for CLDR 1.3 update. Index: NEWS === RCS file: /sources/classpath/classpath/NEWS,v retrieving revision 1.127 diff -u -r1.127 NEWS --- NEWS24 Mar 2006 11:42:44 - 1.127 +++ NEWS25 Mar 2006 20:28:11 - @@ -15,6 +15,7 @@ and turned on as default Metal theme. X11-style Copy and Paste behavior in text components with the middle mouse button. Support cursor changes on various components when resizing. +* Updated locale data information to CLDR 1.3. Runtime interface changes:
[cp-patches] [Patch] removed locales for cldr 1.3 compatibility
Hi list, I commited the attached patch to remove the locales that gor removed in CLDR 1.3. Michael 2006-03-25 Michael Koch [EMAIL PROTECTED] * resource/gnu/java/locale/LocaleInformation_ar_IN.properties, resource/gnu/java/locale/LocaleInformation_ar_IQ.properties, resource/gnu/java/locale/LocaleInformation_ar_KW.properties, resource/gnu/java/locale/LocaleInformation_ar_LY.properties, resource/gnu/java/locale/LocaleInformation_mn_MN.properties, resource/gnu/java/locale/LocaleInformation_uz_AF.properties: Removed locales. Index: resource/gnu/java/locale/LocaleInformation_ar_IN.properties === RCS file: resource/gnu/java/locale/LocaleInformation_ar_IN.properties diff -N resource/gnu/java/locale/LocaleInformation_ar_IN.properties --- resource/gnu/java/locale/LocaleInformation_ar_IN.properties 19 May 2005 06:44:27 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,16 +0,0 @@ -# LocaleInformation_ar_IN.properties -- -# Copyright (C) 1991-2005 Unicode, Inc. -# All rights reserved. Distributed under the Terms of Use -# in http://www.unicode.org/copyright.html. -# -# This file was automatically generated by gnu.localegen from CLDR. - -percentFormat=##,##,##0% -currencyFormat=\u00a4 ##,##,##0.00;-\u00a4 ##,##,##0.00 -firstDayOfWeek=mon -shortDateFormat=d-M-yy -mediumDateFormat=dd-MM- -longDateFormat=d -fullDateFormat= d -longTimeFormat=h:mm:ss a z -fullTimeFormat=h:mm:ss a z Index: resource/gnu/java/locale/LocaleInformation_ar_IQ.properties === RCS file: resource/gnu/java/locale/LocaleInformation_ar_IQ.properties diff -N resource/gnu/java/locale/LocaleInformation_ar_IQ.properties --- resource/gnu/java/locale/LocaleInformation_ar_IQ.properties 19 May 2005 06:44:27 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,8 +0,0 @@ -# LocaleInformation_ar_IQ.properties -- -# Copyright (C) 1991-2005 Unicode, Inc. -# All rights reserved. Distributed under the Terms of Use -# in http://www.unicode.org/copyright.html. -# -# This file was automatically generated by gnu.localegen from CLDR. - -currencyFormat=\u00a4 #,##0.000;\u00a4 #,##0.000- Index: resource/gnu/java/locale/LocaleInformation_ar_KW.properties === RCS file: resource/gnu/java/locale/LocaleInformation_ar_KW.properties diff -N resource/gnu/java/locale/LocaleInformation_ar_KW.properties --- resource/gnu/java/locale/LocaleInformation_ar_KW.properties 19 May 2005 06:44:27 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,8 +0,0 @@ -# LocaleInformation_ar_KW.properties -- -# Copyright (C) 1991-2005 Unicode, Inc. -# All rights reserved. Distributed under the Terms of Use -# in http://www.unicode.org/copyright.html. -# -# This file was automatically generated by gnu.localegen from CLDR. - -currencyFormat=\u00a4 #,##0.000;\u00a4 #,##0.000- Index: resource/gnu/java/locale/LocaleInformation_ar_LY.properties === RCS file: resource/gnu/java/locale/LocaleInformation_ar_LY.properties diff -N resource/gnu/java/locale/LocaleInformation_ar_LY.properties --- resource/gnu/java/locale/LocaleInformation_ar_LY.properties 19 May 2005 06:44:27 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,8 +0,0 @@ -# LocaleInformation_ar_LY.properties -- -# Copyright (C) 1991-2005 Unicode, Inc. -# All rights reserved. Distributed under the Terms of Use -# in http://www.unicode.org/copyright.html. -# -# This file was automatically generated by gnu.localegen from CLDR. - -currencyFormat=\u00a4 #,##0.000;\u00a4 #,##0.000- Index: resource/gnu/java/locale/LocaleInformation_mn_MN.properties === RCS file: resource/gnu/java/locale/LocaleInformation_mn_MN.properties diff -N resource/gnu/java/locale/LocaleInformation_mn_MN.properties --- resource/gnu/java/locale/LocaleInformation_mn_MN.properties 19 May 2005 06:44:28 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,9 +0,0 @@ -# LocaleInformation_mn_MN.properties -- -# Copyright (C) 1991-2005 Unicode, Inc. -# All rights reserved. Distributed under the Terms of Use -# in http://www.unicode.org/copyright.html. -# -# This file was automatically generated by gnu.localegen from CLDR. - -currenciesDisplayName.MNT=MNT -currenciesSymbol.MNT=\u20ae Index: resource/gnu/java/locale/LocaleInformation_uz_AF.properties === RCS file: resource/gnu/java/locale/LocaleInformation_uz_AF.properties diff -N resource/gnu/java/locale/LocaleInformation_uz_AF.properties --- resource/gnu/java/locale/LocaleInformation_uz_AF.properties 21 May 2005 21:22:31 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,35 +0,0
[cp-patches] [Patch] currency formats in locale data
Hi list, I updated our locale data to have the fixed currency formats from CLDR 1.3. Cheers, Michael 2006-03-25 Michael Koch [EMAIL PROTECTED] * resource/gnu/java/locale/LocaleInformation_ar_JO.properties, resource/gnu/java/locale/LocaleInformation_ar_QA.properties, resource/gnu/java/locale/LocaleInformation_ar_SA.properties, resource/gnu/java/locale/LocaleInformation_ar_SY.properties, resource/gnu/java/locale/LocaleInformation_ar_TN.properties, resource/gnu/java/locale/LocaleInformation_ar_YE.properties, resource/gnu/java/locale/LocaleInformation_as_IN.properties, resource/gnu/java/locale/LocaleInformation_be_BY.properties, resource/gnu/java/locale/LocaleInformation_bn_IN.properties, resource/gnu/java/locale/LocaleInformation_en.properties, resource/gnu/java/locale/LocaleInformation_en_IN.properties, resource/gnu/java/locale/LocaleInformation_en_PK.properties, resource/gnu/java/locale/LocaleInformation_en_US_POSIX.properties, resource/gnu/java/locale/LocaleInformation_es_PY.properties, resource/gnu/java/locale/LocaleInformation_fa.properties, resource/gnu/java/locale/LocaleInformation_fa_AF.properties, resource/gnu/java/locale/LocaleInformation_fa_IR.properties, resource/gnu/java/locale/LocaleInformation_gu_IN.properties, resource/gnu/java/locale/LocaleInformation_hi_IN.properties, resource/gnu/java/locale/LocaleInformation_ja_JP.properties, resource/gnu/java/locale/LocaleInformation_kn_IN.properties, resource/gnu/java/locale/LocaleInformation_mr_IN.properties, resource/gnu/java/locale/LocaleInformation_or_IN.properties, resource/gnu/java/locale/LocaleInformation_pa.properties, resource/gnu/java/locale/LocaleInformation_pa_IN.properties, resource/gnu/java/locale/LocaleInformation_ps_AF.properties, resource/gnu/java/locale/LocaleInformation_ru_RU.properties, resource/gnu/java/locale/LocaleInformation_sa.properties, resource/gnu/java/locale/LocaleInformation_sa_IN.properties, resource/gnu/java/locale/LocaleInformation_ta_IN.properties, resource/gnu/java/locale/LocaleInformation_te_IN.properties: Updated currency formats. Index: resource/gnu/java/locale/LocaleInformation_ar_JO.properties === RCS file: /sources/classpath/classpath/resource/gnu/java/locale/LocaleInformation_ar_JO.properties,v retrieving revision 1.1 diff -u -r1.1 LocaleInformation_ar_JO.properties --- resource/gnu/java/locale/LocaleInformation_ar_JO.properties 19 May 2005 06:44:27 - 1.1 +++ resource/gnu/java/locale/LocaleInformation_ar_JO.properties 25 Mar 2006 20:04:58 - @@ -5,7 +5,6 @@ # # This file was automatically generated by gnu.localegen from CLDR. -currencyFormat=\u00a4 #,##0.000;\u00a4 #,##0.000- shortMonths=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a®\u0634\u0628\u0627\u0637®\u0622\u0630\u0627\u0631®\u0646\u064a\u0633\u0627\u0646®\u0623\u064a\u0627\u0631®\u062d\u0632\u064a\u0631\u0627\u0646®\u062a\u0645\u0648\u0632®\u0622\u0628®\u0623\u064a\u0644\u0648\u0644®\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644®\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a®\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644®® months=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a®\u0634\u0628\u0627\u0637®\u0622\u0630\u0627\u0631®\u0646\u064a\u0633\u0627\u0646®\u0623\u064a\u0627\u0631®\u062d\u0632\u064a\u0631\u0627\u0646®\u062a\u0645\u0648\u0632®\u0622\u0628®\u0623\u064a\u0644\u0648\u0644®\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644®\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a®\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644®® shortWeekdays=®\u0627\u0644\u0623\u062d\u062f®\u0627\u0644\u0627\u062b\u0646\u064a\u0646®\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621®\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621®\u0627\u0644\u062e\u0645\u064a\u0633®\u0627\u0644\u062c\u0645\u0639\u0629®\u0627\u0644\u0633\u0628\u062a® Index: resource/gnu/java/locale/LocaleInformation_ar_QA.properties === RCS file: /sources/classpath/classpath/resource/gnu/java/locale/LocaleInformation_ar_QA.properties,v retrieving revision 1.1 diff -u -r1.1 LocaleInformation_ar_QA.properties --- resource/gnu/java/locale/LocaleInformation_ar_QA.properties 19 May 2005 06:44:27 - 1.1 +++ resource/gnu/java/locale/LocaleInformation_ar_QA.properties 25 Mar 2006 20:04:58 - @@ -5,5 +5,5 @@ # # This file was automatically generated by gnu.localegen from CLDR. -currencyFormat=\u00a4###0.00;-\u00a4###0.00 +currencyFormat=\u00a4#0.00;-\u00a4#0.00 shortWeekdays=®\u0627\u0644\u0623\u062d\u062f®\u0627\u0644\u0627\u062b\u0646
[cp-patches] [Patch] randome locale data udpates
Hello, I forgot to commit some randome fixes to our locale data earlier. Cheers, Michael 2006-03-25 Michael Koch [EMAIL PROTECTED] * resource/gnu/java/locale/LocaleInformation_fa.properties, resource/gnu/java/locale/LocaleInformation_kn.properties, resource/gnu/java/locale/LocaleInformation_kn_IN.properties, resource/gnu/java/locale/LocaleInformation_ko.properties, resource/gnu/java/locale/LocaleInformation_sl.properties, resource/gnu/java/locale/LocaleInformation_so.properties, resource/gnu/java/locale/LocaleInformation_so_DJ.properties, resource/gnu/java/locale/LocaleInformation_so_ET.properties, resource/gnu/java/locale/LocaleInformation_so_SO.properties, resource/gnu/java/locale/LocaleInformation_sr.properties: Random fixes I forgot to commit before. Index: resource/gnu/java/locale/LocaleInformation_fa.properties === RCS file: /sources/classpath/classpath/resource/gnu/java/locale/LocaleInformation_fa.properties,v retrieving revision 1.5 diff -u -r1.5 LocaleInformation_fa.properties --- resource/gnu/java/locale/LocaleInformation_fa.properties25 Mar 2006 20:06:20 - 1.5 +++ resource/gnu/java/locale/LocaleInformation_fa.properties25 Mar 2006 20:12:08 - @@ -12,7 +12,6 @@ decimalSeparator=\u066b groupingSeparator=\u066c percentFormat='\u202a'%#,##0'\u202c' -currenciesDisplayName.AFA=\u0627\u0641\u063a\u0627\u0646\u06cc currencyFormat=#,##0.00 \u00a4;'\u202a'-#,##0.00'\u202c' \u00a4 currenciesDisplayName.CHF=\u0641\u0631\u0627\u0646\u06a9 \u0633\u0648\u0626\u06cc\u0633 currenciesDisplayName.AUD=\u062f\u0644\u0627\u0631 \u0627\u0633\u062a\u0631\u0627\u0644\u06cc\u0627 Index: resource/gnu/java/locale/LocaleInformation_kn.properties === RCS file: /sources/classpath/classpath/resource/gnu/java/locale/LocaleInformation_kn.properties,v retrieving revision 1.1 diff -u -r1.1 LocaleInformation_kn.properties --- resource/gnu/java/locale/LocaleInformation_kn.properties19 May 2005 06:44:27 - 1.1 +++ resource/gnu/java/locale/LocaleInformation_kn.properties25 Mar 2006 20:12:08 - @@ -5,7 +5,7 @@ # # This file was automatically generated by gnu.localegen from CLDR. -currenciesSymbol.INR=\u0930\u0941 +currenciesSymbol.INR=\u0cb0\u0cc2 shortMonths=\u0c9c\u0ca8\u0cb5\u0cb0\u0cc0®\u0cab\u0cc6\u0cac\u0ccd\u0cb0\u0cb5\u0cb0\u0cc0®\u0cae\u0cbe\u0cb0\u0ccd\u0c9a\u0ccd®\u0c8e\u0caa\u0ccd\u0cb0\u0cbf\u0cb2\u0ccd®\u0cae\u0cc6®\u0c9c\u0cc2\u0ca8\u0ccd®\u0c9c\u0cc1\u0cb2\u0cc8®\u0c86\u0c97\u0cb8\u0ccd\u0c9f\u0ccd®\u0cb8\u0caa\u0ccd\u0c9f\u0cc6\u0c82\u0cac\u0cb0\u0ccd®\u0c85\u0c95\u0ccd\u0c9f\u0ccb\u0cac\u0cb0\u0ccd®\u0ca8\u0cb5\u0cc6\u0c82\u0cac\u0cb0\u0ccd®\u0ca1\u0cbf\u0cb8\u0cc6\u0c82\u0cac\u0cb0\u0ccd®® months=\u0c9c\u0ca8\u0cb5\u0cb0\u0cc0®\u0cab\u0cc6\u0cac\u0ccd\u0cb0\u0cb5\u0cb0\u0cc0®\u0cae\u0cbe\u0cb0\u0ccd\u0c9a\u0ccd®\u0c8e\u0caa\u0ccd\u0cb0\u0cbf\u0cb2\u0ccd®\u0cae\u0cc6®\u0c9c\u0cc2\u0ca8\u0ccd®\u0c9c\u0cc1\u0cb2\u0cc8®\u0c86\u0c97\u0cb8\u0ccd\u0c9f\u0ccd®\u0cb8\u0caa\u0ccd\u0c9f\u0cc6\u0c82\u0cac\u0cb0\u0ccd®\u0c85\u0c95\u0ccd\u0c9f\u0ccb\u0cac\u0cb0\u0ccd®\u0ca8\u0cb5\u0cc6\u0c82\u0cac\u0cb0\u0ccd®\u0ca1\u0cbf\u0cb8\u0cc6\u0c82\u0cac\u0cb0\u0ccd®® shortWeekdays=®\u0cb0.®\u0cb8\u0ccb.®\u0cae\u0c82.®\u0cac\u0cc1.®\u0c97\u0cc1.®\u0cb6\u0cc1.®\u0cb6\u0ca8\u0cbf.® Index: resource/gnu/java/locale/LocaleInformation_kn_IN.properties === RCS file: /sources/classpath/classpath/resource/gnu/java/locale/LocaleInformation_kn_IN.properties,v retrieving revision 1.2 diff -u -r1.2 LocaleInformation_kn_IN.properties --- resource/gnu/java/locale/LocaleInformation_kn_IN.properties 25 Mar 2006 20:06:20 - 1.2 +++ resource/gnu/java/locale/LocaleInformation_kn_IN.properties 25 Mar 2006 20:12:08 - @@ -5,7 +5,7 @@ # # This file was automatically generated by gnu.localegen from CLDR. -percentFormat=##,##,##0% +percentFormat=#,##,##0% currencyFormat=\u00a4 #,##,##0.00;-\u00a4 #,##,##0.00 firstDayOfWeek=mon shortDateFormat=d-M-yy Index: resource/gnu/java/locale/LocaleInformation_ko.properties === RCS file: /sources/classpath/classpath/resource/gnu/java/locale/LocaleInformation_ko.properties,v retrieving revision 1.3 diff -u -r1.3 LocaleInformation_ko.properties --- resource/gnu/java/locale/LocaleInformation_ko.properties18 Mar 2006 08:29:08 - 1.3 +++ resource/gnu/java/locale/LocaleInformation_ko.properties25 Mar 2006 20:12:08 - @@ -239,14 +239,14 @@ currenciesSymbol.MRO=UM currenciesSymbol.KRW=\uffe6 currenciesSymbol.IEP=IR\u00a3 +currenciesSymbol.ITL=ITL +currenciesSymbol.USD=US$ shortMonths=1\uc6d4®2\uc6d4®3\uc6d4®4\uc6d4®5\uc6d4®6\uc6d4®7\uc6d4®8\uc6d4®9\uc6d4®10\uc6d4®11\uc6d4®12
[cp-patches] [Patch] locale data update - part 2
Hello, I just commited another update for the locale data update to CLDR 1.3. The only things still missing is the update of the currency formats and the new locales. Cheers, Michael 2006-03-19 Michael Koch [EMAIL PROTECTED] * resource/gnu/java/locale/LocaleInformation_aa_ET.properties, resource/gnu/java/locale/LocaleInformation_am.properties, resource/gnu/java/locale/LocaleInformation_am_ET.properties, resource/gnu/java/locale/LocaleInformation_as_IN.properties, resource/gnu/java/locale/LocaleInformation_az_Cyrl.properties, resource/gnu/java/locale/LocaleInformation_bg.properties, resource/gnu/java/locale/LocaleInformation_bn_IN.properties, resource/gnu/java/locale/LocaleInformation_ca.properties, resource/gnu/java/locale/LocaleInformation_cs.properties, resource/gnu/java/locale/LocaleInformation_cy.properties, resource/gnu/java/locale/LocaleInformation_da.properties, resource/gnu/java/locale/LocaleInformation_de.properties, resource/gnu/java/locale/LocaleInformation_dv.properties, resource/gnu/java/locale/LocaleInformation_el.properties, resource/gnu/java/locale/LocaleInformation_en.properties, resource/gnu/java/locale/LocaleInformation_en_GB.properties, resource/gnu/java/locale/LocaleInformation_en_IN.properties, resource/gnu/java/locale/LocaleInformation_en_PK.properties, resource/gnu/java/locale/LocaleInformation_en_SG.properties, resource/gnu/java/locale/LocaleInformation_en_US_POSIX.properties, resource/gnu/java/locale/LocaleInformation_es.properties, resource/gnu/java/locale/LocaleInformation_es_AR.properties, resource/gnu/java/locale/LocaleInformation_es_BO.properties, resource/gnu/java/locale/LocaleInformation_es_CL.properties, resource/gnu/java/locale/LocaleInformation_es_CO.properties, resource/gnu/java/locale/LocaleInformation_es_CR.properties, resource/gnu/java/locale/LocaleInformation_es_DO.properties, resource/gnu/java/locale/LocaleInformation_es_EC.properties, resource/gnu/java/locale/LocaleInformation_es_ES.properties, resource/gnu/java/locale/LocaleInformation_es_GT.properties, resource/gnu/java/locale/LocaleInformation_es_HN.properties, resource/gnu/java/locale/LocaleInformation_es_MX.properties, resource/gnu/java/locale/LocaleInformation_es_NI.properties, resource/gnu/java/locale/LocaleInformation_es_PA.properties, resource/gnu/java/locale/LocaleInformation_es_PE.properties, resource/gnu/java/locale/LocaleInformation_es_PR.properties, resource/gnu/java/locale/LocaleInformation_es_PY.properties, resource/gnu/java/locale/LocaleInformation_es_SV.properties, resource/gnu/java/locale/LocaleInformation_es_US.properties, resource/gnu/java/locale/LocaleInformation_es_UY.properties, resource/gnu/java/locale/LocaleInformation_es_VE.properties, resource/gnu/java/locale/LocaleInformation_fa.properties, resource/gnu/java/locale/LocaleInformation_fa_AF.properties, resource/gnu/java/locale/LocaleInformation_fa_IR.properties, resource/gnu/java/locale/LocaleInformation_fi.properties, resource/gnu/java/locale/LocaleInformation_fr.properties, resource/gnu/java/locale/LocaleInformation_fr_CA.properties, resource/gnu/java/locale/LocaleInformation_ga.properties, resource/gnu/java/locale/LocaleInformation_gu_IN.properties, resource/gnu/java/locale/LocaleInformation_hi_IN.properties, resource/gnu/java/locale/LocaleInformation_hr.properties, resource/gnu/java/locale/LocaleInformation_hu.properties, resource/gnu/java/locale/LocaleInformation_id.properties, resource/gnu/java/locale/LocaleInformation_is.properties, resource/gnu/java/locale/LocaleInformation_it.properties, resource/gnu/java/locale/LocaleInformation_ja.properties, resource/gnu/java/locale/LocaleInformation_kk.properties, resource/gnu/java/locale/LocaleInformation_kl.properties, resource/gnu/java/locale/LocaleInformation_km.properties, resource/gnu/java/locale/LocaleInformation_ky.properties, resource/gnu/java/locale/LocaleInformation_lo.properties, resource/gnu/java/locale/LocaleInformation_lo_LA.properties, resource/gnu/java/locale/LocaleInformation_lt.properties, resource/gnu/java/locale/LocaleInformation_lt_LT.properties, resource/gnu/java/locale/LocaleInformation_lv.properties, resource/gnu/java/locale/LocaleInformation_mk.properties, resource/gnu/java/locale/LocaleInformation_mn.properties, resource/gnu/java/locale/LocaleInformation_mr.properties, resource/gnu/java/locale/LocaleInformation_mr_IN.properties, resource/gnu/java/locale/LocaleInformation_ms.properties, resource/gnu
[cp-patches] [Patch] locale data update - part 1
Hello list, I just commited the first part of the next locale data update to CLDR 1.3. This patch updates localized strings for territories, languages, variants, currency symbols and currency names. More updates to come. I dont attached the commited patch because it is too big (it is 1.8 MB unzipped). You cna find the fill patch here: http://www.kaffe.org/~mkoch/locale.diff.gz2 Cheers, Michael 2006-03-18 Michael Koch [EMAIL PROTECTED] * resource/gnu/java/locale/LocaleInformation_aa.properties, resource/gnu/java/locale/LocaleInformation_af.properties, resource/gnu/java/locale/LocaleInformation_am.properties, resource/gnu/java/locale/LocaleInformation_ar.properties, resource/gnu/java/locale/LocaleInformation_az_Cyrl.properties, resource/gnu/java/locale/LocaleInformation_be.properties, resource/gnu/java/locale/LocaleInformation_bg.properties, resource/gnu/java/locale/LocaleInformation_bn.properties, resource/gnu/java/locale/LocaleInformation_ca.properties, resource/gnu/java/locale/LocaleInformation_cs.properties, resource/gnu/java/locale/LocaleInformation_cy.properties, resource/gnu/java/locale/LocaleInformation_da.properties, resource/gnu/java/locale/LocaleInformation_de.properties, resource/gnu/java/locale/LocaleInformation_de_CH.properties, resource/gnu/java/locale/LocaleInformation_dz.properties, resource/gnu/java/locale/LocaleInformation_en.properties, resource/gnu/java/locale/LocaleInformation_eo.properties, resource/gnu/java/locale/LocaleInformation_es.properties, resource/gnu/java/locale/LocaleInformation_et.properties, resource/gnu/java/locale/LocaleInformation_eu.properties, resource/gnu/java/locale/LocaleInformation_fa.properties, resource/gnu/java/locale/LocaleInformation_fa_AF.properties, resource/gnu/java/locale/LocaleInformation_fi.properties, resource/gnu/java/locale/LocaleInformation_fo.properties, resource/gnu/java/locale/LocaleInformation_fr.properties, resource/gnu/java/locale/LocaleInformation_ga.properties, resource/gnu/java/locale/LocaleInformation_gl.properties, resource/gnu/java/locale/LocaleInformation_gu.properties, resource/gnu/java/locale/LocaleInformation_he.properties, resource/gnu/java/locale/LocaleInformation_hi.properties, resource/gnu/java/locale/LocaleInformation_hr.properties, resource/gnu/java/locale/LocaleInformation_hu.properties, resource/gnu/java/locale/LocaleInformation_hy.properties, resource/gnu/java/locale/LocaleInformation_id.properties, resource/gnu/java/locale/LocaleInformation_is.properties, resource/gnu/java/locale/LocaleInformation_it.properties, resource/gnu/java/locale/LocaleInformation_ja.properties, resource/gnu/java/locale/LocaleInformation_ka.properties, resource/gnu/java/locale/LocaleInformation_km.properties, resource/gnu/java/locale/LocaleInformation_ko.properties, resource/gnu/java/locale/LocaleInformation_lo.properties, resource/gnu/java/locale/LocaleInformation_lt.properties, resource/gnu/java/locale/LocaleInformation_lv.properties, resource/gnu/java/locale/LocaleInformation_mk.properties, resource/gnu/java/locale/LocaleInformation_mr.properties, resource/gnu/java/locale/LocaleInformation_ms.properties, resource/gnu/java/locale/LocaleInformation_mt.properties, resource/gnu/java/locale/LocaleInformation_nb.properties, resource/gnu/java/locale/LocaleInformation_nl.properties, resource/gnu/java/locale/LocaleInformation_nn.properties, resource/gnu/java/locale/LocaleInformation_om.properties, resource/gnu/java/locale/LocaleInformation_pl.properties, resource/gnu/java/locale/LocaleInformation_ps.properties, resource/gnu/java/locale/LocaleInformation_pt.properties, resource/gnu/java/locale/LocaleInformation_pt_PT.properties, resource/gnu/java/locale/LocaleInformation_ro.properties, resource/gnu/java/locale/LocaleInformation_ru.properties, resource/gnu/java/locale/LocaleInformation_sk.properties, resource/gnu/java/locale/LocaleInformation_sl.properties, resource/gnu/java/locale/LocaleInformation_so.properties, resource/gnu/java/locale/LocaleInformation_sq.properties, resource/gnu/java/locale/LocaleInformation_sr.properties, resource/gnu/java/locale/LocaleInformation_sr_Latn.properties, resource/gnu/java/locale/LocaleInformation_sv.properties, resource/gnu/java/locale/LocaleInformation_sw.properties, resource/gnu/java/locale/LocaleInformation_ta.properties, resource/gnu/java/locale/LocaleInformation_te.properties, resource/gnu/java/locale/LocaleInformation_th.properties, resource/gnu/java/locale
Re: [cp-patches] RFC: defaultLocale changes
On Tue, Mar 14, 2006 at 01:12:06PM +0100, Christian Thalinger wrote: On Fri, Mar 10, 2006 at 03:38:02PM +0100, Christian Thalinger wrote: Hi! We had a problem with a mauve testlet which turned out to be related to the default locale. CACAO sets the user.country property instead of the user.region per default. Some websearch (http://www.kaffe.org/pipermail/kaffe/2004-April/097806.html) and some testing with sun's 1.5 showed that sun sets the default locale to en_US when no LANG env is found and uses user.country, but prioritize user.region is defined on the commandline. This patch changes our behaviour. Ok to commit? So, am I ignored as always? :-) Together with a mauve testcase that proves this I'm fine with it. :-) (as I told you on IRC) Michael -- http://www.worldforge.org/
Re: [cp-patches] RFC:Collation rules for Lithuanian locale
On Thu, Mar 09, 2006 at 08:10:32PM +0100, Audrius Meskauskas wrote: Index: resource/gnu/java/locale/LocaleInformation_lt.properties === RCS file: /sources/classpath/classpath/resource/gnu/java/locale/LocaleInformation_lt.properties,v retrieving revision 1.1 diff -u -r1.1 LocaleInformation_lt.properties --- resource/gnu/java/locale/LocaleInformation_lt.properties 19 May 2005 06:44:28 - 1.1 +++ resource/gnu/java/locale/LocaleInformation_lt.properties 9 Mar 2006 19:01:08 - @@ -21,6 +21,7 @@ mediumDateFormat=.MM.dd longDateFormat= 'm.' d 'd.' fullDateFormat= 'm.' d 'd.', +collation_rules=0123456789A,a\u0104 ,\u0105 b,Bc,C\u010d ,\u010c d,De,E\u0119 ,\u0118 \u0117 ,\u0116 f,Fg,Gh,Hi,I\u012f ,\u012e y,Yj,Jk,Kl,Lm,Mn,No,Op,Pq,Qr,Rs,S\u0161 ,\u0160 t,Tu,U\u0173 ,\u0172 \u016b ,\u016a v,Vw,Wx,Xy,Yz,Z\u017e ,\u017d territories.TL=Ryt\u0173 Timoras territories.TK=Tokelau territories.TJ=Tad\u017eikija Note that these files are autogenerated and this fix might be accidentally removed on next update. Its better to submit your fixes upstream at www.unicode.org. Cheers, Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/
[cp-patches] [Patch] InetSocketAddress.createUnresolved()
Hello list,
I commited the attached patch to introduce a new method from 1.5. I
backed it up by a new mauve testcase which I will commit soon.
Cheers,
Michael
2006-03-08 Michael Koch [EMAIL PROTECTED]
* java/net/InetSocketAddress.java
(InetSocketAddress(String,int,resolve)): New private contructor.
(InetSocketAddress(String,int)): Use new private constructor.
(createUnresolved): New method.
Index: java/net/InetSocketAddress.java
===
RCS file: /sources/classpath/classpath/java/net/InetSocketAddress.java,v
retrieving revision 1.12
diff -u -r1.12 InetSocketAddress.java
--- java/net/InetSocketAddress.java 14 Sep 2005 17:06:27 - 1.12
+++ java/net/InetSocketAddress.java 8 Mar 2006 08:05:48 -
@@ -1,5 +1,5 @@
/* InetSocketAddress.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -107,10 +107,26 @@
* @param hostname The hostname for the socket address
* @param port The port for the socket address
*
- * @exception IllegalArgumentException If the port number is illegal
+ * @exception IllegalArgumentException If the port number is illegal or
+ * the hostname argument is null
*/
public InetSocketAddress(String hostname, int port)
-throws IllegalArgumentException
+ {
+this(hostname, port, true);
+ }
+
+ /**
+ * Constructs an InetSocketAddress instance.
+ *
+ * @param hostname The hostname for the socket address
+ * @param port The port for the socket address
+ * @param resolve codetrue/code if the address has to be resolved,
+ * codefalse/code otherwise
+ *
+ * @exception IllegalArgumentException If the port number is illegal or
+ * the hostname argument is null
+ */
+ private InetSocketAddress(String hostname, int port, boolean resolve)
{
if (hostname == null)
throw new IllegalArgumentException(Null host name value);
@@ -120,15 +136,36 @@
this.port = port;
this.hostname = hostname;
+this.addr = null;
-try
- {
- this.addr = InetAddress.getByName(hostname);
- }
-catch (Exception e) // UnknownHostException, SecurityException
- {
- this.addr = null;
- }
+if (resolve)
+{
+ try
+{
+ this.addr = InetAddress.getByName(hostname);
+}
+ catch (Exception e) // UnknownHostException, SecurityException
+{
+ // Do nothing here. this.addr is already set to null.
+}
+}
+
+ }
+
+ /**
+ * Creates an unresolved codeInetSocketAddress/code object.
+ *
+ * @param hostname The hostname for the socket address
+ * @param port The port for the socket address
+ *
+ * @exception IllegalArgumentException If the port number is illegal or
+ * the hostname argument is null
+ *
+ * @since 1.5
+ */
+ public static InetSocketAddress createUnresolved(String hostname, int port)
+ {
+return new InetSocketAddress(hostname, port, false);
}
/**
[cp-patches] [Patch] java.net.Proxy and friends
Hello all,
I implemented some proxy stuff from Java 1.5. It needs enums and
generics.
Cheers,
Michael
2006-03-07 Michael Koch [EMAIL PROTECTED]
* gnu/java/net/DefaultProxySelector.java,
java/net/Proxy.java, java/net/ProxySelector.java:
New files.
Index: gnu/java/net/DefaultProxySelector.java
===
RCS file: gnu/java/net/DefaultProxySelector.java
diff -N gnu/java/net/DefaultProxySelector.java
--- /dev/null 1 Jan 1970 00:00:00 -
+++ gnu/java/net/DefaultProxySelector.java 7 Mar 2006 13:03:07 -
@@ -0,0 +1,80 @@
+/* DefaultProxySelector.java --
+ Copyright (C) 2006 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.java.net;
+
+import java.io.IOException;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+public final class DefaultProxySelector
+ extends ProxySelector
+{
+ private static final ListProxy proxies = new ArrayListProxy();
+
+ static
+ {
+// The default proxy selector supports only direct connections.
+proxies.add(Proxy.NO_PROXY);
+ }
+
+ public DefaultProxySelector()
+ {
+// Do nothing by default.
+ }
+
+ public void connectFailed(URI uri, SocketAddress sa, IOException ioe)
+ {
+if (uri == null || sa == null || ioe == null)
+ throw new IllegalArgumentException();
+
+// Do nothing by default.
+ }
+
+ public ListProxy select(URI uri)
+ {
+if (uri == null)
+ throw new IllegalArgumentException();
+
+return proxies;
+ }
+}
Index: java/net/Proxy.java
===
RCS file: java/net/Proxy.java
diff -N java/net/Proxy.java
--- /dev/null 1 Jan 1970 00:00:00 -
+++ java/net/Proxy.java 7 Mar 2006 13:03:07 -
@@ -0,0 +1,129 @@
+/* Proxy.java -- Represends a proxy for a network connection
+ Copyright (C) 2006 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet
[cp-patches] [Patch] Removed empty file
Hello list, I removed the attached file as its empty, no java class inside. And it confuses GCJ when using current classpath CVS as snapshot when building gcj 4.1 or gcj trunk. Cheers, Michael 2006-02-21 Michael Koch [EMAIL PROTECTED] * gnu/javax/net/ssl/provider/PRNG.java: Removed. Index: gnu/javax/net/ssl/provider/PRNG.java === RCS file: gnu/javax/net/ssl/provider/PRNG.java diff -N gnu/javax/net/ssl/provider/PRNG.java --- gnu/javax/net/ssl/provider/PRNG.java26 Jan 2006 02:25:11 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,41 +0,0 @@ -/* PRNG.java -- - Copyright (C) 2006 Free Software Foundation, Inc. - -This file is a part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 -USA - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - - -package gnu.javax.net.ssl.provider; - -import java.security.SecureRandom; \ No newline at end of file
Re: [cp-patches] FYI: JComponent fixes: New regressions.
On Thu, Feb 16, 2006 at 01:49:47PM +0100, Audrius Meskauskas wrote: Now the bottom close button disappears in the Swing Demo after any attempt to expand a tree node or resize the table column. Listen, it may sound nasty, but PLEASE USE SWING ACTIVITY BOARD AND MAUVE TESTS TO CHECK THE EFFECTS of the performance fixes, optimizations and removing unnecessary code. I understand that it may be some subtle regressions, but that is happening looks more that you just do not care, leaving your code to for others to debug. Work in the team do put some restrictions. Come on. Cool down. Roman is taking a lot of care. He does a great job. As the other Swing hackers do too. Sometimes things break. That is what happens in development. When you cant fix it imidiately report it to Roman or the one who broke and not randomly revert patches. Cheers, Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/
[cp-patches] [Patch] Ignore tools.zip
Hello list, I just commited the attached to ignore the generated tools.zip by CVS. Cheers, Michael 2006-02-17 Michael Koch [EMAIL PROTECTED] * tools/.cvsignore: Ignore tools.zip. Index: tools/.cvsignore === RCS file: /sources/classpath/classpath/tools/.cvsignore,v retrieving revision 1.2 diff -u -r1.2 .cvsignore --- tools/.cvsignore13 Feb 2006 17:48:34 - 1.2 +++ tools/.cvsignore17 Feb 2006 06:59:02 - @@ -1,2 +1,3 @@ Makefile.in Makefile +tools.zip
[cp-patches] [Patch]
Hello list,
With the help of Thomas Fitzsimmons I prepared the attached patch that
fixes the drawing in embedded windows. With gcjwebplugin I saw a shifted
droplet when visiting http://www.classpath.org/. The attached patch
fixes this.
Ok to commit?
Cheers,
Michael
2006-02-15 Michael Koch [EMAIL PROTECTED]
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
(Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create):
Make sure the embedded window gets no decorations.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(window_get_frame_extents): Return early of the window has no
decorations.
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
===
RCS file:
/sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c,v
retrieving revision 1.7
diff -u -r1.7 gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c 11 Jul
2005 23:27:43 - 1.7
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c 14 Feb
2006 22:03:42 -
@@ -1,6 +1,6 @@
/* gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c -- Native
implementation of GtkEmbeddedWindowPeer
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -53,6 +53,8 @@
window = gtk_plug_new ((GdkNativeWindow) socket_id);
+ gtk_window_set_decorated (window, FALSE);
+
fixed = gtk_fixed_new ();
gtk_container_add (GTK_CONTAINER (window), fixed);
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===
RCS file:
/sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.62
diff -u -r1.62 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c 15 Nov 2005
22:50:53 - 1.62
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c 14 Feb 2006
22:03:42 -
@@ -1,5 +1,6 @@
/* gtkwindowpeer.c -- Native implementation of GtkWindowPeer
- Copyright (C) 1998, 1999, 2002, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2002, 2004, 2005, 2006
+ Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -1437,21 +1438,21 @@
/* Guess frame extents in case _NET_FRAME_EXTENTS is not
supported. */
- if (gtk_window_get_decorated (GTK_WINDOW (window)))
-{
- *top = 23;
- *left = 6;
- *bottom = 6;
- *right = 6;
-}
- else
+ if (!gtk_window_get_decorated (GTK_WINDOW (window)))
{
*top = 0;
*left = 0;
*bottom = 0;
*right = 0;
+
+ return;
}
+ *top = 23;
+ *left = 6;
+ *bottom = 6;
+ *right = 6;
+
/* Request that the window manager set window's
_NET_FRAME_EXTENTS property. */
request_frame_extents (window);
Re: [cp-patches] RFC: Stupid spec constants revisited
On Fri, Feb 10, 2006 at 05:33:37PM +, David Gilbert wrote: FWIW, I'm in favour of committing this patch... Note that you need to disable CVS keyword substitiution. Otherwise value of the RCSID will change on every commit of this file. Just in case you are not aware of this. Cheers, Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/
Re: [cp-patches] RFC: Stupid spec constants revisited
On Fri, Feb 10, 2006 at 02:50:32PM -0500, Stuart Ballard wrote: RTFP ;) hmmm, you are right. I would prefer the disbaled to make at least the definition of these evil constants look good. Cheers, Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/
[cp-patches] RFC: new release of gjdoc
Hello Marl, hello list, It has been a long time since the last gjdoc release. Many bugs were fixed since then. Among other things some bugs got fixed that make it possible to generate the whole javadocs for eclipse. To make it possible to build eclipse in debian (and Fedora and other distributions too) with this new shiny gjdoc we should do a release and update gjdoc in the distributions. Therefore I prepared the attached patch. Please apply and release. Cheers, Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ Index: ChangeLog === RCS file: /cvsroot/classpath/gjdoc/ChangeLog,v retrieving revision 1.241 diff -u -r1.241 ChangeLog --- ChangeLog 30 Nov 2005 21:23:46 - 1.241 +++ ChangeLog 18 Dec 2005 15:04:20 - @@ -1,3 +1,7 @@ +2005-11-30 Michael Koch [EMAIL PROTECTED] + + * configure.ac (AC_INIT): Set version to 0.7.7. + 2005-11-30 Stephan Michels [EMAIL PROTECTED] PR gjdoc/24722: Index: configure.ac === RCS file: /cvsroot/classpath/gjdoc/configure.ac,v retrieving revision 1.25 diff -u -r1.25 configure.ac --- configure.ac20 Oct 2005 18:22:47 - 1.25 +++ configure.ac18 Dec 2005 15:04:20 - @@ -20,7 +20,7 @@ dnl Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA dnl 02111-1307 USA. -AC_INIT(gjdoc, 0.7.6-cvs, [EMAIL PROTECTED]) +AC_INIT(gjdoc, 0.7.7, [EMAIL PROTECTED]) AC_PREREQ(2.59) ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] FYI: Added some real functionality to SystemFlavorMap
On Tue, Nov 29, 2005 at 12:33:29AM +0100, Jan R?hrich wrote:
I started to exchange some of SystemFlavorMaps implementation to a
version with real functionality. Btw. I implemented the methods that
were missing to JDK1.4 interface conformance.
...
+ /**
+ * This map maps native codeString/codes to lists of
+ * codeDataFlavor/codes
+ */
+ private Map nativeToFlavorMap = new HashMap();
It is better to use: private HashMap nativeToFlavorMap = new HashMap();
As in most cases invocations on interface are slower then on direct
classes.
+ /**
+ * This map maps codeDataFlavor/codes to lists of native
+ * codeString/codes
+ */
+ private Map flavorToNativeMap = new HashMap();
Same here.
/**
* Private constructor.
@@ -183,6 +196,161 @@
public List getNativesForFlavor (DataFlavor flav)
{
throw new Error (Not implemented);
+ }
+
+ /**
+ * Adds a mapping from a single codeString/code native to a single
+ * codeDataFlavor/code. Unlike codegetFlavorsForNative/code, the
+ * mapping will only be established in one direction, and the native will
+ * not be encoded. To establish a two-way mapping, call
+ * codeaddUnencodedNativeForFlavor/code as well. The new mapping will
+ * be of lower priority than any existing mapping.
+ * This method has no effect if a mapping from the specified
+ * codeString/code native to the specified or equal
+ * codeDataFlavor/code already exists.
+ *
+ * @param nativeStr the codeString/code native key for the mapping
+ * @param flavor the codeDataFlavor/code value for the mapping
+ * @throws NullPointerException if nat or flav is codenull/code
+ *
+ * @see #addUnencodedNativeForFlavor
+ * @since 1.4
+ */
+ public synchronized void addFlavorForUnencodedNative(String nativeStr,
+ DataFlavor flavor)
+ {
+if((nativeStr == null) || (flavor == null))
Please add a space after 'if'.
+ throw new NullPointerException();
+List flavors = (List) nativeToFlavorMap.get(nativeStr);
+if(flavors == null)
+ {
+flavors = new ArrayList();
+nativeToFlavorMap.put(nativeStr, flavors);
+ }
+else
+ {
+if(!flavors.contains(flavor))
According to our current style you should write:
if (! flavors.contains(flavor))
+ flavors.add(flavor);
+ }
+ }
+
+ /**
+ * Adds a mapping from the specified codeDataFlavor/code (and all
+ * codeDataFlavor/codes equal to the specified codeDataFlavor/code)
+ * to the specified codeString/code native.
+ * Unlike codegetNativesForFlavor/code, the mapping will only be
+ * established in one direction, and the native will not be encoded. To
+ * establish a two-way mapping, call
+ * codeaddFlavorForUnencodedNative/code as well. The new mapping will
+ * be of lower priority than any existing mapping.
+ * This method has no effect if a mapping from the specified or equal
+ * codeDataFlavor/code to the specified codeString/code native
+ * already exists.
+ *
+ * @param flavor the codeDataFlavor/code key for the mapping
+ * @param nativeStr the codeString/code native value for the mapping
+ * @throws NullPointerException if flav or nat is codenull/code
+ *
+ * @see #addFlavorForUnencodedNative
+ * @since 1.4
+ */
+ public synchronized void addUnencodedNativeForFlavor(DataFlavor flavor,
+ String nativeStr)
+ {
+if((nativeStr == null) || (flavor == null))
+ throw new NullPointerException();
+List natives = (List) flavorToNativeMap.get(flavor);
+if(natives == null)
+ {
+natives = new ArrayList();
+flavorToNativeMap.put(flavor, natives);
+ }
+else
+ {
+if(!natives.contains(nativeStr))
+ natives.add(nativeStr);
+ }
+ }
+
+ /**
+ * Discards the current mappings for the specified codeDataFlavor/code
+ * and all codeDataFlavor/codes equal to the specified
+ * codeDataFlavor/code, and creates new mappings to the
+ * specified codeString/code natives.
+ * Unlike codegetNativesForFlavor/code, the mappings will only be
+ * established in one direction, and the natives will not be encoded. To
+ * establish two-way mappings, call codesetFlavorsForNative/code
+ * as well. The first native in the array will represent the highest
+ * priority mapping. Subsequent natives will represent mappings of
+ * decreasing priority.
+ * p
+ * If the array contains several elements that reference equal
+ * codeString/code natives, this method will establish new mappings
+ * for the first of those elements and ignore the rest of them.
+ * p
+ * It is recommended that client code not reset mappings established by the
+ * data transfer subsystem. This method should only be used for
+ *
Re: [cp-patches] Patch: RFC: javax.sound.sampled
On Sat, Nov 12, 2005 at 05:51:55PM -0700, Tom Tromey wrote: I'm not checking this in yet. I haven't really done much testing of it, and I wanted some feedback first as well. This implements javax.sound.sampled and javax.sound.sampled.spi. I would say: Please commit. Bugs can be fixed later. Its too bad that we cant just use tritonus ... Cheers, Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] Patch: FYI: typo fix
On Mon, Oct 24, 2005 at 06:18:44PM -0600, Tom Tromey wrote: I'm checking this in. This fixes a small javadoc typo I happened to see. Tom 2005-10-24 Tom Tromey [EMAIL PROTECTED] * java/io/ObjectOutputStream.java (useProtocolVersion): Fixed typo in javadoc. Index: java/io/ObjectOutputStream.java === RCS file: /cvsroot/classpath/classpath/java/io/ObjectOutputStream.java,v retrieving revision 1.60 diff -u -r1.60 ObjectOutputStream.java --- java/io/ObjectOutputStream.java 2 Oct 2005 23:41:22 - 1.60 +++ java/io/ObjectOutputStream.java 25 Oct 2005 00:22:12 - @@ -548,7 +548,7 @@ * version)/code is provided to change the default protocol * version. * - * For an explination of the differences beween the two protocols + * For an explanation of the differences beween the two protocols There is still a typo: beween = between. Cheers, Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] javax.swing.undo cleanup
On Wed, Oct 19, 2005 at 08:46:16PM +0200, Roman Kennke wrote:
Hi Micheal,
-public class CannotRedoException
- extends RuntimeException
+public class CannotRedoException extends RuntimeException
{
The old version is according to our formatting rules. The new version is
not.
Well, last time I asked about that on IRC I was told (by tromey AFAIR)
that the new version is correct.
Don't ask on IRC, read the documentation. ;-)
From the hacking guide (hacking.texinfo):
Wrap always before extends, implements, throws, and labels.
/**
* Constructs a new instance of a codeCannotRedoException/code.
*/
public CannotRedoException()
{
+super();
}
You know that this is implicit and not needed. We try to avoid implicit
stuff.
Yeah, I had the choice between calling super() and adding a comment.
Calling super() seemed more natural to me. If it's agreed that super();
should be avoided, then I'll replace it with a comment instead.
I would prefer a comment here.
Cheers,
Michael
--
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
Join the community at http://planet.classpath.org/
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] FYI: javax.swing.filechooser.FileSystemView
On Tue, Oct 11, 2005 at 10:31:22AM +, David Gilbert wrote: I committed this patch, there is no need for a new FileSystemView to be created for each call to getFileSystemView(): 2005-10-11 David Gilbert [EMAIL PROTECTED] * javax/swing/filechooser/FileSystemView.java (defaultFileSystemView): new private field, (getFileSystemView): initialise (if necessary) and return defaultFileSystemView. I have a Mauve test that I'll commit in a moment... Please include the actual patches you commit here too. Cheers, Michael aka The Nitpicker -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] RFC: TreePath.toString
On Sat, Jun 04, 2005 at 04:19:25PM -0700, Ka-Hing Cheung wrote: This makes TreePath.toString behave like Sun's 2005-06-04 Ka-Hing Cheung [EMAIL PROTECTED] * javax/swing/tree/TreePath.java: Implements toString(). Commited. Thanks for your contribution. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] Re: FYI: removed old native declarations.
On Fri, Jun 03, 2005 at 01:42:23PM +0200, Sven de Marothy wrote: On Fri, 2005-06-03 at 06:01 +0200, Michael Koch wrote: Looks like this patch broke the JNI method check. Have you tried to build a clean tree with this patch before commiting? Yes, I did. I didn't have a problem..? Please rename the methods. Are you sure the problem isn't that I forgot to remove the declarations in GdkGraphics.java for the methods deleted from gdkgraphics.c? I just commited this: 2005-06-03 Sven de Marothy [EMAIL PROTECTED] * gnu/java/awt/peer/gtk/GdkGraphics.java: Removed declarations for the previously removed native methods. You are right. The bug is still there as the jni header files in CVS are not updated yet. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] RFC: GtkImage patch.
On Thu, Jun 02, 2005 at 12:23:32PM +0200, Sven de Marothy wrote: On Wed, 2005-06-01 at 18:30 -0400, Thomas Fitzsimmons wrote: /** * This is an old method, no idea if it's correct. */ private int[] convertPixels (byte[] pixels) Can this comment be removed? Only if you can confirm the method is correct. I'm still not sure it is. It's just what the old code did. /* functions used by other gtk peer native routines */ GdkPixbuf *gnu_java_awt_peer_gtk_GtkImage_getPixbuf(JNIEnv *env, jobject obj); GdkPixmap *gnu_java_awt_peer_gtk_GtkImage_getPixmap(JNIEnv *env, jobject obj); jboolean gnu_java_awt_peer_gtk_GtkImage_isOffScreen(JNIEnv *env, jobject obj); Typically we declare functions used by multiple peers in gtkpeer.h. Is it necessary to use these long JNI-style names? Ah. Well, these are only used in 2 places, but I can move them, sure. As for the long style names, it's not necessary of course, I just wanted to follow the convention. Maybe it should be shortened to just GtkImage_* instead. (Including the class name seems like a good idea to me, since it indicates what kind of class obj is intended to be, and where the function is located.) Looks like this patch broke the JNI method check. Have you tried to build a clean tree with this patch before commiting? Please rename the methods. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] FYI: Implementing Little Endian and Big Endian encodings.
On Tue, May 31, 2005 at 08:38:38AM +0200, Meskauskas Audrius wrote: Following the OMG specification, CORBA must support both Big and Little Endian encodings (I did not find any notes about this in Java API - proably silence is the sign of agreement). The CORBA messages contain the flags, indicating, which encoding is currently used. Great thanks to Warren Levy, Aaron M. Renn and Tom Tromey, authors of our DataInput/Output streams. Reusing the code from there saved me a lot of work. I have got to pack the patch as it is larger than the limit of the list. 2005-05-31 Audrius Meskauskas [EMAIL PROTECTED] * gnu/CORBA/CDR/BigEndianInputStream.java, gnu/CORBA/CDR/BigEndianOutputStream.java, gnu/CORBA/CDR/LittleEndianInputStream.java, gnu/CORBA/CDR/LittleEndianOutputStream.java, gnu/CORBA/CDR/abstractDataInputStream.java, gnu/CORBA/CDR/abstractDataOutputStream.java: New streams. * gnu/CORBA/IOR.java: Implemented parsing of the Little Endian encoded IOR references. * gnu/CORBA/Functional_ORB.java, gnu/CORBA/binaryReply.java, gnu/CORBA/gnuRequest.java, gnu/CORBA/CDR/cdrInput.java, gnu/CORBA/CDR/cdrOutput.java, gnu/CORBA/CDR/encapsulatedOutput.java, gnu/CORBA/GIOP/MessageHeader.java: Implemented support for both Big and Little Endian. java.nio gives handling of little-, big- and mixed-endianess for free. Perhaps you wanna look into using this. This will probably increase performance of the CORBA code too. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] FYI: Implementing Little Endian and Big Endian encodings.
On Tue, May 31, 2005 at 01:45:03PM +0200, Meskauskas Audrius wrote: java.nio gives handling of little-, big- and mixed-endianess for free. Perhaps you wanna look into using this. This will probably increase performance of the CORBA code too. The direct use of the .nio package would make CORBA dependent from the 1.4 implementation. The 1.2, 1.3 API specifications have CORBA and have no nio. Bounding to nio means that we do not plan to release these versions, going directly to 1.4. Mark writes in plans drop the unfinished parts before release - but how to drop if these parts are in use somewhere? java.nio is an integral part of GNU classpath and cannot be removed. E.g. its used to do charset conversion and file I/O. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] removed used method in gtk peer
Hi list,
I commited the attached patch to remove a new method in the gtk peer
which was never used and broke the build.
Michael
2005-05-25 Michael Koch [EMAIL PROTECTED]
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
(connetJObject): Removed.
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.13
diff -u -r1.13 gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c25 May
2005 01:11:17 - 1.13
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c25 May
2005 08:22:47 -
@@ -83,21 +83,6 @@
}
JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectJObject
- (JNIEnv *env, jobject obj)
-{
- void *ptr;
-
- ptr = NSA_GET_PTR (env, obj);
-
- gdk_threads_enter ();
-
- connect_awt_hook (env, obj, 1, GTK_WIDGET (ptr)-window);
-
- gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals
(JNIEnv *env, jobject obj)
{
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] [patch] fix GTK scrollbar peer
On Tue, May 24, 2005 at 09:18:38PM -0400, Thomas Fitzsimmons wrote: Hi, This patch fixes a long-standing bug in the GTK scrollbar peer. The proper fix required some GTK work: http://bugzilla.gnome.org/show_bug.cgi?id=133263 The patch there landed in GTK 2.6. The attached patch, which I committed to GNU Classpath HEAD, changes the configure check to require GTK 2.6 and takes advantage of the new change-value signal. This fixes two aspects of scrolling: - adjustment types are now supported properly (UNIT_INCREMENT/DECREMENT, BLOCK_INCREMENT/DECREMENT and TRACK type adjustments). - setting a scrollbar's value works, without causing a callback loop (callback loops cause strange behaviour, where e.g. two scrollbars linked together will start oscillating crazily forever as soon as one is adjusted) Tom 2005-05-24 Thomas Fitzsimmons [EMAIL PROTECTED] * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c (connectSignals): Connect to new change-value signal. (post_change_event): Remove signal handler. (slider_moved_cb): New signal handler. * configure.ac: Require gtk+-2.0 = 2.6. Please announce such updates on classpath@gnu.org before commiting so people can update their GTK. Another thing you missed was updating the NEWS and INSTALL files to tell the people what minimum requirements we have now. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] java.util.Locale.getISOStrings
Hi list,
I just commited the attached patch to fox an issue with
java.util.Locale.getISOStrings(String) to handle the new
locale properties files correctly. This fixes bug #13172.
Michael
2005-05-25 Michael Koch [EMAIL PROTECTED]
* java/util/Locale.java (getISOStrings):
Re-implemented for locale properties files.
Index: java/util/Locale.java
===
RCS file: /cvsroot/classpath/classpath/java/util/Locale.java,v
retrieving revision 1.28
diff -u -r1.28 Locale.java
--- java/util/Locale.java 19 May 2005 06:45:04 - 1.28
+++ java/util/Locale.java 25 May 2005 05:32:45 -
@@ -453,33 +453,35 @@
*/
private static String[] getISOStrings(String tableName)
{
-List tempList;
-ResourceBundle bundle;
-Enumeration keys;
int count = 0;
-String[] strings;
-
-tempList = new ArrayList();
-bundle = ResourceBundle.getBundle(gnu.java.locale.LocaleInformation);
-keys = ((Hashtable) bundle.getObject(tableName)).keys();
-while (keys.hasMoreElements())
- {
- String nextString;
-
- nextString = (String) keys.nextElement();
- if (nextString.length() == 2
- Character.isLetter(nextString.charAt(0))
- Character.isLetter(nextString.charAt(1)))
+ResourceBundle bundle =
+ ResourceBundle.getBundle(gnu.java.locale.LocaleInformation);
+Enumeration e = bundle.getKeys();
+ArrayList tempList = new ArrayList();
+
+while (e.hasMoreElements())
+ {
+ String key = (String) e.nextElement();
+
+ if (key.startsWith(tableName + .))
{
- tempList.add(nextString);
- ++count;
+ String str = key.substring(tableName.length() + 1);
+
+ if (str.length() == 2
+Character.isLetter(str.charAt(0))
+Character.isLetter(str.charAt(1)))
+ {
+ tempList.add(str);
+ ++count;
+ }
}
}
-strings = new String[count];
+
+String[] strings = new String[count];
+
for (int a = 0; a count; ++a)
- {
- strings[a] = (String) tempList.get(a);
- }
+ strings[a] = (String) tempList.get(a);
+
return strings;
}
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] FYI: Added getWindowAncestor in javax.swing.SwingUtilities
On Mon, May 23, 2005 at 01:12:26PM +0200, Roman Kennke wrote:
2005-05-23 Roman Kennke [EMAIL PROTECTED]
* javax/swing/JFileChooser.java:
Fixed the values of several public constant fields.
/Roman
Index: javax/swing/SwingUtilities.java
===
RCS file: /cvsroot/classpath/classpath/javax/swing/SwingUtilities.java,v
retrieving revision 1.26
diff -u -r1.26 SwingUtilities.java
--- javax/swing/SwingUtilities.java 20 May 2005 12:10:21 - 1.26
+++ javax/swing/SwingUtilities.java 23 May 2005 11:10:32 -
@@ -352,6 +352,25 @@
}
/**
+ * Returns the first ancestor of codecomp/code that is a [EMAIL
PROTECTED] Window}
+ * or codenull/code if codecomp/code is not contained in a
+ * [EMAIL PROTECTED] Window}.
+ *
+ * This is equivalent to calling
+ * codegetAncestorOfClass(Window, comp)/code or
+ * codewindowForComponent(comp)/code.
+ *
+ * @param comp the component for which we are searching the ancestor Window
+ *
+ * @return the first ancestor Window of codecomp/code or
+ * codenull/code if codecomp/code is not contained in a Window
+ */
+ public Window getWindowAncestor(Component comp)
+ {
+return (Window) getAncestorOfClass(Window.class, comp);
+ }
+
+ /**
* Equivalent to calling codegetAncestorOfClass(Window, comp)/code.
*
* @param comp The component to search for an ancestor window
Somehow the ChangeLog entry and the patch does not fit together. ;-)
Michael
--
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
Join the community at http://planet.classpath.org/
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] RFC: notice cairo in INSTALL file
On Fri, May 20, 2005 at 02:11:13AM +0200, Robert Schuster wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi. While searching for info how to enable cairo support our INSTALL was not helpful. This patch fixes that. 2005-05-20 Robert Schuster [EMAIL PROTECTED] * INSTALL: Mention cairo dependency and how to enable it. Is the description ok? ... + For building the gtk+ AWT peers with preliminary cairo support + add --enable-gtk-cairo as an argument to configure and set the + system property gnu.java.awt.peer.gtk.Graphics to Graphics2D + at runtime. For this to work you need + + - Cairo 0.3 from http://cairographics.org/ The correct version is 0.3.0. Please make clear that no newer version of Cairo is supported. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] locale stuff - functional changes
I list,
I commited the locale changes now as following.
Michael
2005-05-19 Michael Koch [EMAIL PROTECTED]
* java/text/DateFormatSymbols.java
(getStringArray): New method.
(getZoneStrings): Likewise.
(DateFormatSymbols): Load symbols from properties files.
* java/util/Locale.java
(getDisplayLanguage): Handle new way to load language names.
(getDisplayCountry): Handle new way to load territory names.
(getDisplayVariant): Handle new way to load variant names.
* lib/Makefile.am, lib/gen-classlist.sh.in:
No need to special case classes from gnu.java.locale anymore.
* scripts/generate-locale-list.sh:
Generate list from the new properties files.
* LICENSE: Added license of locale data properties files.
Index: java/text/DateFormatSymbols.java
===
RCS file: /cvsroot/classpath/classpath/java/text/DateFormatSymbols.java,v
retrieving revision 1.15
diff -u -r1.15 DateFormatSymbols.java
--- java/text/DateFormatSymbols.java16 Feb 2005 11:18:38 - 1.15
+++ java/text/DateFormatSymbols.java19 May 2005 06:43:20 -
@@ -41,6 +41,7 @@
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import java.util.StringTokenizer;
/**
* This class acts as container for locale specific date/time formatting
@@ -78,13 +79,62 @@
transient String[] dateFormats;
transient String[] timeFormats;
- private String[] formatsForKey(ResourceBundle res, String key)
+ private static String[] getStringArray(ResourceBundle res, String name)
+ {
+int index = 0;
+String data = res.getString(name);
+StringTokenizer st = new StringTokenizer(data, \u00ae);
+String[] array = new String[st.countTokens()];
+
+while (st.hasMoreTokens())
+ {
+array[index] = st.nextToken();
+ index++;
+ }
+
+return array;
+ }
+
+ private String[][] getZoneStrings(ResourceBundle res)
{
-String[] values = new String [formatPrefixes.length];
-for (int i = 0; i formatPrefixes.length; i++)
+try
+ {
+int index = 0;
+String data = res.getString(zoneStrings);
+StringTokenizer st = new StringTokenizer(data, \u00ae\u00ae);
+String[][] array = new String[st.countTokens()][];
+
+while (st.hasMoreTokens())
+ {
+ int index2 = 0;
+ String token = st.nextToken();
+ StringTokenizer st2 = new StringTokenizer(token, \u00ae);
+array[index] = new String[st2.countTokens()];
+
+ while (st2.hasMoreTokens())
+ {
+array[index][index2] = st2.nextToken();
+index2++;
+ }
+
+ index++;
+ }
+
+return array;
+ }
+catch (MissingResourceException e)
{
-values[i] = res.getString(formatPrefixes[i]+key);
+ return new String[0][];
}
+ }
+
+ private String[] formatsForKey(ResourceBundle res, String key)
+ {
+String[] values = new String[formatPrefixes.length];
+
+for (int i = 0; i formatPrefixes.length; i++)
+ values[i] = res.getString(formatPrefixes[i] + key);
+
return values;
}
@@ -101,15 +151,14 @@
= ResourceBundle.getBundle(gnu.java.locale.LocaleInformation, locale,
ClassLoader.getSystemClassLoader());
-ampms = res.getStringArray (ampms);
-eras = res.getStringArray (eras);
-localPatternChars = res.getString (localPatternChars);
-months = res.getStringArray (months);
-shortMonths = res.getStringArray (shortMonths);
-shortWeekdays = res.getStringArray (shortWeekdays);
-weekdays = res.getStringArray (weekdays);
-zoneStrings = (String[][]) res.getObject (zoneStrings);
-
+ampms = getStringArray(res, ampms);
+eras = getStringArray(res, eras);
+localPatternChars = res.getString(localPatternChars);
+months = getStringArray(res, months);
+shortMonths = getStringArray(res, shortMonths);
+shortWeekdays = getStringArray(res, shortWeekdays);
+weekdays = getStringArray(res, weekdays);
+zoneStrings = getZoneStrings(res);
dateFormats = formatsForKey(res, DateFormat);
timeFormats = formatsForKey(res, TimeFormat);
}
Index: java/util/Locale.java
===
RCS file: /cvsroot/classpath/classpath/java/util/Locale.java,v
retrieving revision 1.27
diff -u -r1.27 Locale.java
--- java/util/Locale.java 16 Feb 2005 20:54:25 - 1.27
+++ java/util/Locale.java 19 May 2005 06:43:20 -
@@ -1,5 +1,5 @@
/* Locale.java -- i18n locales
- Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2001, 2002, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -39,7 +39,6 @@
package java.util
Re: [cp-patches] FYI: Added loadClass(URL, String) method to RMIClassLoader.java
On Wed, May 18, 2005 at 08:37:58AM -0600, Luis Sanabria wrote: Sorry, I sent this message to the incorrect list! 2005-05-15 Luis Sanabria [EMAIL PROTECTED] * java/rmi/server/RMIClassLoader.java: Added method loadClass (URL, String) which calls the method loadClass (String, String). p.s.: I have not done any copyright paperwork yet. Will the following statement work? I put this code into the public domain No, this statement is not enough. There is a reason we want/need signed papers. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] FYI: fixed isShowing in java.awt.Window
On Wed, May 18, 2005 at 03:03:19PM +0200, Roman Kennke wrote: Bogdan Grigurescu discovered a bug in Classpath, which prevented AWT Windows from painting lightweight components. Attached is a simple testcase that demostrates this. The problem was that the Window was not considered as showing, because its parent Frame is not showing. I committed the attached patch that fixes this. Can you please add the testcase to mauve? Thanks, Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] Re: Patch: FYI: fix http Headers oddity
On Thu, May 19, 2005 at 10:30:40AM -0400, Bryce McKinlay wrote: Chris Burdess wrote: Bryce McKinlay wrote: Does anyone know why we use the custom LineInputStream class instead of, say, BufferedReader here? At one point BufferedReader.readLine() was buggy and could read too much and block before returning a line, but I believe we have fixed that. Code re-use would help to avoid bugs like this ;-) Erm, because LineInputStream is an InputStream dealing with bytes, and BufferedReader is a Reader dealing with chars. Why is this distinction important? We are converting the result to chars (well, a String) anyway. LineInputStream reads one byte and transforms it into an ascii character. BufferedReader reads a char (2 bytes) as character. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] Fixing locale list generator
Hi list,
I commited the attached patch to fix the generation of
the locale list. Thanks to Robert Schuster for reporting this.
CU,
Michael
2005-05-20 Michael Koch [EMAIL PROTECTED]
* scripts/generate-locale-list.sh:
Use the new locale properties files.
Index: scripts/generate-locale-list.sh
===
RCS file: /cvsroot/classpath/classpath/scripts/generate-locale-list.sh,v
retrieving revision 1.2
diff -u -r1.2 generate-locale-list.sh
--- scripts/generate-locale-list.sh 19 May 2005 06:45:04 - 1.2
+++ scripts/generate-locale-list.sh 20 May 2005 05:35:48 -
@@ -52,7 +52,7 @@
echo public static String[] localeNames =
echo {
-( cd $CLASSPATH_SRCDIR/resource/gnu/java/locale ; ls LocaleInformation_*.java
) | xargs -n 1 echo | sed -e 's/LocaleInformation_\(.*\)\.java/\1/' |
+( cd $CLASSPATH_SRCDIR/resource/gnu/java/locale ; ls
LocaleInformation_*.properties ) | xargs -n 1 echo | sed -e
's/LocaleInformation_\(.*\)\.properties/\1/' |
while read locale ; do echo \$locale\, ; done
echo };
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: PING: Re: RFC: [cp-patches] META-INF support
On Mon, May 16, 2005 at 01:19:47PM +0100, Andrew John Hughes wrote: On Sun, 2005-04-17 at 15:34 +0100, Andrew John Hughes wrote: On Mon, 2005-04-11 at 17:35 +0100, Andrew John Hughes wrote: On Mon, 2005-04-11 at 07:40 +0200, Michael Koch wrote: On Mon, Apr 11, 2005 at 03:59:00AM +0100, Andrew John Hughes wrote: As to a jar version, we considered this recently on the list. One reason we call it glibj.zip is because it can't be used as a normal jar, and using a different file extension (which still fits the content, because jars, AFAIK, are just zips with defined metadata) helps differentiate it. I can foresee someone posting a GCJ bug when they try to use -findirect-dispatch on it... Would not work as java.lang.Object and some other VM important classes are too different (currently). Exactly; if we allow a jar name, I can see someone filing a PR for that problem. Index: examples/Makefile.am === RCS file: /cvsroot/classpath/classpath/examples/Makefile.am,v retrieving revision 1.3 diff -u -3 -p -u -r1.3 Makefile.am --- examples/Makefile.am 7 Feb 2005 02:32:37 - 1.3 +++ examples/Makefile.am 11 Apr 2005 02:49:55 - @@ -11,7 +11,7 @@ if FOUND_GCJX JCOMPILER = $(GCJX) -bootclasspath '' -sourcepath '' -classpath $(top_builddir)/lib:. else if FOUND_ECJ -JCOMPILER = $(ECJ) --bootclasspath '$(top_builddir)/lib' --classpath . +JCOMPILER = $(ECJ) -bootclasspath '$(top_builddir)/lib' -classpath . else error dunno how to setup the JCOMPILER and compile endif In a separate patch this would be obvious and already in I guess. ;-) Yes, this is my bad; I did this a while ago and forgot to commit it (I only spotted this when testing the generics branch). At least it's the same sort of file... ;) Index: lib/Makefile.am === RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v retrieving revision 1.79 diff -u -3 -p -u -r1.79 Makefile.am --- lib/Makefile.am 7 Feb 2005 02:32:37 - 1.79 +++ lib/Makefile.am 11 Apr 2005 02:50:04 - @@ -53,6 +53,7 @@ install-data-local: genclasses compile-c cp -R java $(DESTDIR)$(pkgdatadir) cp -R javax $(DESTDIR)$(pkgdatadir) cp -R org $(DESTDIR)$(pkgdatadir) + cp -R META-INF $(DESTDIR)$(pkgdatadir) # FIXME - should mimic doc/api/Makefile.am instead... uninstall-local: @@ -60,13 +61,14 @@ uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir)/java rm -rf $(DESTDIR)$(pkgdatadir)/javax rm -rf $(DESTDIR)$(pkgdatadir)/org + rm -rf $(DESTDIR)$(pkgdatadir)/META-INF endif # INSTALL_CLASS_FILES .PHONY: genclasses glibj.zip: classes compile-classes resources - if test $(ZIP) != ; then $(ZIP) -r -D glibj.zip gnu java javax org /dev/null; fi + if test $(ZIP) != ; then $(ZIP) -r -D glibj.zip gnu java javax org META-INF /dev/null; fi resources: if ! [ -e gnu ]; then mkdir gnu; fi @@ -78,6 +80,8 @@ resources: @list='$(propertyfiles)'; for p in $$list; do \ cp $(top_srcdir)/resource/$$p $$p; \ done + if [ -e META-INF ]; then rm -rf META-INF; fi + cp -r $(top_srcdir)/resource/META-INF . touch resources classes: genclasses @@ -122,6 +126,7 @@ clean-local: -rm -rf java -rm -rf javax -rm -rf org + -rm -rf META-INF dist-hook: mkdir -p $(distdir) How does $(top_srcdir)/resource/META-INF gets created? It's not in CVS. Michael Whoops... forgot to cvs add them. My excuse is that I shouldn't do this late at night, and instead wait until morning. My third attempt is attached, which includes the services file. Talking of that dir, I'm unsure about the org.xml.sax.driver. This is the only way it works for me, but it may be wrong. Any comments on this (particularly from Chris) would be welcomed. ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches Any movement on this? ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches Again, is it okay to commit this? Okay. Sorry for the delay. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org
Re: [cp-patches] FYI: The first working CORBA prototype
On Sun, May 15, 2005 at 03:17:24AM +0200, Meskauskas Audrius wrote: 2005-05-15 Audrius Meskauskas, Lithuania [EMAIL PROTECTED] I have just committed the following IIOP (CORBA) implementation: You broke Classpath compilation by introducing code using JUnit. Please fix this. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch][RFC] Moving locale data to properties files
Hi list,
I moved all locale data into properties file now.
These files are generated by an experimental version fo gnu.localegen
part of cp-tools. The functional changes to our sources are attached.
The locale data changes is uploaded here:
http://www.kaffe.org/~mkoch/locales-data.diff.bz2
(the file is 530 kb in bzip2 format, 5.5 MB unpacked)
Please comment on the changes.
Michael
2005-05-04 Michael Koch [EMAIL PROTECTED]
* java/text/DateFormatSymbols.java
(getStringArray): New method.
(getZoneStrings): Likewise.
(DateFormatSymbols): Load symbols from properties files.
* java/util/Locale.java
(getDisplayLanguage): Handle new way to load language names.
(getDisplayCountry): Handle new way to load territory names.
(getDisplayVariant): Handle new way to load variant names.
* lib/Makefile.am, lib/gen-classlist.sh.in:
No need to special case classes from gnu.java.locale anymore.
* scripts/generate-locale-list.sh:
Generate list from the new properties files.
Index: java/text/DateFormatSymbols.java
===
RCS file: /cvsroot/classpath/classpath/java/text/DateFormatSymbols.java,v
retrieving revision 1.15
diff -u -r1.15 DateFormatSymbols.java
--- java/text/DateFormatSymbols.java16 Feb 2005 11:18:38 - 1.15
+++ java/text/DateFormatSymbols.java4 May 2005 07:14:56 -
@@ -41,6 +41,7 @@
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import java.util.StringTokenizer;
/**
* This class acts as container for locale specific date/time formatting
@@ -78,13 +79,62 @@
transient String[] dateFormats;
transient String[] timeFormats;
- private String[] formatsForKey(ResourceBundle res, String key)
+ private static String[] getStringArray(ResourceBundle res, String name)
+ {
+int index = 0;
+String data = res.getString(name);
+StringTokenizer st = new StringTokenizer(data, \u00ae);
+String[] array = new String[st.countTokens()];
+
+while (st.hasMoreTokens())
+ {
+array[index] = st.nextToken();
+ index++;
+ }
+
+return array;
+ }
+
+ private String[][] getZoneStrings(ResourceBundle res)
{
-String[] values = new String [formatPrefixes.length];
-for (int i = 0; i formatPrefixes.length; i++)
+try
+ {
+int index = 0;
+String data = res.getString(zoneStrings);
+StringTokenizer st = new StringTokenizer(data, \u00ae\u00ae);
+String[][] array = new String[st.countTokens()][];
+
+while (st.hasMoreTokens())
+ {
+ int index2 = 0;
+ String token = st.nextToken();
+ StringTokenizer st2 = new StringTokenizer(token, \u00ae);
+array[index] = new String[st2.countTokens()];
+
+ while (st2.hasMoreTokens())
+ {
+array[index][index2] = st2.nextToken();
+index2++;
+ }
+
+ index++;
+ }
+
+return array;
+ }
+catch (MissingResourceException e)
{
-values[i] = res.getString(formatPrefixes[i]+key);
+ return new String[0][];
}
+ }
+
+ private String[] formatsForKey(ResourceBundle res, String key)
+ {
+String[] values = new String[formatPrefixes.length];
+
+for (int i = 0; i formatPrefixes.length; i++)
+ values[i] = res.getString(formatPrefixes[i] + key);
+
return values;
}
@@ -101,15 +151,14 @@
= ResourceBundle.getBundle(gnu.java.locale.LocaleInformation, locale,
ClassLoader.getSystemClassLoader());
-ampms = res.getStringArray (ampms);
-eras = res.getStringArray (eras);
-localPatternChars = res.getString (localPatternChars);
-months = res.getStringArray (months);
-shortMonths = res.getStringArray (shortMonths);
-shortWeekdays = res.getStringArray (shortWeekdays);
-weekdays = res.getStringArray (weekdays);
-zoneStrings = (String[][]) res.getObject (zoneStrings);
-
+ampms = getStringArray(res, ampms);
+eras = getStringArray(res, eras);
+localPatternChars = res.getString(localPatternChars);
+months = getStringArray(res, months);
+shortMonths = getStringArray(res, shortMonths);
+shortWeekdays = getStringArray(res, shortWeekdays);
+weekdays = getStringArray(res, weekdays);
+zoneStrings = getZoneStrings(res);
dateFormats = formatsForKey(res, DateFormat);
timeFormats = formatsForKey(res, TimeFormat);
}
Index: java/util/Locale.java
===
RCS file: /cvsroot/classpath/classpath/java/util/Locale.java,v
retrieving revision 1.27
diff -u -r1.27 Locale.java
--- java/util/Locale.java 16 Feb 2005 20:54:25 - 1.27
+++ java/util/Locale.java 4 May 2005 07:14:56 -
@@ -1,5 +1,5
Re: [cp-patches] Patch: FYI: update eclipse infrastructure
On Mon, May 02, 2005 at 09:37:11AM +0200, Robert Schuster wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Tom, I am right that this needs at least Eclipse 3.0? Afaik this needs 3.1M?. 3.0 doesnt work for me. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] java.text.DecimalFormat
Hi list,
I just commited the attached patch to fix bug #12877.
It fixes an issue with java.text.DecimalFormat.hashCode().
Michael
2005-05-02 David Gilbert [EMAIL PROTECTED]
* java/text/DecimalFormat.java
(hashCode): Reimplemented and added API docs.
Index: java/text/DecimalFormat.java
===
RCS file: /cvsroot/classpath/classpath/java/text/DecimalFormat.java,v
retrieving revision 1.21
diff -u -r1.21 DecimalFormat.java
--- java/text/DecimalFormat.java27 Mar 2005 00:09:07 - 1.21
+++ java/text/DecimalFormat.java2 May 2005 17:21:34 -
@@ -1,5 +1,5 @@
/* DecimalFormat.java -- Formats and parses numbers
- Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation,
Inc.
This file is part of GNU Classpath.
@@ -819,12 +819,14 @@
return positiveSuffix;
}
- public int hashCode ()
+ /**
+ * Returns a hash code for this object.
+ *
+ * @return A hash code.
+ */
+ public int hashCode()
{
-int hash = (negativeSuffix.hashCode() ^ negativePrefix.hashCode()
- ^positivePrefix.hashCode() ^ positiveSuffix.hashCode());
-// FIXME.
-return hash;
+return toPattern().hashCode();
}
public boolean isDecimalSeparatorAlwaysShown ()
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] RFC: hacking guide - unrealistic code paths
On Mon, May 02, 2005 at 09:35:48AM +0200, Robert Schuster wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi. I would prefer our own Error/Excpetion with preset text message. Otherwise we will get a different message string all over depending on who wrote the code. I think that is a good idea. Do we have such a class already? If not should it be a subclass of InternalError? a subclass of InternalError might be a good start. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] gnu.java.net.protocol.http.HTTPConnection
Hi list,
I commited the attached obvious patch to remove user agent handling in
gnu.java.net.protocol.http.HTTPConnection. This is done in a better way
in gnu.classpath.SystemProperties and friends.
Michael
2005-04-29 Michael Koch [EMAIL PROTECTED]
* gnu/java/net/protocol/http/HTTPConnection.java:
(userAgent): Initialize from system properties.
(initUserAgent): Removed.
Index: gnu/java/net/protocol/http/HTTPConnection.java
===
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/http/HTTPConnection.java,v
retrieving revision 1.3
diff -u -r1.3 HTTPConnection.java
--- gnu/java/net/protocol/http/HTTPConnection.java 18 Apr 2005 18:40:23
- 1.3
+++ gnu/java/net/protocol/http/HTTPConnection.java 29 Apr 2005 06:25:45
-
@@ -1,5 +1,5 @@
/* HTTPConnection.java --
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -39,6 +39,7 @@
package gnu.java.net.protocol.http;
import gnu.classpath.Configuration;
+import gnu.classpath.SystemProperties;
import gnu.java.net.EmptyX509TrustManager;
import gnu.java.net.protocol.http.event.ConnectionEvent;
import gnu.java.net.protocol.http.event.ConnectionListener;
@@ -83,27 +84,7 @@
*/
public static final int HTTPS_PORT = 443;
- private static final String userAgent = initUserAgent();
-
- private static String initUserAgent()
- {
-try
- {
-StringBuffer buf = new StringBuffer(libgcj);
-buf.append( ();
-buf.append(System.getProperty(os.name));
-buf.append(; );
-buf.append(System.getProperty(os.arch));
-buf.append(; );
-buf.append(System.getProperty(user.language));
-buf.append());
-return buf.toString();
- }
-catch (SecurityException e)
- {
-return inetlib/1.1;
- }
- }
+ private static final String userAgent =
SystemProperties.getProperty(http.agent);
/**
* The host name of the server to connect to.
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] java.nio.charset.Charset.defaultCharset()
Hi list,
I commited the attached patch to reformat the defaultCharset() method of
java.nio.charset.Charset.
Michael
2005-04-29 Michael Koch [EMAIL PROTECTED]
* java/nio/charset/Charset.java
(defaultCharset): Reformatted.
Index: java/nio/charset/Charset.java
===
RCS file: /cvsroot/classpath/classpath/java/nio/charset/Charset.java,v
retrieving revision 1.19
diff -u -r1.19 Charset.java
--- java/nio/charset/Charset.java 28 Apr 2005 05:39:21 - 1.19
+++ java/nio/charset/Charset.java 29 Apr 2005 06:47:34 -
@@ -1,5 +1,5 @@
/* Charset.java --
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -126,22 +126,39 @@
public static Charset defaultCharset()
{
String encoding;
+
try
{
encoding = System.getProperty(file.encoding);
- } catch(SecurityException e) {
+ }
+catch(SecurityException e)
+ {
+ // Use fallback.
encoding = ISO-8859-1;
- } catch(IllegalArgumentException e) {
+ }
+catch(IllegalArgumentException e)
+ {
+ // Use fallback.
encoding = ISO-8859-1;
}
try
{
return forName(encoding);
- } catch(UnsupportedCharsetException e) {
- } catch(IllegalCharsetNameException e) {
- } catch(IllegalArgumentException e) {
}
+catch(UnsupportedCharsetException e)
+ {
+ // Ignore.
+ }
+catch(IllegalCharsetNameException e)
+ {
+ // Ignore.
+ }
+catch(IllegalArgumentException e)
+ {
+ // Ignore.
+ }
+
throw new IllegalStateException(Can't get default charset!);
}
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] java.net.ServerSocket
Hi list, I just commited the attached patch to merge java.net.ServerSocket with gcc HEAD again. Michael 2005-04-23 Michael Koch [EMAIL PROTECTED] * java/net/ServerSocket.java (getChannel): Improved javadoc comment. Index: java/net/ServerSocket.java === RCS file: /cvsroot/classpath/classpath/java/net/ServerSocket.java,v retrieving revision 1.38 diff -u -r1.38 ServerSocket.java --- java/net/ServerSocket.java 15 Oct 2004 10:04:52 - 1.38 +++ java/net/ServerSocket.java 23 Apr 2005 11:34:23 - @@ -399,11 +399,11 @@ } /** - * Returns the unique ServerSocketChannel object + * Returns the unique codeServerSocketChannel/code object * associated with this socket, if any. * - * The socket only has a ServerSocketChannel if its created - * by ServerSocketChannel.open. + * pThe socket only has a codeServerSocketChannel/code if its created + * by codeServerSocketChannel.open()/code./p * * @return the associated socket channel, null if none exists * ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] gnu.classpath.SystemProperties
Hi list,
I just commited the attached patch to reformat the class
gnu.classpath.SystemProperties to meet our style.
Michael
2005-04-22 Michael Koch [EMAIL PROTECTED]
* gnu/classpath/SystemProperties.java:
Reformatted.
Index: gnu/classpath/SystemProperties.java
===
RCS file: /cvsroot/classpath/classpath/gnu/classpath/SystemProperties.java,v
retrieving revision 1.6
diff -u -r1.6 SystemProperties.java
--- gnu/classpath/SystemProperties.java 19 Apr 2005 19:55:23 - 1.6
+++ gnu/classpath/SystemProperties.java 22 Apr 2005 07:32:59 -
@@ -35,6 +35,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package gnu.classpath;
import java.util.Properties;
@@ -49,103 +50,103 @@
*/
public class SystemProperties
{
-/**
- * Stores the current system properties. This can be modified by
- * [EMAIL PROTECTED] #setProperties(Properties)}, but will never be null,
because
- * setProperties(null) sucks in the default properties.
- */
-private static Properties properties;
-
-/**
- * The default properties. Once the default is stabilized,
- * it should not be modified;
- * instead it is cloned when calling codesetProperties(null)/code.
- */
-private static final Properties defaultProperties = new Properties();
-
-static
-{
-VMSystemProperties.preInit(defaultProperties);
-
-defaultProperties.put(gnu.classpath.home,
-Configuration.CLASSPATH_HOME);
-defaultProperties.put(gnu.classpath.version,
-Configuration.CLASSPATH_VERSION);
-
-// Set base URL if not already set.
-if (defaultProperties.get(gnu.classpath.home.url) == null)
-defaultProperties.put(gnu.classpath.home.url,
-file:// + Configuration.CLASSPATH_HOME + /lib);
-
-// Set short name if not already set.
-if (defaultProperties.get(gnu.classpath.vm.shortname) == null)
-{
-String value = defaultProperties.getProperty(java.vm.name);
-int index = value.lastIndexOf(' ');
-if (index != -1)
-value = value.substring(index + 1);
-defaultProperties.put(gnu.classpath.vm.shortname, value);
-}
-
-// Network properties
-if (defaultProperties.get(http.agent) == null)
-{
-String userAgent
-= (gnu-classpath/
-+ defaultProperties.getProperty(gnu.classpath.version)
-+ (
-+ defaultProperties.getProperty(gnu.classpath.vm.shortname)
-+ /
-+ defaultProperties.getProperty(java.vm.version)
-+ ));
-defaultProperties.put(http.agent, userAgent);
-}
-
- // 8859_1 is a safe default encoding to use when not explicitly set
-if (defaultProperties.get(file.encoding) == null)
-defaultProperties.put(file.encoding, 8859_1);
-
-// XXX FIXME - Temp hack for old systems that set the wrong property
-if (defaultProperties.get(java.io.tmpdir) == null)
-defaultProperties.put(java.io.tmpdir,
-defaultProperties.get(java.tmpdir));
-
-VMSystemProperties.postInit(defaultProperties);
-
-// Note that we use clone here and not new. Some programs assume
-// that the system properties do not have a parent.
+ /**
+ * Stores the current system properties. This can be modified by
+ * [EMAIL PROTECTED] #setProperties(Properties)}, but will never be null,
because
+ * setProperties(null) sucks in the default properties.
+ */
+ private static Properties properties;
+
+ /**
+ * The default properties. Once the default is stabilized,
+ * it should not be modified;
+ * instead it is cloned when calling codesetProperties(null)/code.
+ */
+ private static final Properties defaultProperties = new Properties();
+
+ static
+ {
+VMSystemProperties.preInit(defaultProperties);
+
+defaultProperties.put(gnu.classpath.home, Configuration.CLASSPATH_HOME);
+defaultProperties.put(gnu.classpath.version,
+ Configuration.CLASSPATH_VERSION);
+
+// Set base URL if not already set.
+if (defaultProperties.get(gnu.classpath.home.url) == null)
+ defaultProperties.put(gnu.classpath.home.url,
+ file://
+ + Configuration.CLASSPATH_HOME
+ + /lib);
+
+// Set short name if not already set.
+if (defaultProperties.get(gnu.classpath.vm.shortname) == null)
+ {
+ String value = defaultProperties.getProperty(java.vm.name);
+ int index = value.lastIndexOf(' ');
+ if (index != -1)
+ value = value.substring(index + 1);
+ defaultProperties.put(gnu.classpath.vm.shortname, value);
+ }
+
+// Network properties
[cp-patches] [Patch] new nio jni headers regenerated
Hi list,
I just committed that attached patch to fix up our jni headers in CVS.
Michael
2005-04-21 Michael Koch [EMAIL PROTECTED]
* include/gnu_java_nio_charset_iconv_IconvDecoder.h,
include/gnu_java_nio_charset_iconv_IconvEncoder.h:
Regenerated with gcjh from gcc 4.0 branch.
Index: include/gnu_java_nio_charset_iconv_IconvDecoder.h
===
RCS file:
/cvsroot/classpath/classpath/include/gnu_java_nio_charset_iconv_IconvDecoder.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_nio_charset_iconv_IconvDecoder.h
--- include/gnu_java_nio_charset_iconv_IconvDecoder.h 18 Apr 2005 11:35:13
- 1.1
+++ include/gnu_java_nio_charset_iconv_IconvDecoder.h 21 Apr 2005 06:01:13
-
@@ -1,18 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_nio_charset_iconv_IconvDecoder__
+#define __gnu_java_nio_charset_iconv_IconvDecoder__
+
#include jni.h
-#ifndef _Included_IconvDecoder
-#define _Included_IconvDecoder
+
#ifdef __cplusplus
-extern C {
+extern C
+{
#endif
-JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_openIconv
- (JNIEnv *, jobject, jstring);
-JNIEXPORT jint JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_decode
- (JNIEnv *, jobject, jbyteArray, jcharArray, jint,jint,jint,jint);
-JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_closeIconv
- (JNIEnv *, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_openIconv
(JNIEnv *env, jobject, jstring);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_decode
(JNIEnv *env, jobject, jbyteArray, jcharArray, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_closeIconv
(JNIEnv *env, jobject);
#ifdef __cplusplus
}
#endif
-#endif
+
+#endif /* __gnu_java_nio_charset_iconv_IconvDecoder__ */
Index: include/gnu_java_nio_charset_iconv_IconvEncoder.h
===
RCS file:
/cvsroot/classpath/classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_nio_charset_iconv_IconvEncoder.h
--- include/gnu_java_nio_charset_iconv_IconvEncoder.h 18 Apr 2005 11:35:13
- 1.1
+++ include/gnu_java_nio_charset_iconv_IconvEncoder.h 21 Apr 2005 06:01:13
-
@@ -1,18 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_nio_charset_iconv_IconvEncoder__
+#define __gnu_java_nio_charset_iconv_IconvEncoder__
+
#include jni.h
-#ifndef _Included_IconvEncoder
-#define _Included_IconvEncoder
+
#ifdef __cplusplus
-extern C {
+extern C
+{
#endif
-JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_openIconv
- (JNIEnv *, jobject, jstring);
-JNIEXPORT jint JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_encode
- (JNIEnv *, jobject, jcharArray, jbyteArray, jint,jint,jint,jint);
-JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_closeIconv
- (JNIEnv *, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_openIconv
(JNIEnv *env, jobject, jstring);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_encode
(JNIEnv *env, jobject, jcharArray, jbyteArray, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_closeIconv
(JNIEnv *env, jobject);
#ifdef __cplusplus
}
#endif
-#endif
+
+#endif /* __gnu_java_nio_charset_iconv_IconvEncoder__ */
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] VM interface for java.io.ObjectInputStream
Hi list,
I just commited the attached patch to put the native methods of
java.io.ObjectInputInterface into the VM interface.
Michael
2005-04-16 Michael Koch [EMAIL PROTECTED]
* include/Makefile.am: Removed java_io_ObjectInputStream.h
and added java_io_VMObjectInputStream.h.
* include/java_io_ObjectInputStream.h: Removed.
* include/java_io_VMObjectInputStream.h: New file.
* java/io/ObjectInputStream.java
(currentClassLoader): Removed.
(allocateObject): Likewise.
* native/jni/java-io/Makefile.am: Removed java_io_ObjectInputStream.c
and added java_io_VMObjectInputStream.c.
* native/jni/java-io/java_io_ObjectInputStream.c: Removed.
* native/jni/java-io/java_io_VMObjectInputStream.c: New file.
* vm/reference/java/io/VMObjectInputStream.java: Likewise.
Index: include/Makefile.am
===
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.41
diff -u -r1.41 Makefile.am
--- include/Makefile.am 16 Apr 2005 09:19:54 - 1.41
+++ include/Makefile.am 16 Apr 2005 11:04:40 -
@@ -72,8 +72,8 @@
$(top_srcdir)/include/gnu_java_nio_VMPipe.h \
$(top_srcdir)/include/gnu_java_nio_VMSelector.h \
$(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h \
-$(top_srcdir)/include/java_io_ObjectInputStream.h \
$(top_srcdir)/include/java_io_VMFile.h \
+$(top_srcdir)/include/java_io_VMObjectInputStream.h \
$(top_srcdir)/include/java_io_VMObjectStreamClass.h \
$(top_srcdir)/include/java_lang_Math.h \
$(top_srcdir)/include/java_lang_VMDouble.h \
@@ -111,10 +111,10 @@
$(JAVAH) -o $@ gnu.java.nio.VMPipe
$(top_srcdir)/include/gnu_java_nio_VMSelector.h:
$(top_srcdir)/vm/reference/gnu/java/nio/VMSelector.java
$(JAVAH) -o $@ gnu.java.nio.VMSelector
-$(top_srcdir)/include/java_io_ObjectInputStream.h:
$(top_srcdir)/java/io/ObjectInputStream.java
- $(JAVAH) -o $@ java.io.ObjectInputStream
$(top_srcdir)/include/java_io_VMFile.h:
$(top_srcdir)/vm/reference/java/io/VMFile.java
$(JAVAH) -o $@ java.io.VMFile
+$(top_srcdir)/include/java_io_VMObjectInputStream.h:
$(top_srcdir)/vm/reference/java/io/VMObjectInputStream.java
+ $(JAVAH) -o $@ java.io.VMObjectInputStream
$(top_srcdir)/include/java_io_VMObjectStreamClass.h:
$(top_srcdir)/vm/reference/java/io/VMObjectStreamClass.java
$(JAVAH) -o $@ java.io.VMObjectStreamClass
$(top_srcdir)/include/java_lang_Math.h: $(top_srcdir)/java/lang/Math.java
Index: include/java_io_ObjectInputStream.h
===
RCS file: include/java_io_ObjectInputStream.h
diff -N include/java_io_ObjectInputStream.h
--- include/java_io_ObjectInputStream.h 6 Dec 2004 17:11:45 - 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,22 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_io_ObjectInputStream__
-#define __java_io_ObjectInputStream__
-
-#include jni.h
-
-#ifdef __cplusplus
-extern C
-{
-#endif
-
-JNIEXPORT jobject JNICALL Java_java_io_ObjectInputStream_currentClassLoader
(JNIEnv *env, jclass, jobject);
-JNIEXPORT jobject JNICALL Java_java_io_ObjectInputStream_allocateObject
(JNIEnv *env, jobject, jclass, jclass, jobject);
-#undef java_io_ObjectInputStream_BUFFER_SIZE
-#define java_io_ObjectInputStream_BUFFER_SIZE 1024L
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_io_ObjectInputStream__ */
Index: include/java_io_VMObjectInputStream.h
===
RCS file: include/java_io_VMObjectInputStream.h
diff -N include/java_io_VMObjectInputStream.h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ include/java_io_VMObjectInputStream.h 16 Apr 2005 11:04:40 -
@@ -0,0 +1,20 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __java_io_VMObjectInputStream__
+#define __java_io_VMObjectInputStream__
+
+#include jni.h
+
+#ifdef __cplusplus
+extern C
+{
+#endif
+
+JNIEXPORT jobject JNICALL Java_java_io_VMObjectInputStream_currentClassLoader
(JNIEnv *env, jclass, jobject);
+JNIEXPORT jobject JNICALL Java_java_io_VMObjectInputStream_allocateObject
(JNIEnv *env, jclass, jclass, jclass, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __java_io_VMObjectInputStream__ */
Index: java/io/ObjectInputStream.java
===
RCS file: /cvsroot/classpath/classpath/java/io/ObjectInputStream.java,v
retrieving revision 1.54
diff -u -r1.54 ObjectInputStream.java
--- java/io/ObjectInputStream.java 22 Feb 2005 03:39:43 - 1.54
+++ java/io/ObjectInputStream.java 16 Apr 2005 11:04:41 -
@@ -796,7 +796,7 @@
if (sm == null)
sm = new SecurityManager () {};
-return currentClassLoader(sm);
+return VMObjectInputStream.currentClassLoader(sm);
}
/**
@@ -888,7 +888,7 @@
if (sm == null)
sm = new
[cp-patches] [Patch] java.rmi.server.RemoteObject
Hi list, I just commited the attached patch to remove an unused import statement. Michael 2005-04-16 Michael Koch [EMAIL PROTECTED] * java/rmi/server/RemoteObject.java: Removed unused import statement. Index: java/rmi/server/RemoteObject.java === RCS file: /cvsroot/classpath/classpath/java/rmi/server/RemoteObject.java,v retrieving revision 1.7 diff -u -r1.7 RemoteObject.java --- java/rmi/server/RemoteObject.java 17 Feb 2005 00:39:10 - 1.7 +++ java/rmi/server/RemoteObject.java 16 Apr 2005 12:07:40 - @@ -7,7 +7,7 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -41,7 +41,6 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import java.lang.reflect.Constructor; import java.rmi.NoSuchObjectException; import java.rmi.Remote; import java.rmi.UnmarshalException; ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] FYI: MetalTabbedPaneUI fix
On Fri, Apr 15, 2005 at 11:03:45AM +0200, Roman Kennke wrote:
The following fix lets MetalTabbedPaneUI create one instance of itself
instead of sharing a singleton.
2005-04-15 Roman Kennke [EMAIL PROTECTED]
* javax/swing/plaf/metal/MetalTabbedPaneUI.java
(createUI): Create one MetalTabbedPaneUI per Component instead
of sharing one instance.
/Roman
Index: javax/swing/plaf/metal/MetalTabbedPaneUI.java
===
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java,v
retrieving revision 1.2
diff -u -r1.2 MetalTabbedPaneUI.java
--- javax/swing/plaf/metal/MetalTabbedPaneUI.java 14 Apr 2005 13:58:51
- 1.2
+++ javax/swing/plaf/metal/MetalTabbedPaneUI.java 15 Apr 2005 09:00:03
-
@@ -38,6 +38,8 @@
package javax.swing.plaf.metal;
+import java.util.HashMap;
+import java.util.Map;
import javax.swing.JComponent;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicTabbedPaneUI;
@@ -46,9 +48,8 @@
extends BasicTabbedPaneUI
{
- // FIXME: maybe replace by a Map of instances when this becomes stateful
/** The shared UI instance for JTabbedPanes. */
- private static MetalTabbedPaneUI instance = null;
+ private static Map instances = null;
As you know this will always contain a HashMap its better to make it a
HashMap as method calls to explicit classes is faster then calling
methods through interfaces. Speed doesnt really matter in this case but
this is a general rule.
/**
* Constructs a new instance of MetalTabbedPaneUI.
@@ -67,8 +68,19 @@
*/
public static ComponentUI createUI(JComponent component)
{
-if (instance == null)
- instance = new MetalTabbedPaneUI();
+if (instances == null)
+ instances = new HashMap();
+
+Object o = instances.get(component);
+MetalTabbedPaneUI instance;
+if (o == null)
+ {
+ instance = new MetalTabbedPaneUI();
+ instances.put(component, instance);
+ }
+else
+ instance = (MetalTabbedPaneUI) o;
+
return instance;
}
}
Michael
--
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
Join the community at http://planet.classpath.org/
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] FYI: fixed year in copyright notice of new Metal classes
On Thu, Apr 14, 2005 at 06:28:53PM +0100, Andrew John Hughes wrote: Someone correct me if I'm wrong, but I think the amendment should be to list both years, not to throw away the first (i.e. 2002,2005 rather than 2005) Generally right but wrong in this case because these files were written this year and dont existed in 2002. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] NetworkInterface constructors
Hi list,
I just commited the attached patch to fix a constructor in
java.net.NetworkInterface and to introduce another convenience
constructor.
Michael
2005-04-12 Michael Koch [EMAIL PROTECTED]
* java/net/NetworkInterface.java
(NetworkInterface): Made constructor package private.
Introduced another constructor for more addresses on one
interface.
Index: java/net/NetworkInterface.java
===
RCS file: /cvsroot/classpath/classpath/java/net/NetworkInterface.java,v
retrieving revision 1.13
diff -u -r1.13 NetworkInterface.java
--- java/net/NetworkInterface.java 11 Apr 2005 18:58:39 - 1.13
+++ java/net/NetworkInterface.java 12 Apr 2005 09:07:43 -
@@ -56,13 +56,22 @@
private String name;
private Vector inetAddresses;
- private NetworkInterface(String name, InetAddress address)
+ NetworkInterface(String name, InetAddress address)
{
this.name = name;
this.inetAddresses = new Vector(1, 1);
this.inetAddresses.add(address);
}
+ NetworkInterface(String name, InetAddress[] addresses)
+ {
+this.name = name;
+this.inetAddresses = new Vector(addresses.length, 1);
+
+for (int i = 0; i addresses.length; i++)
+ this.inetAddresses.add(addresses[i]);
+ }
+
/**
* Returns the name of the network interface
*
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] java.awt.FontMetrics
Hi list,
I just commited the attached patch to add teh missing getStringBounds
methods.
Michael
2005-04-12 Michael Koch [EMAIL PROTECTED]
* java/awt/FontMetrics.java
(getStringBounds): New methods.
Index: java/awt/FontMetrics.java
===
RCS file: /cvsroot/classpath/classpath/java/awt/FontMetrics.java,v
retrieving revision 1.10
diff -u -r1.10 FontMetrics.java
--- java/awt/FontMetrics.java 16 Nov 2004 09:59:11 - 1.10
+++ java/awt/FontMetrics.java 12 Apr 2005 12:03:51 -
@@ -1,5 +1,5 @@
/* FontMetrics.java -- Information about about a fonts display characteristics
- Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -40,6 +40,7 @@
import java.awt.font.FontRenderContext;
import java.awt.font.LineMetrics;
+import java.awt.geom.Rectangle2D;
import java.text.CharacterIterator;
// FIXME: I leave many methods basically unimplemented. This
@@ -460,4 +461,32 @@
rc = gRC;
return font.getLineMetrics(ci, begin, limit, rc);
}
+
+ public Rectangle2D getStringBounds(String str, Graphics context)
+ {
+return font.getStringBounds(str, getFontRenderContext(context));
+ }
+
+ public Rectangle2D getStringBounds(String str, int beginIndex, int limit,
Graphics context)
+ {
+return font.getStringBounds(str, beginIndex, limit,
getFontRenderContext(context));
+ }
+
+ public Rectangle2D getStringBounds(char[] chars, int beginIndex, int limit,
Graphics context)
+ {
+return font.getStringBounds(chars, beginIndex, limit,
getFontRenderContext(context));
+ }
+
+ public Rectangle2D getStringBounds(CharacterIterator ci, int beginIndex, int
limit, Graphics context)
+ {
+return font.getStringBounds(ci, beginIndex, limit,
getFontRenderContext(context));
+ }
+
+ private FontRenderContext getFontRenderContext(Graphics context)
+ {
+if (context instanceof Graphics2D)
+ return ((Graphics2D) context).getFontRenderContext();
+
+throw new UnsupportedOperationException(not implemented for Graphics
contexts);
+ }
}
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] java.awt.FontMetrics reformatted
Hi list,
I just commited the attached patch to reformat java/awt/FontMetics.java
and to to make one method more general.
Michael
2005-04-12 Michael Koch [EMAIL PROTECTED]
* java/awt/FontMetrics.java: Reformatted.
(getFontRenderContext): Handle case when java.awt.Graphics context is
given.
Index: java/awt/FontMetrics.java
===
RCS file: /cvsroot/classpath/classpath/java/awt/FontMetrics.java,v
retrieving revision 1.11
diff -u -r1.11 FontMetrics.java
--- java/awt/FontMetrics.java 12 Apr 2005 12:04:39 - 1.11
+++ java/awt/FontMetrics.java 12 Apr 2005 12:15:39 -
@@ -50,7 +50,7 @@
* This class returns information about the display characteristics of
* a font. It is abstract, and concrete subclasses should implement at
* least the following methods:
- * p
+ *
* ul
* ligetAscent()/li
* ligetDescent()/li
@@ -64,422 +64,355 @@
*/
public abstract class FontMetrics implements java.io.Serializable
{
+ // Serialization constant.
+ private static final long serialVersionUID = 1681126225205050147L;
-/*
- * Static Variables
- */
-
-// Serialization constant
-private static final long serialVersionUID = 1681126225205050147L;
-
-/*/
-
-/*
- * Instance Variables
- */
-
-/**
- * This is the font for which metrics will be returned.
- */
-protected Font font;
-
-/*/
-
-/*
- * Constructors
- */
-
-/**
- * Initializes a new instance of codeFontMetrics/code for the
- * specified font.
- *
- * @param font The font to return metric information for.
- */
-protected
-FontMetrics(Font font)
-{
- this.font = font;
-}
-
-/*/
-
-/*
- * Instance Methods
- */
-
-/**
- * Returns the font that this object is creating metric information fo.
- *
- * @return The font for this object.
- */
-public Font
-getFont()
-{
- return(font);
-}
-
-/*/
-
-/**
- * Returns the leading, or spacing between lines, for this font.
- *
- * @return The font leading.
- */
-public int
-getLeading()
-{
- return(0);
-}
-
-/*/
-
-/**
- * Returns the ascent of the font, which is the distance from the base
- * to the top of the majority of characters in the set. Some characters
- * can exceed this value however.
- *
- * @return The font ascent.
- */
-public int
-getAscent()
-{
- return(1);
-}
-
-/*/
-
-/**
- * Returns the descent of the font, which is the distance from the base
- * to the bottom of the majority of characters in the set. Some characters
- * can exceed this value however.
- *
- * @return The font descent.
- */
-public int
-getDescent()
-{
- return(1);
-}
-
-/*/
-
-/**
- * Returns the height of a line in this font. This will be the sum
- * of the leading, the ascent, and the descent.
- *
- * @return The height of the font.
- */
-public int
-getHeight()
-{
- return(getAscent() + getDescent() + getLeading());
-}
-
-/*/
-
-/**
- * Returns the maximum ascent value. This is the maximum distance any
- * character in the font rised above the baseline.
- *
- * @return The maximum ascent for this font.
- */
-public int
-getMaxAscent()
-{
- return(getAscent());
-}
-
-/*/
-
-/**
- * Returns the maximum descent value. This is the maximum distance any
- * character in the font extends below the baseline.
- *
- * @return The maximum descent for this font.
- */
-public int
-getMaxDescent()
-{
- return getMaxDecent ();
-}
-
-/*/
+ /**
+ * This is the font for which metrics will be returned.
+ */
+ protected Font font;
+
+ /**
+ * Initializes a new instance of codeFontMetrics/code for the
+ * specified font.
+ *
+ * @param font The font to return metric information for.
+ */
+ protected FontMetrics(Font font)
+ {
+this.font = font;
+ }
-/**
- * Returns the maximum descent value. This is the maximum distance any
- * character in the font extends below the baseline.
- *
- * @return The maximum descent for this font.
- *
- * @deprecated This method is deprecated in favor of
- * codegetMaxDescent()/code.
- */
-public int
-getMaxDecent()
-{
- return getDescent ();
-}
+ /**
+ * Returns the font that this object is creating metric information fo.
+ *
+ * @return The font for this object.
+ */
+ public Font getFont()
+ {
+return font
[cp-patches] [Patch] java.awt.image.RasterOp
Hi list,
I just commited the attached patch to properly format the source.
Michael
2005-04-12 Michael Koch [EMAIL PROTECTED]
* java/awt/image/RasterOp.java:
Fixed wrong formatting.
Index: java/awt/image/RasterOp.java
===
RCS file: /cvsroot/classpath/classpath/java/awt/image/RasterOp.java,v
retrieving revision 1.4
diff -u -r1.4 RasterOp.java
--- java/awt/image/RasterOp.java27 Sep 2004 15:11:47 - 1.4
+++ java/awt/image/RasterOp.java12 Apr 2005 14:12:13 -
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000, 2002, 2004 Free Software Foundation
+/* RasterOp.java --
+ Copyright (C) 2000, 2002, 2004, 2005 Free Software Foundation
This file is part of GNU Classpath.
@@ -41,8 +42,8 @@
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
-public interface RasterOp {
-
+public interface RasterOp
+{
WritableRaster filter(Raster src, WritableRaster dest);
Rectangle2D getBounds2D(Raster src);
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] HTMLDocument
Hi list,
I just commited the attached patch to add a new file written by Audrius.
Michael
2005-04-12 Audrius Meskauskas, Lithuania [EMAIL PROTECTED]
* javax/swing/text/html/HTMLDocument.java: New file.
Index: javax/swing/text/html/HTMLDocument.java
===
RCS file: javax/swing/text/html/HTMLDocument.java
diff -N javax/swing/text/html/HTMLDocument.java
--- /dev/null 1 Jan 1970 00:00:00 -
+++ javax/swing/text/html/HTMLDocument.java 12 Apr 2005 17:02:42 -
@@ -0,0 +1,53 @@
+/* HTMLDocument.java --
+ Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.swing.text.html;
+
+import javax.swing.text.DefaultStyledDocument;
+
+/**
+ * TODO: This class is not yet completetely implemented.
+ *
+ * @author Audrius Meskauskas, Lithuania ([EMAIL PROTECTED])
+ */
+public class HTMLDocument extends DefaultStyledDocument
+{
+ public void processHTMLFrameHyperlinkEvent(HTMLFrameHyperlinkEvent event)
+ {
+ }
+}
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] java.io.FilePermission
Hi list,
I just commited the attached patch to implement handling of
'ALL FILES' in java.io.FilePermission.
Michael
2005-04-12 Michael Koch [EMAIL PROTECTED]
* java/io/FilePermission.java
(serialVersionUID): Made private.
(ALL_FILES): New constant.
(implies): Handle 'ALL FILES' case.
Index: java/io/FilePermission.java
===
RCS file: /cvsroot/classpath/classpath/java/io/FilePermission.java,v
retrieving revision 1.17
diff -u -r1.17 FilePermission.java
--- java/io/FilePermission.java 6 Nov 2004 23:10:02 - 1.17
+++ java/io/FilePermission.java 12 Apr 2005 17:39:32 -
@@ -1,5 +1,5 @@
-/* java.lang.FilePermission
- Copyright (C) 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
+/* FilePermission.java --
+ Copyright (C) 1998, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -7,7 +7,7 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -42,11 +42,13 @@
public final class FilePermission extends Permission implements Serializable
{
- static final long serialVersionUID = 7930732926638008763L;
+ private static final long serialVersionUID = 7930732926638008763L;
private static final String CURRENT_DIRECTORY =
System.getProperty(user.dir);
+ private static final String ALL_FILES = ALL FILES;
+
private boolean readPerm = false;
private boolean writePerm = false;
private boolean executePerm = false;
@@ -200,14 +202,15 @@
*/
public boolean implies(Permission p)
{
-FilePermission fp;
-
if (! (p instanceof FilePermission))
return false;
-fp = (FilePermission) p;
-
String f1 = getName();
+
+if (f1.equals(ALL_FILES))
+ return true;
+
+FilePermission fp = (FilePermission) p;
String f2 = fp.getName();
if (f1.charAt(0) != File.separatorChar)
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: PING: Re: [cp-patches] RFC: Fix for XXX use in java.util.Currency
On Mon, Apr 11, 2005 at 08:46:42AM +0200, Jeroen Frijters wrote: Andrew John Hughes wrote: On Mon, 2005-03-28 at 01:41 +0100, Andrew John Hughes wrote: The attached patch allows examples such as the following: NumberFormat.getCurrencyInstance(Locale.ENGLISH).getCurrency() to succeed with the result of a Currency instance containing XXX rather than throwing a NullPointerException. This is Sun's behaviour, which is made possible by allowing XXX to be supplied to Currency.getInstance(String). This is something we have discussed before, which has lead to the introduction of the String version of this value in java.text.DecimalFormatSymbols (11 Jan - Fix for Bug #11545). Should we allow this horrible design decision to creep into GNU Classpath? Comments please. Changelog: 2005-03-28 Andrew John Hughes [EMAIL PROTECTED] * java/text/DecimalFormatSymbols.java: Added retrieval of XXX instance in place of null. * java/util/Currency.java, (Currency(String)): New constructor for the XXX special case. (getInstance(String)): Allow special case of XXX. Does anyone have any comments on this patch, posted March 28th? Should I commit it or not? I like it and I vote for committing it. /me too. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] Re: -ko on libjava/external/sax/org/xml/sax/helpers/NamespaceSupport.java
On Sat, Apr 09, 2005 at 11:17:55PM +0100, Andrew John Hughes wrote: On Sat, 2005-04-09 at 13:07 -0700, Geoffrey Keating wrote: I did cvs admin -ko libjava/external/sax/org/xml/sax/helpers/NamespaceSupport.java because it contains an $Id$ tag. (I would have just removed the tag, or used -kk, but I understand this comes from elsewhere and we want to minimise local changes.) GNU Classpath contains the same series of files, and this has been suggested as an appropriate solution in the past (although I don't think anyone has actually gone through with it...) ... If others agree (and such action has not already taken place), I volunteer to do the same procedure on each of these for the GNU Classpath tree. Please go ahead. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] META-INF support
On Sun, Apr 10, 2005 at 03:42:39AM +0200, Robert Schuster wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, AFAIK we support not only delivery as glibj.zip but as glibj.jar and as a plain directory. The patch looks as if it only works for the zip-case. Are there any reasons to make this different for the other two variants? WE dont support glibj.jar for some reasons but you are right that we support a plain directory tree. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] Reindented native/jni code
On Sat, Apr 09, 2005 at 02:19:03AM +0200, Mark Wielaard wrote: Hi Guilhem. On Fri, 2005-04-08 at 14:34 +0200, Guilhem Lavaux wrote: GNU Indent (GNU style) seems to show a lot of differences after having been run on the native/jni code. I have run it on classpath, java-* directories and here is a patch. Thanks. But next time please give people a little while before actually checking a large automatic change like this in. Someone might be working on one of the files and then you would create an unnecessary merge conflict. Now that this is in I get a build failure since the JNI check script cannot find all native methods. JNI methods have to start at the position zero of a line. And strangely enough it now also finds a couple of native methods that don't have a corresponding java method definition. The following patch seems to fix the build failure. And all code seem to still work correctly even though I just removed a large collection of code. The code was probably dead. And without it things seem to work fine. But could someone (Michael?) take a quick look? I won't be online till Sunday night so could someone check it in if it isn't too bogus. A broken build is really not acceptable. 2005-04-08 Mark Wielaard [EMAIL PROTECTED] * native/jni/java-lang/java_lang_Double.c: Reindent. * native/jni/java-lang/java_lang_Math.c: Likewise. * native/jni/java-lang/java_lang_Object.c: Likewise. * native/jni/java-lang/java_lang_VMDouble.c: Likewise. * native/jni/java-lang/java_lang_VMFloat.c: Likewise. * native/jni/java-lang/java_lang_VMSystem.c: Likewise. * native/jni/java-lang/java_lang_reflect_Array.c: Likewise. * native/jni/java-nio/java_nio.c (Java_gnu_java_nio_FileChannelImpl_nio_1mmap_1file): Removed. (Java_gnu_java_nio_FileChannelImpl_nio_1unmmap_1file): Likewise. (Java_gnu_java_nio_SocketChannelImpl_SocketCreate): Likewise. (Java_gnu_java_nio_SocketChannelImpl_SocketConnect): Likewise. (Java_gnu_java_nio_SocketChannelImpl_SocketBind): Likewise. (Java_gnu_java_nio_SocketChannelImpl_SocketListen): Likewise. (Java_gnu_java_nio_SocketChannelImpl_SocketAvailable): Likewise. (Java_gnu_java_nio_SocketChannelImpl_SocketClose): Likewise. (Java_gnu_java_nio_SocketChannelImpl_SocketRead): Likewise. (Java_gnu_java_nio_SocketChannelImpl_SocketWrite): Likewise. * native/jni/java-nio/java_nio_VMDirectByteBuffer.c: Reindent. I tested and commited this now. I found no bug with it and it makes HEAD buildable again. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] PipedInputStream.read()
Hi list,
I commited the attached patch to fix a bug reported by Olafur Bragason.
Michael
2005-04-01 Michael Koch [EMAIL PROTECTED]
* java/io/PipedInputStream.java
(read): Make sure a positive byte value is returned. Revised javadoc.
Thanks to Olafur Bragason for reporting these bugs.
Index: java/io/PipedInputStream.java
===
RCS file: /cvsroot/classpath/classpath/java/io/PipedInputStream.java,v
retrieving revision 1.17
diff -u -r1.17 PipedInputStream.java
--- java/io/PipedInputStream.java 16 Nov 2004 11:32:36 - 1.17
+++ java/io/PipedInputStream.java 1 Apr 2005 17:50:38 -
@@ -1,5 +1,5 @@
/* PipedInputStream.java -- Read portion of piped streams.
- Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005 Free Software Foundation,
Inc.
This file is part of GNU Classpath.
@@ -226,18 +226,17 @@
}
/**
-* This method reads bytes from the stream into a caller supplied buffer.
-* It starts storing bytes at position codeoffset/code into the
-* buffer and
-* reads a maximum of codelen/code bytes. Note that this method
-* can actually
-* read fewer than codelen/code bytes. The actual number of bytes
-* read is
-* returned. A -1 is returned to indicated that no bytes can be read
+* This method reads one byte from the stream.
+* -1 is returned to indicated that no bytes can be read
* because the end of the stream was reached. If the stream is already
* closed, a -1 will again be returned to indicate the end of the stream.
-* p
-* This method will block if no byte is available to be read.
+*
+* pThis method will block if no byte is available to be read./p
+*
+* @return the value of the read byte value, or -1 of the end of the stream
+* was reached
+*
+* @throws IOException if an error occured
*/
public int read() throws IOException
{
@@ -248,7 +247,7 @@
// if this method is never called.
int r = read(read_buf, 0, 1);
-return r != -1 ? read_buf[0] : -1;
+return r != -1 ? (read_buf[0] 0xff) : -1;
}
/**
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] GTK peer and java.beans fixes
Hi list,
I just commited the attached patch to merge code from Graphics2D.java to
Graphics.java and to implement some mre methods in
BeanContextSupport.java.
Michael
2005-03-31 Michael Koch [EMAIL PROTECTED]
* gnu/java/awt/peer/gtk/GdkGraphics.java
(getClipBounds): Handle clip being null.
(setClip): Likewise.
* java/beans/beancontext/BeanContextSupport.java
(add): Implemented.
(addAll): Likewise.
(clear): Likewise.
(removeAll): Likewise.
(retainAll): Likewise.
Index: gnu/java/awt/peer/gtk/GdkGraphics.java
===
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkGraphics.java,v
retrieving revision 1.38
diff -u -r1.38 GdkGraphics.java
--- gnu/java/awt/peer/gtk/GdkGraphics.java 30 Mar 2005 17:10:10 -
1.38
+++ gnu/java/awt/peer/gtk/GdkGraphics.java 31 Mar 2005 08:05:27 -
@@ -382,7 +382,10 @@
public Rectangle getClipBounds ()
{
-return new Rectangle (clip.x, clip.y, clip.width, clip.height);
+if (clip == null)
+ return null;
+else
+ return clip.getBounds();
}
public Color getColor ()
@@ -423,7 +426,8 @@
public void setClip (Shape clip)
{
-setClip (clip.getBounds ());
+if (clip != null)
+ setClip(clip.getBounds());
}
private native void setFGColor(int red, int green, int blue);
Index: java/beans/beancontext/BeanContextSupport.java
===
RCS file:
/cvsroot/classpath/classpath/java/beans/beancontext/BeanContextSupport.java,v
retrieving revision 1.3
diff -u -r1.3 BeanContextSupport.java
--- java/beans/beancontext/BeanContextSupport.java 30 Mar 2005 12:46:33
- 1.3
+++ java/beans/beancontext/BeanContextSupport.java 31 Mar 2005 08:05:27
-
@@ -163,14 +163,14 @@
if (children.containsKey(targetChild))
return false;
-System.out.println(java.beans.beancontext.BeanContextSupport.add()
ignored for now);
+// FIXME: The second argument is surely wrong.
+children.put(targetChild, targetChild);
return true;
-//throw new Error (Not implemented);
}
public boolean addAll (Collection c)
{
-throw new Error (Not implemented);
+throw new UnsupportedOperationException();
}
public void addBeanContextMembershipListener
@@ -224,7 +224,7 @@
public void clear ()
{
-throw new Error (Not implemented);
+throw new UnsupportedOperationException();
}
public boolean contains (Object o)
@@ -391,7 +391,7 @@
public boolean removeAll (Collection c)
{
-throw new Error (Not implemented);
+throw new UnsupportedOperationException();
}
public void removeBeanContextMembershipListener
(BeanContextMembershipListener bcml)
@@ -401,7 +401,7 @@
public boolean retainAll (Collection c)
{
-throw new Error (Not implemented);
+throw new UnsupportedOperationException();
}
protected final void serialize (ObjectOutputStream oos, Collection coll)
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] [generics] FYI: Minor fixes to java.lang
On Tue, Mar 22, 2005 at 10:09:00AM +0100, Meskauskas Audrius wrote: +/** + * For compatability with Sun's JDK + */ If possible, I would suggest not referring to our shiny Sun without the real need. Generally, it is very good to have serialVersionUID fixed, and not just because of that compatibility. Please read the discussions in our archive about serialVersionUID. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] Patch: RFC: enable Jessie by default
On Wed, Mar 23, 2005 at 02:43:21PM -0700, Tom Tromey wrote: What do people think of letting our URL implementation know about Jessie by default? We recommend Jessie on our front page, so this seemed reasonable to me. (Also, in java-gcj-compat, we currently set java.protocol.handler.pkgs to handle this case; it would be nice to get rid of that.) If Jessie is not available, this won't have any impact that I can see. Good idea. Michael -- Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html Join the community at http://planet.classpath.org/ ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] Patch: FYI: MainThread -vs- class loader
On Wed, Mar 16, 2005 at 04:41:30PM -0700, Tom Tromey wrote: I'm checking this in. I'm going to put something similar in libgcj shortly. While implementing java.endorsed.dirs, I discovered that MainThread tries to load the main class using its own class loader. However, it is probable that MainThread is loaded by the bootstrap loader, while it needs to load the main class using the system class loader. This patch fixes the problem. Can you put a mauve testcase of this into CVS? I know some VMs dont use gnu.java.lang.MainThread yet. Michael -- Java Trap: http://www.gnu.org/philosophy/java-trap.html ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] RFC: JNI implementation of Selector #1
On Thu, Mar 17, 2005 at 06:49:50AM +0100, Robert Schuster wrote: Brings Sourceforge's current no2 most-often downloaded p2p app to life. Well, this code is a straight adaption of GCJ's CNI equivalent. However two bug reports have been created out of this. Great work. Please review the patch and besides normal critique answer me the following questions: 1) Should we introduce a HAVE_SELECT switch as GCJ has? (If yes I need help with this.) Just add sys/select.h into some AC_CHECK_HEADERS macro in configure.ac. Then you will have HAVE_SYS_SELECT_H defined for free. 2) strerror() is not thread-safe. Should I prefer strerror_r() which is less portable? We should probably check for strerror_r in configure.ac and just use it. When some arch dont has it we can still work out a better way. Michael -- Java Trap: http://www.gnu.org/philosophy/java-trap.html ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] Typo fix in XmlParser.java
Hi list,
I just commited the attached patch to fix a typo in XmlParser.java.
Michael
2005-03-13 Michael Koch [EMAIL PROTECTED]
* gnu/xml/aelfred2/XmlParser.java: Fixed typo.
Index: gnu/xml/aelfred2/XmlParser.java
===
RCS file: /cvsroot/classpath/classpath/gnu/xml/aelfred2/XmlParser.java,v
retrieving revision 1.2
diff -u -r1.2 XmlParser.java
--- gnu/xml/aelfred2/XmlParser.java 27 Feb 2005 14:32:29 - 1.2
+++ gnu/xml/aelfred2/XmlParser.java 13 Mar 2005 11:01:06 -
@@ -3382,7 +3382,7 @@
{
if (ids.systemId.indexOf('#') != -1)
{
-handler.verror(SYSTEM id has a URI fragment: + ids.systemId);
+handler.verror(SYSTEM id has an URI fragment: + ids.systemId);
}
ids.baseUri = handler.getSystemId();
if (ids.baseUri == null uriWarnings)
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] imports fixed in https handler
Hi list, I just commited the attached obvious fix for the import statements in the https handler. Michael 2005-03-13 Michael Koch [EMAIL PROTECTED] * gnu/java/net/protocol/https/Handler.java: Reworked import statements. Index: gnu/java/net/protocol/https/Handler.java === RCS file: /cvsroot/classpath/classpath/gnu/java/net/protocol/https/Handler.java,v retrieving revision 1.1 diff -u -r1.1 Handler.java --- gnu/java/net/protocol/https/Handler.java7 Mar 2005 19:27:02 - 1.1 +++ gnu/java/net/protocol/https/Handler.java13 Mar 2005 11:13:32 - @@ -1,5 +1,5 @@ /* Handler.java -- - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,14 +38,14 @@ package gnu.java.net.protocol.https; +import gnu.java.net.protocol.http.HTTPConnection; +import gnu.java.net.protocol.http.HTTPURLConnection; + import java.io.IOException; import java.net.URL; import java.net.URLConnection; import java.net.URLStreamHandler; -import gnu.java.net.protocol.http.HTTPConnection; -import gnu.java.net.protocol.http.HTTPURLConnection; - /** * An HTTPS URL stream handler. * ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] code cleanup in org.omg.CORBA
Hi list, I commited the attached patch to do some code style changes found by checkstyle. Michael 2005-03-13 Michael Koch [EMAIL PROTECTED] * org/omg/CORBA/ARG_IN.java: Removed redundant modifiers. * org/omg/CORBA/ARG_INOUT.java: Likewise. * org/omg/CORBA/ARG_OUT.java: Likewise. * org/omg/CORBA/Any.java: Fixed HTML tags. * org/omg/CORBA/Principal.java: Likewise. * org/omg/CORBA/BAD_PARAM.java: Reordered modifiers. * org/omg/CORBA/FixedHolder.java: Reworked imports. * org/omg/CORBA/StringSeqHolder.java: Likewise. * org/omg/CORBA/TypeCode.java: Likewise. * org/omg/CORBA/TypeCodePackage/BadKind.java: Likewise. * org/omg/CORBA/TypeCodePackage/Bounds.java: Likewise. * org/omg/CORBA/WStringSeqHolder.java: Likewise. * org/omg/CORBA/portable/OutputStream.java: Likewise. Index: org/omg/CORBA/ARG_IN.java === RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/ARG_IN.java,v retrieving revision 1.2 diff -u -r1.2 ARG_IN.java --- org/omg/CORBA/ARG_IN.java 9 Mar 2005 09:56:54 - 1.2 +++ org/omg/CORBA/ARG_IN.java 13 Mar 2005 11:19:57 - @@ -51,5 +51,5 @@ * The flag, specifying that the parameter is used to pass and not to * return the data. */ - static final int value = 1; + int value = 1; } Index: org/omg/CORBA/ARG_INOUT.java === RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/ARG_INOUT.java,v retrieving revision 1.2 diff -u -r1.2 ARG_INOUT.java --- org/omg/CORBA/ARG_INOUT.java9 Mar 2005 09:56:54 - 1.2 +++ org/omg/CORBA/ARG_INOUT.java13 Mar 2005 11:19:57 - @@ -53,5 +53,5 @@ * The constant, specifying that the parameter is used both * to pass and to return the data. */ - static final int value = 3; + int value = 3; } Index: org/omg/CORBA/ARG_OUT.java === RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/ARG_OUT.java,v retrieving revision 1.2 diff -u -r1.2 ARG_OUT.java --- org/omg/CORBA/ARG_OUT.java 9 Mar 2005 09:56:54 - 1.2 +++ org/omg/CORBA/ARG_OUT.java 13 Mar 2005 11:19:57 - @@ -51,5 +51,5 @@ * The flag, indicating that the parameter is used to return, and * not to pass the data. */ - static final int value = 2; + int value = 2; } Index: org/omg/CORBA/Any.java === RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/Any.java,v retrieving revision 1.2 diff -u -r1.2 Any.java --- org/omg/CORBA/Any.java 9 Mar 2005 09:56:54 - 1.2 +++ org/omg/CORBA/Any.java 13 Mar 2005 11:19:57 - @@ -125,7 +125,7 @@ throws BAD_OPERATION; /** - * Extract another codeAny/code from this codeAny/code. + * Extract another codeAny/code from this codeAny/code. * * @throws BAD_OPERATION if this instance contains value other * than codeany/code or the value has not been set. @@ -435,7 +435,7 @@ /** * Writes out the value (without the typecode of the value), stored in - * this coeAny/code. + * this codeAny/code. * * @param output the CORBA stream to write into. * Index: org/omg/CORBA/BAD_PARAM.java === RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/BAD_PARAM.java,v retrieving revision 1.2 diff -u -r1.2 BAD_PARAM.java --- org/omg/CORBA/BAD_PARAM.java9 Mar 2005 09:56:54 - 1.2 +++ org/omg/CORBA/BAD_PARAM.java13 Mar 2005 11:19:57 - @@ -62,7 +62,7 @@ /** * Use serialVersionUID for interoperability. */ - private final static long serialVersionUID = 1917109334939470379L; + private static final long serialVersionUID = 1917109334939470379L; /** * Creates BAD_PARAM with the default minor code of 0 and a Index: org/omg/CORBA/FixedHolder.java === RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/FixedHolder.java,v retrieving revision 1.4 diff -u -r1.4 FixedHolder.java --- org/omg/CORBA/FixedHolder.java 9 Mar 2005 09:56:54 - 1.4 +++ org/omg/CORBA/FixedHolder.java 13 Mar 2005 11:19:57 - @@ -40,12 +40,12 @@ import gnu.CORBA.primitiveTypeCode; +import java.math.BigDecimal; + import org.omg.CORBA.portable.InputStream; import org.omg.CORBA.portable.OutputStream; import org.omg.CORBA.portable.Streamable; -import java.math.BigDecimal; - /** * A holder for CORBA codefixed/code that is mapped into * java codeBigDecimal/code. Index: org/omg/CORBA/Principal.java === RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/Principal.java,v retrieving revision 1.2 diff -u -r1.2 Principal.java --- org
[cp-patches] Re: [commit-cp] classpath ./ChangeLog testsuite/javax.swing.tex...
On Thu, Mar 10, 2005 at 07:29:58AM -0500, Audrius Me?kauskas wrote: CVSROOT: /cvsroot/classpath Module name: classpath Branch: Changes by: Audrius Mekauskas [EMAIL PROTECTED] 05/03/10 12:29:57 Modified files: . : ChangeLog Added files: testsuite/javax.swing.text.html.parser: AllParserTests.java testsuite/javax.swing.text.html.parser/test/gnu/javax/swing/text/html: HTML_Test.java testsuite/javax.swing.text.html.parser/test/gnu/javax/swing/text/html/parser: AttributeList_test.java DTD_test.java Element_Test.java Entity_Test.java HTML_parsing.java HTML_randomTable.java ParserEntityResolverTest.java ParserTest.java Parser_Test.java TagElement_Test.java TestCase.java Text.java Token_locations.java parameterDefaulter_Test.java supplementaryNotifications.java textPreProcessor_Test.java testsuite/javax.swing.text.html.parser/test/gnu/javax/swing/text/html/parser/low: Buffer_Test.java Constants_Test.java ReaderTokenizer_Test.java This should be moved to Mauve. But not into classpath. We have classpath dependant tests already in mauve. Michael -- Java Trap: http://www.gnu.org/philosophy/java-trap.html ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] use standard copyright header on org.omg.CORBA
Hi list, I just commited the attached patch to make org.omg.CORBA use our standard copyright header. Michael 2005-03-09 Michael Koch [EMAIL PROTECTED] * org/omg/CORBA/ARG_IN.java, org/omg/CORBA/ARG_INOUT.java, org/omg/CORBA/ARG_OUT.java, org/omg/CORBA/Any.java, org/omg/CORBA/AnyHolder.java, org/omg/CORBA/BAD_CONTEXT.java, org/omg/CORBA/BAD_INV_ORDER.java, org/omg/CORBA/BAD_OPERATION.java, org/omg/CORBA/BAD_PARAM.java, org/omg/CORBA/BAD_TYPECODE.java, org/omg/CORBA/BooleanHolder.java, org/omg/CORBA/BooleanSeqHolder.java, org/omg/CORBA/Bounds.java, org/omg/CORBA/ByteHolder.java, org/omg/CORBA/COMM_FAILURE.java, org/omg/CORBA/CharHolder.java, org/omg/CORBA/CharSeqHolder.java, org/omg/CORBA/CompletionStatus.java, org/omg/CORBA/Context.java, org/omg/CORBA/ContextList.java, org/omg/CORBA/DATA_CONVERSION.java, org/omg/CORBA/DoubleHolder.java, org/omg/CORBA/DoubleSeqHolder.java, org/omg/CORBA/FREE_MEM.java, org/omg/CORBA/FixedHolder.java, org/omg/CORBA/FloatHolder.java, org/omg/CORBA/FloatSeqHolder.java, org/omg/CORBA/IDLEntity.java, org/omg/CORBA/IMP_LIMIT.java, org/omg/CORBA/INITIALIZE.java, org/omg/CORBA/INTERNAL.java, org/omg/CORBA/INTF_REPOS.java, org/omg/CORBA/INVALID_TRANSACTION.java, org/omg/CORBA/INV_FLAG.java, org/omg/CORBA/INV_IDENT.java, org/omg/CORBA/INV_OBJREF.java, org/omg/CORBA/INV_POLICY.java, org/omg/CORBA/IntHolder.java, org/omg/CORBA/LongHolder.java, org/omg/CORBA/LongLongSeqHolder.java, org/omg/CORBA/LongSeqHolder.java, org/omg/CORBA/MARSHAL.java, org/omg/CORBA/NO_IMPLEMENT.java, org/omg/CORBA/NO_MEMORY.java, org/omg/CORBA/NO_PERMISSION.java, org/omg/CORBA/NO_RESPONSE.java, org/omg/CORBA/NamedValue.java, org/omg/CORBA/OBJECT_NOT_EXIST.java, org/omg/CORBA/OBJ_ADAPTER.java, org/omg/CORBA/ORB.java, org/omg/CORBA/Object.java, org/omg/CORBA/OctetSeqHolder.java, org/omg/CORBA/PERSIST_STORE.java, org/omg/CORBA/Principal.java, org/omg/CORBA/ShortHolder.java, org/omg/CORBA/ShortSeqHolder.java, org/omg/CORBA/StringHolder.java, org/omg/CORBA/SystemException.java, org/omg/CORBA/TCKind.java, org/omg/CORBA/TRANSACTION_REQUIRED.java, org/omg/CORBA/TRANSACTION_ROLLEDBACK.java, org/omg/CORBA/TRANSIENT.java, org/omg/CORBA/TypeCode.java, org/omg/CORBA/TypeCodeHolder.java, org/omg/CORBA/TypeCodePackage/BadKind.java, org/omg/CORBA/TypeCodePackage/Bounds.java, org/omg/CORBA/ULongLongSeqHolder.java, org/omg/CORBA/ULongSeqHolder.java, org/omg/CORBA/UNKNOWN.java, org/omg/CORBA/UShortSeqHolder.java, org/omg/CORBA/UserException.java, org/omg/CORBA/WCharSeqHolder.java, org/omg/CORBA/portable/IDLEntity.java, org/omg/CORBA/portable/InputStream.java, org/omg/CORBA/portable/OutputStream.java, org/omg/CORBA/portable/Streamable.java: Use our standard copyright header. corba.diff.bz2 Description: Binary data ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] [Patch] use standard copyright header on org.omg.CORBA
On Wed, Mar 09, 2005 at 02:52:11PM +0100, Meskauskas Audrius wrote: The copyright headers seems looking exactly as they were before applying the patch and the CVS repository returns an empty page after I ask for the differences. Is our CVS server still working properly? You maybe have -bB in your ~/.cvsrc. I removed whitespace in front of each line of the copyright header, Michael -- Java Trap: http://www.gnu.org/philosophy/java-trap.html ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] FYI:swing.text.html.parser
On Mon, Mar 07, 2005 at 06:15:14PM +0100, Meskauskas Audrius wrote: I commit the implementation of the error tolerant swing.text.html.parser package (SGML DTD driven HTML 4.01 parser). The implementation is too large to be sent into mailing list directly. Instead, you need to download from the web where it is placed under the following address: http://mypage.bluewin.ch/audrius/classpath/html_parser.tar.gz I couldn't build it. At least the file javax/swing/text/ChangedCharSetException.java is missing. Can you please post this file too ? Michael -- Java Trap: http://www.gnu.org/philosophy/java-trap.html ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
[cp-patches] [Patch] import statement cleanup for gnu.java.security
Hi list, I just commited the patch with the ChangeLog entry below. Unfortunately I forgot to create a patch before commiting. It was pretty straightforward. It just reordered import statements and replaced implicit imports with explicit imports. Michael 2005-03-02 Michael Koch [EMAIL PROTECTED] * gnu/java/security/OID.java, gnu/java/security/der/DERReader.java, gnu/java/security/provider/CollectionCertStoreImpl.java, gnu/java/security/provider/DSAParameterGenerator.java, gnu/java/security/provider/DefaultPolicy.java, gnu/java/security/provider/EncodedKeyFactory.java, gnu/java/security/provider/GnuDHPublicKey.java, gnu/java/security/provider/GnuDSAPrivateKey.java, gnu/java/security/provider/GnuDSAPublicKey.java, gnu/java/security/provider/GnuRSAPrivateKey.java, gnu/java/security/provider/GnuRSAPublicKey.java, gnu/java/security/provider/PKIXCertPathValidatorImpl.java, gnu/java/security/provider/RSA.java, gnu/java/security/provider/SHA1PRNG.java, gnu/java/security/provider/SHA1withRSA.java, gnu/java/security/provider/X509CertificateFactory.java, gnu/java/security/x509/GnuPKIExtension.java, gnu/java/security/x509/X500DistinguishedName.java, gnu/java/security/x509/X509CRL.java, gnu/java/security/x509/X509CRLEntry.java, gnu/java/security/x509/X509CertPath.java, gnu/java/security/x509/X509CertSelectorImpl.java, gnu/java/security/x509/X509Certificate.java, gnu/java/security/x509/ext/AuthorityKeyIdentifier.java, gnu/java/security/x509/ext/BasicConstraints.java, gnu/java/security/x509/ext/CRLNumber.java, gnu/java/security/x509/ext/CertificatePolicies.java, gnu/java/security/x509/ext/ExtendedKeyUsage.java, gnu/java/security/x509/ext/Extension.java, gnu/java/security/x509/ext/GeneralNames.java, gnu/java/security/x509/ext/IssuerAlternativeNames.java, gnu/java/security/x509/ext/KeyUsage.java, gnu/java/security/x509/ext/PolicyConstraint.java, gnu/java/security/x509/ext/PolicyMappings.java, gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java, gnu/java/security/x509/ext/ReasonCode.java, gnu/java/security/x509/ext/SubjectAlternativeNames.java, gnu/java/security/x509/ext/SubjectKeyIdentifier.java: Reworked import statments to match our style. -- Java Trap: http://www.gnu.org/philosophy/java-trap.html ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] scrollable JList
On Mon, Feb 28, 2005 at 11:27:30AM +0100, Roman Kennke wrote: Hi, please review the attached patch that improves the behaviour of JList within a scrolling container, especially with layoutOrientation set to JList.HORIZONTAL_WRAP or VERTICAL_WRAP. Is the ChangeLog entry ok? 2005-02-27 Roman Kennke [EMAIL PROTECTED] * javax/swing/JList.java (getPreferredScrollableViewportSize): previous implementation was merely guessing the size, now it respects layoutOrientation, visibleRowCount and preferredSize (getScrollableTracksViewportHeight): reimplemented to respect layoutOrientation, visibleRowCount and preferred size (getScrollableTracksViewportWidth): reimplemented to respect layoutOrientation, visibleRowCount and preferred size * javax/swing/plaf/basic/BasicListUI.java (getPreferredSize): improved calculation of preferredSize when JList is set to HORIZONTAL_WRAP or VERTICAL_WRAP. (getCellBounds): previous implementation assumed a layoutOrientation of JList.VERTICAL, now also ok with JList.HORIZONTAL_WRAP and JList.VERTICAL_WRAP Sentences start with upercase letters, even in english language. :-) The patch itself is very very fine. Please commit. Michael -- Java Trap: http://www.gnu.org/philosophy/java-trap.html ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] Report #4742: the patch is easy to make, but should we really fix that bug?
On Mon, Feb 28, 2005 at 04:09:54PM +0100, Meskauskas Audrius wrote:
The bug #4742 contains a comprehensive test, verifying the work of
StreamTokenizer by parsing randomly generated data under randomly set
options. It reveals the single difference
between the Sun and Classpath implementations. If the numeric character
('0'..'9') obtains a specific status of
comment, whitespace or some other character, Sun's implementation
only treats it as such if found standing alone or in the beginning
of the multi - character number. If the number parsing has once
started, the digits in that number are trated as digits regardless
of they spacific status. For example, after calling whitespaceChars('1',
'1'), it reads 121 as 21 while Classpatch implementation reads it as 2,
of
course.
It is a piece of cake to make a patch for reproducing this
behavior. The StreamTokenizer has many Mauve tests and it is easy to ensure
this does not introduce any obvious regressions.
The question is, to fix of not to fix? A bug or not a bug?
In any case, 4742 can be closed either as not a bug or as
fixed.
P.S. The current Classpath implementation also reads
121 in Sun style (as 21) if parseNumbers() are called AFTER
and not before the whitespaceChars('1', '1'). Further work would be needed to
make parsing independent from the order, in that the properties were set.
This should have been attached to the bug report or at least put a
reference to this thread to the bug report.
I dont wanna comment on the patch yet as I have no time to try it right
now.
Michael
--
Java Trap: http://www.gnu.org/philosophy/java-trap.html
___
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
Re: [cp-patches] Formatting change of JTextComponent.java
On Sun, Feb 27, 2005 at 06:48:25PM +0100, Meskauskas Audrius wrote: Because otherwise the path is impossible to read, as my text editor was configured not to use tabs. As a result, the path contains instructions to replace tabs by spaces, including lines where I have never done any changes. To work around this, I attached the original java file. If you need a readable path instead, the only way is to replace tabs by spaces first. As the editor replaces tabs into spaces automatically, it is unlikely to have any code or formatting alteration during this conversion. You should configure your editor to dont replace tabs by spaces for existing code you dont touch. It is generally recommended to avoid using the tab character as this can cause problems when working with multiple editing and communication tools, many now having configurable tabulation settings. I think, the project would benefit from the global automated replacing of tabs by spaces. Now you seem having the mixed content. Thats true. But doing it by manually as you did is not needed and introduces much confusions. Michael -- Java Trap: http://www.gnu.org/philosophy/java-trap.html ___ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches
