Commit Graph

122 Commits

Author SHA1 Message Date
Tom Tromey
b413c535af Class.java (internalGetFields): Use LinkedHashSet.
* java/lang/Class.java (internalGetFields): Use LinkedHashSet.
	* classpath/lib/java/lang/Class.class: Rebuilt.

From-SVN: r127518
2007-08-15 16:56:17 +00:00
Dalibor Topic
473210a961 re PR classpath/32844 (EnumSet causes code to be miscompiled)
2007-07-31  Dalibor Topic  <robilad@kaffe.org>

        PR 32844
        * java/util/EnumSet.java:
        Made class abstract per API spec.
        (size, iterator, add, addAll, clear, contains,
        containsAll, remove, removeAll, retainAll) Moved 
        into an anonymous inner class in of(T).
        (allOf, noneOf, copyOf, of, range) Made more 
        implementation independent.
        (of(T)) return an instance of an anonymous class
        implementing EmptySet.

From-SVN: r127291
2007-08-08 08:00:32 +00:00
Alfred M. Szmidt
fcfdb14511 natFilePosix.cc (init_native): Define to 0.
2007-08-04  Alfred M. Szmidt  <ams@gnu.org>

        * java/io/natFilePosix.cc (init_native) [!MAXPATHLEN]: Define to 0.
        * java/io/File.java (createTempFile): Don't truncate if the system
        doesn't have a limit on the length of a file name.
        * classpath/lib/java/io/File.class: Regenerate.

From-SVN: r127216
2007-08-04 21:50:01 +00:00
Matthias Klose
f06a83c0b2 Import GNU Classpath (libgcj-import-20070727).
libjava/

2007-08-04  Matthias Klose  <doko@ubuntu.com>

	Import GNU Classpath (libgcj-import-20070727).

	* Regenerate class and header files.
	* Regenerate auto* files.

	* include/jvm.h:
	* jni-libjvm.cc (Jv_JNI_InvokeFunctions): Rename type.
	* jni.cc (_Jv_JNIFunctions, _Jv_JNI_InvokeFunctions): Likewise.
	* jni.cc (_Jv_JNI_CallAnyMethodA, _Jv_JNI_CallAnyVoidMethodA,
	_Jv_JNI_CallMethodA, _Jv_JNI_CallVoidMethodA,
	_Jv_JNI_CallStaticMethodA, _Jv_JNI_CallStaticVoidMethodA,
	_Jv_JNI_NewObjectA, _Jv_JNI_SetPrimitiveArrayRegion): Constify
	jvalue parameter.
	* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Likewise.

	* java/lang/VMFloat.java (toString, parseFloat): New.

	* gnu/awt/xlib/XToolkit.java (setAlwaysOnTop, isModalityTypeSupported,
	isModalExclusionTypeSupported): New (stub only).
	* gnu/awt/xlib/XCanvasPeer.java (requestFocus): Likewise.
	* gnu/awt/xlib/XFramePeer.java (updateMinimumSize, updateIconImages,
	updateFocusableWindowState, setModalBlocked, getBoundsPrivate,
	setAlwaysOnTop): Likewise.
	* gnu/awt/xlib/XFontPeer.java (canDisplay): Update signature.

	* scripts/makemake.tcl: Ignore gnu/javax/sound/sampled/gstreamer,
	ignore javax.sound.sampled.spi.MixerProvider, ignore .in files.

	* HACKING: Mention --enable-gstreamer-peer, removal of generated files.


libjava/classpath/

2007-08-04  Matthias Klose  <doko@ubuntu.com>

	* java/util/EnumMap.java (clone): Add cast.

From-SVN: r127204
2007-08-04 10:53:49 +00:00
Tom Tromey
e018712466 * Rebuild .class files with new ecj.
From-SVN: r126998
2007-07-27 21:14:19 +00:00
Tom Tromey
6e7b20ac6e File.java: Implement Comparable<File>.
* java/io/File.java: Implement Comparable<File>.
	(compareTo): Removed.
	* java/io/File.h: Rebuilt.
	* classpath/lib/java/io/File.class: Rebuilt.

From-SVN: r126670
2007-07-16 05:00:28 +00:00
Tom Tromey
65d0c7885e * Rebuilt .class files.
From-SVN: r126663
2007-07-15 23:58:55 +00:00
Keith Seitz
14d4217b59 Update from classpath trunk:
* classpath/lib/gnu/classpath/jdwp/value/StringValue.class:
        Regenerate.

        * gnu/classpath/jdwp/value/StringValue.java
        (StringValue): Tag of StringValue is STRING not OBJECT.
        (write): String values are written to the wire as tag byte
        and object ID, not JdwpString.

From-SVN: r125897
2007-06-20 20:35:22 +00:00
Keith Seitz
67b2a930fd VMVirtualMachine.java (executeMethod): Update from reference implementation.
* gnu/classpath/jdwp/VMVirtualMachine.java (executeMethod):
        Update from reference implementation.
        * gnu/classpath/jdwp/natVMVirtualMachine.cc (executeMethod):
        Update parameter list to match new VMVirtualMachine interface.
        * classpath/lib/gnu/classpath/jdwp/processor/ClassTypeCommandSet.class:
        Regenerate.
        * classpath/lib/gnu/classpath/jdwp/processor/
        ObjectReferenceCommandSet.class: Regenerate.
        * classpath/lib/gnu/classpath/jdwp/value/ObjectValue.class: Regenerate.
        * classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class: Regenerate.
        * classpath/lib/gnu/classpath/jdwp/util/MethodResult.class: Regenerate.

From-SVN: r125896
2007-06-20 20:32:20 +00:00
Keith Seitz
02b1e78caf Breakpoint.java: Make abstract.
* gnu/gcj/jvmti/Breakpoint.java: Make abstract.
        (method): Change from private to protected.
        (location): Likewise.
        (Breakpoint): Change argument list to take only integer type.
        Add default constructor.
        (initialize_native): Renamed to ...
        (_save_insn): ... this to make function more explicit.
        (execute): New method.
        * gnu/gcj/jvmti/Breakpoint.h: Regenerate.
        * gnu/gcj/jvmti/natBreakpoint.cc (initialize_native): Rename to...
        (_save_insn): ... this.
        (install): Save the original instruction.
        * gnu/gcj/jvmti/NormalBreakpoint.java: New file.
        * gnu/gcj/jvmti/NormalBreakpoint.h: New file.
        * gnu/gcj/jvmti/natNormalBreakpoint.cc: New file.
        * gnu/gcj/jvmti/BreakpointManager.java (newBreakpoint):
        Instantiate a NormalBreakpoint instead of Breakpoint.
        * interpret-run.cc (insn_breakpoint): Remove breakpoint actions
        and call Breakpoint.execute to do them.
        * classpath/lib/gnu/gcj/jvmti/Breakpoint.class: Regenerate.
        * classpath/lib/gnu/gcj/jvmti/BreakpointManager.class: Likewise.
        * classpath/lib/gnu/gcj/jvmti/NormalBreakpoint.class: New file.
        * sources.am: Regenerate.
        * Makefile.am (nat_source_files): Add natNormalBreakpoint.cc.
        * Makefile.in: Regenerated.

From-SVN: r125834
2007-06-19 00:10:10 +00:00
Matthias Klose
e1bea0c068 libjava/classpath/ChangeLog.gcj:
2007-05-31  Matthias Klose  <doko@ubuntu.com>

        * javax/management/NotificationBroadcasterSupport.java
        (getNotificationInfo): Add cast.
        * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
        directories.
        * native/jni/qt-peer/Makefile.in: Regenerate.

libjava/ChangeLog:

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/natFileWin32.cc (setFilePermissions): New (stub only).
        _access: Handle EXEC query, stub only.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Merged from classpath:
        * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
        * java/lang/System.java(inheritedChannel): New.
        * java/lang/Character.java: Remove stray`;'.
        * java/net/MulticastSocket.java: Merged.
        * java/text/DateFormatSymbols.java(getInstance): New, comment updates.
        * java/text/Collator.java(getInstance): Merged.
        * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
        getDisplayName, getDisplayNames: New.
        * java/util/logging/Logger.java: Merged.
        * Regenerate .class and .h files.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/File.java: Merge with classpath-0.95, new method
        setFilePermissions, new attribute EXEC.
        * java/io/natFilePosix.cc (setFilePermissions): New.
        _access: Handle EXEC query.
        * classpath/lib/java/io/File.class, java/io/File.h: Regenerate.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Imported GNU Classpath 0.95.

        * classpath/Makefile.in,
        classpath/native/jni/midi-dssi/Makefile.in,
        classpath/native/jni/classpath/Makefile.in,
        classpath/native/jni/Makefile.in,
        classpath/native/jni/gconf-peer/Makefile.in,
        classpath/native/jni/java-io/Makefile.in,
        classpath/native/jni/native-lib/Makefile.in,
        classpath/native/jni/java-util/Makefile.in,
        classpath/native/jni/midi-alsa/Makefile.in,
        classpath/native/jni/java-lang/Makefile.in,
        classpath/native/jni/java-nio/Makefile.in,
        classpath/native/jni/java-net/Makefile.in,
        classpath/native/jni/xmlj/Makefile.in,
        classpath/native/jni/qt-peer/Makefile.in,
        classpath/native/jni/gtk-peer/Makefile.in,
        classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
        classpath/native/fdlibm/Makefile.in,
        classpath/native/plugin/Makefile.in,
        classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
        classpath/tools/Makefile.in, classpath/doc/Makefile.in,
        classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
        classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
        classpath/external/sax/Makefile.in,
        classpath/external/w3c_dom/Makefile.in,
        classpath/external/relaxngDatatype/Makefile.in,
        classpath/include/Makefile.in,
        classpath/examples/Makefile.in: Regenerate.
        * classpath/config.guess, classpath/config.sub,
        classpath/ltmain.sh : Update.
        * classpath/configure, classpath/depcomp, classpath/missing,
        classpath/aclocal.m4, classpath/install-sh: Regenerate.

        * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
        * sources.am: Regenerate.
        * Makefile.in: Regenerate.

        * Update the .class files and generated CNI header files, add new
        .class and generated CNI header files.
        * Remove generated files for removed java source files:
        classpath/gnu/java/net/BASE64.java,
        classpath/gnu/java/security/util/Base64.java,
        classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
        classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
        classpath/gnu/java/awt/font/autofit/Scaler.java,
        classpath/gnu/classpath/jdwp/util/Value.java,
        classpath/gnu/javax/net/ssl/Base64.java.
        * Remove empty directories.

        * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
        * java/lang/Class.java(setAccessible): Merge from classpath.
        * java/util/Locale.java: Remove.
        * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
        gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
        * gcj/javaprims.h: Update class declarations.
        * scripts/classes.pl: Update usage.
        * HACKING: Mention to build all peers.

From-SVN: r125302
2007-06-03 23:18:43 +00:00
Kyle Galloway
e462253851 2007-05-17 Kyle Galloway <kgallowa@redhat.com>
* classpath/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java
	(executeMethods): Remove cast to ClassReferenceTypeId.
	* classpath/lib/gnu/classpath/jdwp/processor/
	ReferenceTypeCommandSet.class: Rebuilt.

From-SVN: r124809
2007-05-17 19:08:02 +00:00
Kyle Galloway
538639f4ab VMFrame.java (<init>): Add parameter for "this" pointer.
2007-05-17  Kyle Galloway <kgallowa@redhat.com>

	* gnu/classpath/jdwp/VMFrame.java (<init>): Add parameter for "this"
	pointer.
	* gnu/classpath/jdwp/VMFrame.h: Regenerated.
	* classpath/lib/gnu/classpath/jdwp/VMFrame.class: Rebuilt.
	* gnu/classpath/jdwp/natVMVirtualMachine.cc (getFrame): Use new 
	VMFrame constructor.

From-SVN: r124806
2007-05-17 18:36:12 +00:00
Keith Seitz
8faab1f43b java-interp.h (breakpoint_at): Declare.
* include/java-interp.h (breakpoint_at): Declare.
        * interpret.cc (breakpoint_at): New function.
        * gnu/classpath/jdwp/VMVirtualMachine.java (_event_list):
        New member.
        * gnu/classpath/jdwp/natVMVirtualMachine.cc (initialize):
        Initialize _event_list.
        (handle_single_step): If there is a breakpoint at the
        location at which we are stopping, do not send the notification.
        Instead add the event to a list of events that occur at this
        location.
        (jdwpBreakpointCB): If the event list is not empty, send
        whatever events are in it and the breakpoint event in a single
        notification.
        Mark parameter jni_env as MAYBE_UNUSED.
        * classpath/lib/gnu/classpath/jdwp/VMVirtualMachine.class:
        Regenerated.
        * gnu/classpath/jdwp/VMVirtualMachine.h: Regenerated.

From-SVN: r124777
2007-05-16 20:12:33 +00:00
David Daney
ee12b57dc3 HTMLEditorKit.class: Regenerate
* classpath/lib/javax/swing/text/html/HTMLEditorKit.class: Regenerate
	* gnu/java/awt/peer/gtk/ComponentGraphics.h: Same.

From-SVN: r124761
2007-05-16 06:54:58 +00:00
David Daney
8c0dbf3490 re PR libgcj/29324 (add wait handling hook)
PR libgcj/29324
	* include/posix-threads.h (_Jv_BlockSigchld): Declare.
	(_Jv_UnBlockSigchld): Same.
	* posix-threads.cc: Include posix-threads.h.
	(block_sigchld) Rename to...
	(_Jv_BlockSigchld) ... this.
	(_Jv_UnBlockSigchld): New function.
	(_Jv_InitThreads): Call _Jv_BlockSigchld in place of block_sigchld.
	(_Jv_ThreadStart): Same.
	* java/lang/PosixProcess$ProcessManager.h: Regenerate.
	* java/lang/PosixProcess.java: Clean up imports.
	(ProcessManager): Make final.
	(ProcessManager.queue): Genericise and make private.
	(ProcessManager.pidToProcess): Remove.
	(ProcessManager.liveProcesses): New field.
	(ProcessManager.reaperPID): Remove.
	(ProcessManager.nativeData): New field.
	(ProcessManager.removeProcessFromMap): Remove.
	(ProcessManager.addProcessToMap):Remove.
	(ProcessManager.addToLiveProcesses): New method.
	(ProcessManager.run): Rewritten.
	(ProcessManager.reap): Change method signature,
	(getErrorStream): Correct formatting.
	(getInputStream): Same.
	(spawn): Add process to liveProcesses list.
	(pid): Make package private.
	* java/lang/PosixProcess.h: Regenerate.
	* java/lang/natPosixProcess.cc: Include posix.h and posix-threads.h.
	Add useing namespace java::lang.
	(ProcessManagerInternal): New struct.
	(sigchld_handler): Rewritten.
	(init): Rewritten.
	(waitForSignal): Same.
	(reap): Same.
	(signalReaper): Same.
	(nativeDestroy): Call kill as ::kill.
	(nativeSpawn): Correct formatting.
	* classpath/lib/java/lang/PosixProcess$EOFInputStream.class: Regenerate.
	* classpath/lib/java/lang/PosixProcess.class: Same.
	* classpath/lib/java/lang/PosixProcess$ProcessManager.class: Same.

From-SVN: r124638
2007-05-12 17:37:55 +00:00
Keith Seitz
1e7c1ba87d Jdwp.class: Regenerate.
* classpath/lib/gnu/classpath/jdwp/Jdwp.class: Regenerate.
        * classpath/lib/gnu/classpath/jdwp/Jdwp$1.class: Regenerate.
        * classpath/lib/gnu/classpath/jdwp/event/Event.class:
        Regenerate.
        * classpath/lib/gnu/classpath/jdwp/transport/JdwpConnection.class:
        Regenerate.
        * gnu/classpath/jdwp/Jdwp.h: Regenerate.
        * gnu/classpath/jdwp/event/Event.h: Regenerate.
        * gnu/classpath/jdwp/transport/JdwpConnection.h: Regenerate.

From-SVN: r124515
2007-05-07 20:48:01 +00:00
Keith Seitz
befd756626 jvmti-int.h (_Jv_ReportJVMTIExceptionThrow): Declare.
* include/jvmti-int.h (_Jv_ReportJVMTIExceptionThrow):
        Declare.
        * interpret.cc (_Jv_ReportJVMTIExceptionThrow): New function.
        (find_catch_location): New function.
        (REPORT_EXCEPTION): New macro.
        (throw_internal_error): Use REPORT_EXCEPTION.
        (throw_incompatible_class_change_error): Likewise.
        (throw_null_pointer_exception): Likewise.
        (throw_class_format_error): Likewise.
        * interpret-run.cc (INTERP_REPORT_EXCEPTION)[DEBUG]: Set
        to REPORT_EXCEPTION.
        (INTERP_REPORT_EXCEPTION)[!DEBUG]: Make nop.
        (insn_new): Use INTERP_REPORT_EXCEPTION.
        (insn_athrow): Likewise.
        Remove previous JVMTI exception notifications.
        Add JVMTI ExceptionCatch notificatin.
        * jni.cc (_Jv_PopSystemFrame): Notify JVMTI clients of
        exception throw.
        * gnu/gcj/jvmti/ExceptionEvent.java: Removed.
        * gnu/gcj/jvmti/ExceptionEvent.h: Removed.
        * classpath/lib/gnu/gcj/jvmti/ExceptionEvent.class: Removed.
        * gnu/classpath/jdwp/natVMVirtualMachine.cc
        (jdwpExceptionCB): New function.
        (jdwpVMInitCB): Set Exception event handler and enable.
        * sources.am: Regenerated.
        * Makefile.in: Regenerated.

From-SVN: r124406
2007-05-04 01:04:11 +00:00
Andrew Haley
e152672004 Server.java (Server): Record the delegate.
2007-05-03  Andrew Haley  <aph@redhat.com>

        * gnu/javax/management/Server.java (Server): Record the delegate.
        (registerMBean): Notify the delegate.
        (unregisterMBean): Likewise.
        (notify): New method.

From-SVN: r124385
2007-05-03 18:35:55 +00:00
Kyle Galloway
0e0cca2daa VMIdManager.class: Regenerated.
2007-05-01  Kyle Galloway  <kgallowa@redhat.com>

	* classpath/lib/gnu/classpath/jdwp/VMIdManager.class: Regenerated.
	* classpath/lib/gnu/classpath/jdwp/VMIdManager$ReferenceKey.class: Regenerated.
	* classpath/lib/gnu/classpath/jdwp/VMIdManager$IdFactory.class: Regenerated.

From-SVN: r124327
2007-05-01 13:28:00 +00:00
Francis Kung
a6ee54a636 2007-04-04 Francis Kung <fkung@redhat.com>
* gnu/java/awt/peer/gtk/ComponentGraphics.java
        (cairoDrawGlyphVector): Removed method.
        (cairoSetFont): Removed method.
        (disposeNative): Removed method.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
        (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector): Added
        locking.
        (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFont): Added locking.
        (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative): Added locking.

From-SVN: r124251
2007-04-28 01:58:23 +00:00
Keith Seitz
9898e8391f Jdwp.class: Regenerated.
* classpath/lib/gnu/classpath/jdwp/Jdwp.class: Regenerated.
        * classpath/lib/gnu/classpath/jdwp/event/EventManager.class:
        Regenerated.
        * gnu/classpath/jdwp/event/EventManager.h: Regenerated.

        * gnu/classpath/jdwp/event/EventManager.java
        (getEventRequest): Rename to...
        (getEventRequests): ...this.
        Change return type to array of requests.
        Construct a list of all matching events and return
        them all.
        * gnu/classpath/jdwp/Jdwp.java (notify): Use getEventRequests
        and send event notifications for all matching requests.

From-SVN: r124250
2007-04-28 01:05:36 +00:00
Keith Seitz
e91ada38ad LocationOnlyFilter.class: Regenerated;
* classpath/lib/gnu/classpath/jdwp/event/filters/
        LocationOnlyFilter.class: Regenerated;
        * classpath/lib/gnu/classpath/jdwp/util/Location.class:
        Regenerated.
        * gnu/classpath/jdwp/VMMethod.java
        * classpath/lib/gnu/classpath/jdwp/VMMethod.class:
        Regenerated.
        * gnu/classpath/jdwp/VMMethod.h: Regenerated.
        * gnu/classpath/jdwp/util/Location.h: Regenerated.

        * gnu/classpath/jdwp/event/filters/LocationOnlyFilter.java
        (matches): Use Location.equals to determine equality.
        * gnu/classpath/jdwp/VMMethod.java (equals):
        New method.
        * gnu/classpath/jdwp/util/Location.java (equals):
        New method.

From-SVN: r124249
2007-04-28 01:02:10 +00:00
Thomas Fitzsimmons
415e62e232 [multiple changes]
2007-03-16  Francis Kung  <fkung@redhat.com>

	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
	(cairoArc): Make protected rather than private so it can be over-ridden.
	(cairoClip): Likewise.
	(cairoClosePath): Likewise.
	(cairoCurveTo): Likewise.
	(cairoDrawGlyphVector): Likewise.
	(cairoFill): Likewise.
	(cairoLineTo): Likewise.
	(cairoMoveTo): Likewise.
	(cairoNewPath): Likewise.
	(cairoRectangle): Likewise.
	(cairoResetClip): Likewise.
	(cairoRestore): Likewise.
	(cairoSave): Likewise.
	(cairoScale): Likewise.
	(cairoSetAntialias): Likewise.
	(cairoSetDash): Likewise.
	(cairoSetFillRule): Likewise.
	(cairoSetFont): Likewise.
	(cairoSetLine): Likewise.
	(cairoSetMatrix): Likewise.
	(cairoSetOperator): Likewise.
	(cairoSetRGBAColor): Likewise.
	(cairoStroke): Likewise.
	(drawPixels): Likewise.
	(init): Likewise.
	(setGradient): Likewise.
	(setPaintPixels): Likewise.
	(cairoDrawLine): Removed.
	(cairoDrawRect): Removed.
	(cairoFillRect): Removed.
	(cairoPreserveClip): Removed.
	(cairoRelCurveTo): Removed.
	(cairoRelLineTo): Removed.
	(cairoRelMoveTo): Removed.
	* gnu/java/awt/peer/gtk/ComponentGraphics.java
	(cairoArc): New method wrapping superclass method in locks.
	(cairoClip): Likewise.
	(cairoClosePath): Likewise.
	(cairoCurveTo): Likewise.
	(cairoDrawGlyphVector): Likewise.
	(cairoFill): Likewise.
	(cairoLineTo): Likewise.
	(cairoMoveTo): Likewise.
	(cairoNewPath): Likewise.
	(cairoRectangle): Likewise.
	(cairoResetClip): Likewise.
	(cairoRestore): Likewise.
	(cairoSave): Likewise.
	(cairoScale): Likewise.
	(cairoSetAntialias): Likewise.
	(cairoSetDash): Likewise.
	(cairoSetFillRule): Likewise.
	(cairoSetFont): Likewise.
	(cairoSetLine): Likewise.
	(cairoSetMatrix): Likewise.
	(cairoSetOperator): Likewise.
	(cairoSetRGBAColor): Likewise.
	(cairoStroke): Likewise.
	(disposeNative): Likewise.
	(drawPixels): Likewise.
	(init): Likewise.
	(setGradient): Likewise.
	(setPaintPixels): Likewise.
	(draw): Do not lock, as locking is now done in the wrapped native methods.
	(drawComposite): Likewise.
	(drawGlyphVector): Likewise.
	(drawImage): Likewise.
	(drawRenderedImage): Likewise.
	(fill): Likewise.
	(setClip): Removed.
	(lock): Added documentation.
	(unlock): Added documentation.
	* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Regenerated.
	* include/gnu_java_awt_peer_gtk_ComponentGraphics.h: Regenerated.
	* lib/gnu/java/awt/peer/gtk/ComponentGraphics.class: Regenerated.
	* lib/gnu/java/awt/peer/gtk/CairoGraphics2D.class: Regenerated.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
	(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawLine): Removed.
	(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawRect): Removed.
	(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFillRect): Removed.
	(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip): Removed.
	(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo): Removed.
	(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo): Removed.
	(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo): Removed.

2007-04-27  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/CairoGraphics2D.h: Regenerate.
	* gnu/java/awt/peer/gtk/ComponentGraphics.h: Regenerate.

From-SVN: r124226
2007-04-27 18:08:03 +00:00
Kyle Galloway
401eebfa1f VMIdManager.class: Regenerated.
* classpath/lib/gnu/classpath/jdwp/VMIdManager.class: Regenerated.
	* classpath/lib/gnu/classpath/jdwp/VMIdManager$ReferenceKey.class:
	Regenerated.
	* classpath/lib/gnu/classpath/jdwp/VMIdManager$IdFactory.class:
	Regenerated.

From-SVN: r124193
2007-04-26 18:30:25 +00:00
Andrew Haley
5c12b59bd8 ObjectStreamClass.java (ensureFieldsSet): New method.
2007-04-25  Andrew Haley  <aph@redhat.com>

	* java/io/ObjectStreamClass.java (ensureFieldsSet): New method.
	(setFields): call ensureFieldsSet.
	(fieldsSet): New field.
	* java/io/ObjectOutputStream.java (writeFields): Call
	osc.ensureFieldsSet().

	* java/io/ObjectInputStream.java (parseContent): Assign the handle
	for a PROXYCLASSDESC immediately after reading the marker.

From-SVN: r124187
2007-04-26 14:31:29 +00:00
Jeroen Frijters
f91141b1a2 re PR classpath/31646 (Arrays.sort() broken)
2007-04-23  Jeroen Frijters  <jeroen@frijters.net>

	PR classpath/31646:
	* java/util/Arrays.java (qsort): Corrected initial median calculation.

From-SVN: r124071
2007-04-23 16:15:51 +00:00
Keith Seitz
434942d978 BreakpointManager.java (newBreakpoint): Install the new breakpoint into the bytecode.
* gnu/gcj/jvmti/BreakpointManager.java (newBreakpoint):
        Install the new breakpoint into the bytecode.
        (deleteBreakpoint): Remove the breakpoint from the bytecode.
        * classpath/lib/gnu/gcj/jvmti/BreakpointManager.class:
        Regenerate.
        * gnu/gcj/jvmti/natBreakpoint.cc (initialize_native):
        Don't install the breakpoint here.

From-SVN: r123997
2007-04-20 17:08:44 +00:00
Tom Tromey
765e6a0cd4 re PR crypto/31626 (javax.net.SocketFactory#createSocket() throws UnsupportedOperationException)
libjava
	* gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h: Rebuilt.
libjava/classpath
2007-04-19  Casey Marshall  <csm@gnu.org>
	PR classpath/31626:
	* gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
	(createSocket): New method.

From-SVN: r123977
2007-04-19 20:50:40 +00:00
Tom Tromey
06a4a50762 libjava
* Regenerated headers with new gjavah.
libjava/classpath
	* tools/gnu/classpath/tools/javah/MethodHelper.java (print):
	Changed arguments.  Directly print method name.
	* tools/gnu/classpath/tools/javah/ClassWrapper.java
	(methodNameMap): New field.
	(makeVtable): Initialize it.
	(printMethods): Compute name for bridge targets.

From-SVN: r123965
2007-04-19 00:24:09 +00:00
Tom Tromey
3088dc29d1 Committed up-to-date .class and .h files from an earlier commit
From-SVN: r123890
2007-04-16 20:15:00 +00:00
Tom Tromey
1c23733ce2 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=236614
* gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
	(createSocket): Change order of delegation.

From-SVN: r123889
2007-04-16 20:13:28 +00:00
Andrew John Hughes
b3ea5d8ea6 2007-04-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/ObjectName.java:
        (parse(String)): Catch multiple wildcards,
        initialise with an empty string (so null isn't
        appended), and emit comma even when wildcard
        ends the list.
        (checkComponents()): Catch newlines.
        (quote(String)): Handle newlines and quotes
        correctly.

From-SVN: r123873
2007-04-16 14:50:03 +00:00
Andrew Haley
754d30c83a BootClassLoader.java (getBootURLLoader): New method.
2007-04-16  Andrew Haley  <aph@redhat.com>

        * gnu/gcj/runtime/BootClassLoader.java (getBootURLLoader): New
        method.
        (bootGetResource): Use getBootURLLoader() to load resources.
        (bootGetResources): Likewise.

        * java/lang/reflect/natMethod.cc (Method::invoke): In invoke also
        check that the method's declaring class is accessible.

From-SVN: r123867
2007-04-16 13:49:37 +00:00
Andrew Haley
9c3068be67 TaggedComponentHelper.java (read): Use read_octet_array(), not read().
2007-04-16  Andrew Haley  <aph@redhat.com>

        * org/omg/IOP/TaggedComponentHelper.java (read): Use
        read_octet_array(), not read().
        (write): Use write_octet_array(), not write().

        * org/omg/PortableServer/Servant.java (_get_delegate): Throw if no
        delegate has been set.

        * javax/management/ObjectName.java serialVersionUID: Declare.
        Make all fields transient.
        (parse): Break out from constructor.
        (writeObject, readObject): New methods.

From-SVN: r123865
2007-04-16 13:48:26 +00:00
Kyle Galloway
aa2473e4fc ArrayValue.java: New file.
2007-04-09  Kyle Galloway  <kgallowa@redhat.com>

	* classpath/gnu/classpath/jdwp/value/ArrayValue.java: New file.
	* classpath/lib/gnu/classpath/jdwp/value/ArrayValue.class: New file.
	* gnu/classpath/jdwp/ArrayValue.h: New file.
	* gnu/classpath/jdwp/natVMFrame.cc (getValue): Add array case.
	(setValue): Ditto.

From-SVN: r123680
2007-04-09 20:30:20 +00:00
Tania Bento
618bf37b05 DecimalFormatSymbols.java: Added the year 2007 to Copyright information and introduced new variable, currency.
2007-04-04  Tania Bento  <tbento@redhat.com>

	* java/text/DecimalFormatSymbols.java: Added the year 2007 to
	Copyright information and introduced new variable, currency.
	(DecimalFormatSymbols(Locale)): Define currency and intlCurrencySymbol
	to "XXX", currencySymbol to "?" and localCurrency appropriately.
	(getCurrency): Fixed documentation and return the value of currency.
	(setCurrency): Fixed documentation and update the value of currency.
	(setInternationalCurrencySymbol): Fixed documentation and update the
	value of currency.
	* java/util/Currency.java: Introduced two new variables, properties
	and fractionDigits. In the static block, a properties object is
	created and the currency resource is loaded.
	(Currency(Locale)): fractionDigits is defined.
	(Currency(String)): New method.
	(getDefaultFractionDigits): Return the value of fractionDigits.
	(getInstance(String)): Check if String is equal to "XXX".

From-SVN: r123512
2007-04-05 00:15:16 +00:00
Kyle Galloway
dabf62003e VariableTable.java: Change longs to ints for argCnt and slots.
2007-04-04  Kyle Galloway  <kgallowa@redhat.com>

	* classpath/gnu/classpath/jdwp/util/VariableTable.java: Change longs
	to ints for argCnt and slots.
	(write): Replace writeLong with writeInt for the above.

From-SVN: r123511
2007-04-05 00:00:45 +00:00
Tom Tromey
c44cc446f7 natPlainSocketImplPosix.cc (create): Return if already created.
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=233406
	* gnu/java/net/natPlainSocketImplPosix.cc (create): Return if
	already created.
	* gnu/java/net/PlainSocketImpl.java (getLocalAddress): Handle case
	where localport is -1.
	(create): Now public.
	* gnu/java/nio/SocketChannelImpl.java (SocketChannelImpl): Call
	'create' on the socket.

From-SVN: r123440
2007-04-02 22:10:41 +00:00
Andrew Haley
e6c45b1e34 [multiple changes]
2007-03-30  Andrew Haley  <aph@redhat.com>

        * javax/management/ObjectName.java: Handle 0-length names.

2007-03-27  Andrew Haley  <aph@redhat.com>

        * javax/management/MBeanServerFactory.java: Use the domain that
        we've been passed, not the fixed string "DefaultDomain".

From-SVN: r123430
2007-04-02 16:24:35 +00:00
Kyle Galloway
c6756b7257 2007-04-02 Kyle Galloway <kgallowa@redhat.com>
* classpath/gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.java
	(executeResume): Call VMVirtualMachine.resumeThread.

From-SVN: r123426
2007-04-02 12:52:01 +00:00
Tom Tromey
cc5e1fab40 re PR libgcj/29869 (LogManager class loading failure with Tomcat)
libjava
	PR libgcj/29869:
	* java/util/logging/LogManager.java (readConfiguration): Handle
	comma-separated 'handlers'.  Don't try to add a non-existing
	handler.
libgcj/classpath
	PR libgcj/29869:
	* gnu/java/util/jar/JarUtils.java (log): Commented out.
	(readSFManifest): Don't log.

From-SVN: r123356
2007-03-30 04:09:35 +00:00
Casey Marshall
5a953bf101 ClientHandshake.java (RSAGen.implRun): check keyEncipherment bit of the certificate...
2007-03-28  Casey Marshall  <csm@gnu.org>

	* gnu/javax/net/ssl/provider/ClientHandshake.java (RSAGen.implRun):
	check keyEncipherment bit of the certificate, and just pass the public
	key to the cipher.

From-SVN: r123307
2007-03-28 18:25:07 +00:00
Tom Tromey
ee753a0ab1 sources.am, [...]: Rebuilt.
* sources.am, Makefile.in: Rebuilt.
	* scripts/mime.types: Removed.
	* scripts/MakeDefaultMimeTypes.java: Removed.
	* gnu/gcj/io/MimeTypes.java: Removed.
	* gnu/gcj/io/MimeTypes.h: Removed.
	* gnu/gcj/io/DefaultMimeTypes.java: Removed.
	* gnu/gcj/io/DefaultMimeTypes.h: Removed.

From-SVN: r123288
2007-03-28 02:01:01 +00:00
Casey Marshall
82f1c4b5fa re PR classpath/31302 (Exception in SSLSocketImpl)
2007-03-27  Casey Marshall  <csm@gnu.org>

	PR classpath/31302:
	* gnu/javax/net/ssl/provider/SSLSocketImpl.java (SSLSocketImpl):
	Always make a new socket.
	(bind, connect, getInetAddress, getLocalAddress, getPort,
	getLocalPort, getRemoteSocketAddress, getLocalSocketAddress,
	setTcpNoDelay, getTcpNoDelay, setSoLinger, getSoLinger,
	setOOBInline, getOOBInline, setSoTimeout, getSoTimeout,
	setSendBufferSize, getSendBufferSize, setReceiveBufferSize,
	getReceiveBufferSize, setKeepAlive, getKeepAlive, setTrafficClass,
	getTrafficClass, setReuseAddress, getReuseAddress, close,
	shutdownInput, shutdownOutput, isConnected, isBound, isClosed,
	isInputShutdown, isOutputShutdown): Always use
	'underlyingSocket'.

From-SVN: r123285
2007-03-28 01:02:10 +00:00
Tom Tromey
17e50382cc re PR xml/31303 (SAXException: org.xml.sax.driver property needs to be set?)
PR classpath/31303:
	* external/sax/org/xml/sax/helpers/XMLReaderFactory.java
	(createXMLReader): Code in Classpath default.

From-SVN: r123267
2007-03-27 19:29:54 +00:00
Keith Seitz
ab065b4d75 Classpath JDWP merge with upstream
From-SVN: r123265
2007-03-27 18:40:48 +00:00
Matthias Klose
fd975604c2 configure.ac: New configure option --enable-generated-files-in-srcdir.
2007-03-10  Matthias Klose  <doko@ubuntu.com> 
 
        * configure.ac: New configure option 
        --enable-generated-files-in-srcdir. 
        * doc/Makefile.am: Add support to generate files in srcdir, 
        install the cp-tools documentation in info format. 
        * configure: Regenerate. 
        * native/jni/classpath/Makefile.in, native/jni/midi-dssi/Makefile.in, 
        native/jni/Makefile.in, native/jni/gconf-peer/Makefile.in, 
        native/jni/java-io/Makefile.in, native/jni/native-lib/Makefile.in, 
        native/jni/java-util/Makefile.in, native/jni/java-lang/Makefile.in, 
        native/jni/midi-alsa/Makefile.in, native/jni/java-nio/Makefile.in, 
        native/jni/java-net/Makefile.in, native/jni/xmlj/Makefile.in, 
        native/jni/qt-peer/Makefile.in, native/jni/gtk-peer/Makefile.in, 
        native/Makefile.in, native/jawt/Makefile.in, native/fdlibm/Makefile.in, 
        native/plugin/Makefile.in, resource/Makefile.in, scripts/Makefile.in, 
        tools/Makefile.in, doc/Makefile.in, doc/api/Makefile.in, 
        lib/Makefile.in, external/Makefile.in, external/sax/Makefile.in, 
        external/w3c_dom/Makefile.in, external/jsr166/Makefile.in, 
        external/relaxngDatatype/Makefile.in, include/Makefile.in, 
        examples/Makefile.in: Regenerate.

From-SVN: r123050
2007-03-19 05:57:53 +00:00
Thomas Fitzsimmons
f017943c98 2007-03-17 Thomas Fitzsimmons <fitzsim@redhat.com>
* resource/com/sun/tools/javac/messages.properties
	(Main.FailedToRead, Main.MalformedURL, Main.FailedToLoad): Clarify
	messages for when --with-ecj-jar is not specified.
	* configure.ac (FOUND_ECJ_JAR): Remove conditional.
	* tools/Makefile.am: Build com.sun.tools.javac package
	unconditionally.
	* configure, doc/api/Makefile.in, doc/Makefile.in,
	examples/Makefile.in, external/jsr166/Makefile.in,
	external/Makefile.in, external/relaxngDatatype/Makefile.in,
	external/sax/Makefile.in, external/w3c_dom/Makefile.in,
	include/Makefile.in, lib/Makefile.in, Makefile.in,
	native/fdlibm/Makefile.in, native/jawt/Makefile.in,
	native/jni/classpath/Makefile.in,
	native/jni/gconf-peer/Makefile.in,
	native/jni/gtk-peer/Makefile.in, native/jni/java-io/Makefile.in,
	native/jni/java-lang/Makefile.in, native/jni/java-net/Makefile.in,
	native/jni/java-nio/Makefile.in, native/jni/java-util/Makefile.in,
	native/jni/Makefile.in, native/jni/midi-alsa/Makefile.in,
	native/jni/midi-dssi/Makefile.in,
	native/jni/native-lib/Makefile.in, native/jni/qt-peer/Makefile.in,
	native/jni/xmlj/Makefile.in, native/Makefile.in,
	native/plugin/Makefile.in, resource/Makefile.in,
	scripts/Makefile.in, tools/Makefile.in: Regenerate.
	* tools/classes/com/sun/tools/javac: New directory.
	* tools/classes/com/sun/tools/javac/Main.class,
	tools/classes/com/sun/tools/javac/Messages.class: New files.

From-SVN: r123015
2007-03-17 05:36:18 +00:00
Thomas Fitzsimmons
442a795bc6 Makefile.am (AM_CXXFLAGS): Define ECJ_JAR_FILE.
2007-03-13  Thomas Fitzsimmons  <fitzsim@redhat.com>

        * Makefile.am (AM_CXXFLAGS): Define ECJ_JAR_FILE.
        * classpath/configure.ac: Add --with-ecj-jar configure option.
        * classpath/gnu/classpath/Configuration.java.in (ECJ_JAR): New
        field.
        * classpath/INSTALL: Document --with-ecj-jar configure option and
        ecj jar requirement for com.sun.tools.javac support.
        * classpath/tools/Makefile.am: Build decendents of com and sun
        directories.
        * configure.ac: Substitute ECJ_JAR in stub Configuration.java.
        * gnu/classpath/Configuration.java,
        gnu/classpath/natConfiguration.cc (ecj): New method.
        (ECJ_JAR): New field.
        * scripts/makemake.tcl (scan_packages): Add com directory.
        * sources.am (property_files): Add
        classpath/resource/sun/rmi/rmic/messages.properties and
        classpath/resource/com/sun/tools/javac/messages.properties.
        * classpath/resource/com, classpath/resource/com/sun,
        classpath/resource/com/sun/tools,
        classpath/resource/com/sun/tools/javac, classpath/resource/sun,
        classpath/resource/sun/rmi, classpath/resource/sun/rmi/rmic,
        classpath/tools/classes/com, classpath/tools/classes/com/sun,
        classpath/tools/classes/com/sun/javadoc,
        classpath/tools/classes/com/sun/tools,
        classpath/tools/classes/com/sun/tools/doclets,
        classpath/tools/classes/sun, classpath/tools/classes/sun/rmi,
        classpath/tools/classes/sun/rmi/rmic, classpath/tools/com,
        classpath/tools/com/sun, classpath/tools/com/sun/javadoc,
        classpath/tools/com/sun/tools,
        classpath/tools/com/sun/tools/doclets,
        classpath/tools/com/sun/tools/javac, classpath/tools/sun,
        classpath/tools/sun/rmi, classpath/tools/sun/rmi/rmic: New
        directories.
        * classpath/resource/com/sun/tools/javac/messages.properties,
        classpath/resource/sun/rmi/rmic/messages.properties,
        classpath/tools/classes/com/sun/javadoc/ClassDoc.class,
        classpath/tools/classes/com/sun/javadoc/ConstructorDoc.class,
        classpath/tools/classes/com/sun/javadoc/Doc.class,
        classpath/tools/classes/com/sun/javadoc/DocErrorReporter.class,
        classpath/tools/classes/com/sun/javadoc/Doclet.class,
        classpath/tools/classes/com/sun/javadoc/ExecutableMemberDoc.class,
        classpath/tools/classes/com/sun/javadoc/FieldDoc.class,
        classpath/tools/classes/com/sun/javadoc/MemberDoc.class,
        classpath/tools/classes/com/sun/javadoc/MethodDoc.class,
        classpath/tools/classes/com/sun/javadoc/PackageDoc.class,
        classpath/tools/classes/com/sun/javadoc/ParamTag.class,
        classpath/tools/classes/com/sun/javadoc/Parameter.class,
        classpath/tools/classes/com/sun/javadoc/ProgramElementDoc.class,
        classpath/tools/classes/com/sun/javadoc/RootDoc.class,
        classpath/tools/classes/com/sun/javadoc/SeeTag.class,
        classpath/tools/classes/com/sun/javadoc/SerialFieldTag.class,
        classpath/tools/classes/com/sun/javadoc/SourcePosition.class,
        classpath/tools/classes/com/sun/javadoc/Tag.class,
        classpath/tools/classes/com/sun/javadoc/ThrowsTag.class,
        classpath/tools/classes/com/sun/javadoc/Type.class,
        classpath/tools/classes/com/sun/javadoc/TypeVariable.class,
        classpath/tools/classes/com/sun/tools/doclets/Taglet.class,
        classpath/tools/classes/sun/rmi/rmic/Main.class,
        classpath/tools/classes/sun/rmi/rmic/Messages.class,
        classpath/tools/com/sun/javadoc/ClassDoc.java,
        classpath/tools/com/sun/javadoc/ConstructorDoc.java,
        classpath/tools/com/sun/javadoc/Doc.java,
        classpath/tools/com/sun/javadoc/DocErrorReporter.java,
        classpath/tools/com/sun/javadoc/Doclet.java,
        classpath/tools/com/sun/javadoc/ExecutableMemberDoc.java,
        classpath/tools/com/sun/javadoc/FieldDoc.java,
        classpath/tools/com/sun/javadoc/MemberDoc.java,
        classpath/tools/com/sun/javadoc/MethodDoc.java,
        classpath/tools/com/sun/javadoc/PackageDoc.java,
        classpath/tools/com/sun/javadoc/ParamTag.java,
        classpath/tools/com/sun/javadoc/Parameter.java,
        classpath/tools/com/sun/javadoc/ProgramElementDoc.java,
        classpath/tools/com/sun/javadoc/RootDoc.java,
        classpath/tools/com/sun/javadoc/SeeTag.java,
        classpath/tools/com/sun/javadoc/SerialFieldTag.java,
        classpath/tools/com/sun/javadoc/SourcePosition.java,
        classpath/tools/com/sun/javadoc/Tag.java,
        classpath/tools/com/sun/javadoc/ThrowsTag.java,
        classpath/tools/com/sun/javadoc/Type.java,
        classpath/tools/com/sun/javadoc/TypeVariable.java,
        classpath/tools/com/sun/tools/doclets/Taglet.java,
        classpath/tools/com/sun/tools/javac/Main.java,
        classpath/tools/com/sun/tools/javac/Messages.java,
        classpath/tools/sun/rmi/rmic/Main.java,
        classpath/tools/sun/rmi/rmic/Messages.java: New files.
        * Makefile.in, classpath/Makefile.in, classpath/configure,
        classpath/doc/Makefile.in, classpath/doc/api/Makefile.in,
        classpath/examples/Makefile.in, classpath/external/Makefile.in,
        classpath/external/jsr166/Makefile.in,
        classpath/external/relaxngDatatype/Makefile.in,
        classpath/external/sax/Makefile.in,
        classpath/external/w3c_dom/Makefile.in,
        classpath/include/Makefile.in, classpath/include/config.h.in,
        classpath/lib/Makefile.in,
        classpath/lib/gnu/classpath/Configuration.class,
        classpath/native/Makefile.in, classpath/native/fdlibm/Makefile.in,
        classpath/native/jawt/Makefile.in,
        classpath/native/jni/Makefile.in,
        classpath/native/jni/classpath/Makefile.in,
        classpath/native/jni/gconf-peer/Makefile.in,
        classpath/native/jni/gtk-peer/Makefile.in,
        classpath/native/jni/java-io/Makefile.in,
        classpath/native/jni/java-lang/Makefile.in,
        classpath/native/jni/java-net/Makefile.in,
        classpath/native/jni/java-nio/Makefile.in,
        classpath/native/jni/java-util/Makefile.in,
        classpath/native/jni/midi-alsa/Makefile.in,
        classpath/native/jni/midi-dssi/Makefile.in,
        classpath/native/jni/native-lib/Makefile.in,
        classpath/native/jni/qt-peer/Makefile.in,
        classpath/native/jni/xmlj/Makefile.in,
        classpath/native/plugin/Makefile.in,
        classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
        classpath/tools/Makefile.in, configure,
        gnu/classpath/Configuration.h: Regenerate.

From-SVN: r122876
2007-03-13 05:48:03 +00:00