libjava/ChangeLog:
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* sources.am, Makfile.in: Regenerate.
2008-10-17 Matthias Klose <doko@ubuntu.com>
* configure.ac: Fix bashisms.
* configure: Regenerate.
2008-10-15 Matthias Klose <doko@ubuntu.com>
* configure.ac: Disable build of gjdoc, if configured without
--with-antlr-jar or if no antlr.jar found.
* configure: Regenerate.
2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure.ac,
* classpath/m4/ac_prog_antlr.m4,
* classpath/m4/ac_prog_java.m4,
* classpath/tools/Makefile.am:
Ported --regen-gjdoc-parser patch and
cantlr support from GNU Classpath.
2008-10-06 Andrew Haley <aph@redhat.com>
* java/lang/Thread.java (Thread): Always create the ThreadLocalMap
when creating a thread.
(getThreadLocals) Don't lazily create the ThreadLocalMap.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/java/lang/ThreadLocalMap.java,
* java/lang/ThreadLocalMap$Entry.h,
* java/lang/ThreadLocalMap.h,
* lib/java/lang/ThreadLocalMap.class,
* lib/java/lang/ThreadLocalMap$Entry.class:
Add the new files for the ThreadLocal patch.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/ChangeLog,
* classpath/java/lang/InheritableThreadLocal.java,
* classpath/java/lang/Thread.java,
* classpath/java/lang/ThreadLocal.java:
Merge Daniel Frampton's ThreadLocal patch.
* gcj/javaprims.h: Updated.
* java/lang/Thread.h: Regenerated.
* java/lang/Thread.java:
Replace WeakIdentityHashMap with ThreadLocalMap.
(getThreadLocals()): Likewise.
* java/lang/ThreadLocal.h: Regenerated.
* java/lang/ThreadLocal.java:
(computeNextHash()): New method.
(ThreadLocal()): Initialise fastHash.
(internalGet()): Updated to match Classpath's get().
(internalSet(Object)): Likewise for set(Object).
(internalRemove()): Likewise for remove().
2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure,
* classpath/configure.ac:
Resynchronise with Classpath's configure.
* classpath/examples/Makefile.in:
Add equivalent support for building as in
tools/Makefile.in.
* classpath/java/nio/Buffer.java,
* classpath/java/nio/ByteBuffer.java,
* classpath/java/nio/ByteBufferImpl.java,
* classpath/java/nio/CharBuffer.java,
* classpath/java/nio/CharBufferImpl.java,
* classpath/java/nio/CharSequenceBuffer.java,
* classpath/java/nio/CharViewBufferImpl.java,
* classpath/java/nio/DirectByteBufferImpl.java,
* classpath/java/nio/DoubleBuffer.java,
* classpath/java/nio/DoubleBufferImpl.java,
* classpath/java/nio/DoubleViewBufferImpl.java,
* classpath/java/nio/FloatBuffer.java,
* classpath/java/nio/FloatBufferImpl.java,
* classpath/java/nio/FloatViewBufferImpl.java,
* classpath/java/nio/IntBuffer.java,
* classpath/java/nio/IntBufferImpl.java,
* classpath/java/nio/IntViewBufferImpl.java,
* classpath/java/nio/LongBuffer.java,
* classpath/java/nio/LongBufferImpl.java,
* classpath/java/nio/LongViewBufferImpl.java,
* classpath/java/nio/MappedByteBuffer.java,
* classpath/java/nio/MappedByteBufferImpl.java,
* classpath/java/nio/ShortBuffer.java,
* classpath/java/nio/ShortBufferImpl.java,
* classpath/java/nio/ShortViewBufferImpl.java:
Replace use of gnu.classpath.Pointer with gnu.gcj.RawData,
and fix some formatting issues.
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt:
Regenerated (later version of antlr).
* java/nio/Buffer.h: Regenerated.
* java/nio/Buffer.java: Ported changes from Classpath.
* java/nio/ByteBuffer.h,
* java/nio/CharBuffer.h: Regenerated.
* java/nio/DirectByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/DoubleBuffer.h,
* java/nio/FloatBuffer.h,
* java/nio/IntBuffer.h,
* java/nio/LongBuffer.h,
* java/nio/MappedByteBuffer.h,
* java/nio/MappedByteBufferImpl.h: Regenerated.
* java/nio/MappedByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/ShortBuffer.h: Regenerated.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* configure.ac: Search for antlr.jar, if not configured.
* configure: Regenerate.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* Makefile.am: Build a gjdoc binary, if enabled.
* configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file.
* Makefile.in, */Makefile.in, configure: Regenerate.
2008-09-22 Andrew Haley <aph@redhat.com>
* java/lang/String.java (toString(char[], int, int)): New method.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080914).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --disable-gjdoc to classpath.
* sources.am: Regenerated.
* HACKING: Mention to build gjdoc in maintainer builds.
* gnu/classpath/Configuration.java: Update classpath version.
* gcj/javaprims.h: Update.
2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am: Replace natStringBuffer.cc
and natStringBuilder.cc with natAbstractStringBuffer.cc.
* Makefile.in: Regenerated.
* java/lang/AbstractStringBuffer.java:
(append(int)): Made native.
(regionMatches(int,String)): Likewise.
* java/lang/StringBuffer.h: Regenerated.
* java/lang/StringBuffer.java: Remerged with GNU Classpath.
* java/lang/StringBuilder.h: Regenerated.
* java/lang/StringBuilder.java: Remerged with GNU Classpath.
* java/lang/natAbstractStringBuffer.cc: Provide common
native methods for StringBuffer and StringBuilder.
* java/lang/natStringBuffer.cc,
* java/lang/natStringBuilder.cc: Removed.
2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in,
* classpath/configure: Regenerated.
* gnu/gcj/util/natDebug.cc,
* gnu/gcj/xlib/natColormap.cc,
* gnu/gcj/xlib/natDisplay.cc,
* gnu/gcj/xlib/natDrawable.cc,
* gnu/gcj/xlib/natFont.cc,
* gnu/gcj/xlib/natWMSizeHints.cc,
* gnu/gcj/xlib/natWindow.cc,
* gnu/gcj/xlib/natXImage.cc:
Add :: prefix to namespaces.
* java/io/CharArrayWriter.h,
* java/lang/StringBuffer.h:
Regenerated using patched gjavah.
* java/lang/natStringBuffer.cc:
Fix naming of append(jint).
* java/sql/Timestamp.h: Regenerated
using patched gjavah.
* jni.cc: Rename p to functions
to match change in GNU Classpath.
* scripts/makemake.tcl: Switch
gnu.java.math to BC compilation.
* sources.am: Regenerated.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated location of Configuration.java.
* classpath/lib/gnu/java/locale/LocaleData.class: Regenerated.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated with new Java files.
* classpath/configure: Regenerated.
* classpath/tools/Makefile.am: Add missing
use of GJDOC_EX so --disable-gjdoc works.
* classpath/tools/Makefile.in: Regenerated.
2008-08-15 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080811).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --with-fastjar to classpath, substitute new
dummy value in classpath/gnu/classpath/Configuration.java.in, pass
--disable-gjdoc to classpath.
* scripts/makemake.tcl:
* sources.am: Regenerated.
* java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java:
New, copied from classpath, use System instead of VMSystem.
* java/lang/StringBuffer.java: Merge from classpath.
* java/lang/ClassLoader.java: Merge from classpath.
* gcj/javaprims.h: Update class definitions,
remove _Jv_jobjectRefType, jobjectRefType definitions.
libjava/classpath/ChangeLog.gcj:
2008-10-21 Matthias Klose <doko@ubuntu.com>
* classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ...
* classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here.
* Update .class files.
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Always generate parser in the srcdir.
2008-10-21 Matthias Klose <doko@ubuntu.com>
* doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1.
* doc/Makefile.in: Regenerate.
2008-10-20 Matthias Klose <doko@ubuntu.com>
* configure.ac: Don't check for working java, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_java.m4: Revert previous change.
* m4/ac_prog_javac.m4: Apply it here.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Don't check for working javac, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
* Makefile.in, */Makefile.in: Regenerate.
2008-09-30 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for cantlr binary as well.
2008-09-29 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for antlr binary as well.
2008-09-28 Matthias Klose <doko@ubuntu.com>
* PR libgcj/37636. Revert:
2008-02-20 Matthias Klose <doko@ubuntu.com>
* tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change,
Do copy resource files in JAVA_MAINTAINER_MODE only.
* tools/Makefile.in: Regenerate.
2008-09-14 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4:
Revert local changes.
* m4/ac_prog_antlr.m4: Check for an runantlr binary.
* tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER).
* tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in
GLIBJ_CLASSPATH.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Revert:
Daniel Frampton <zyridium at zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-08-15 Matthias Klose <doko@ubuntu.com>
* m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown
args for javac.
libjava/classpath/ChangeLog:
2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr.m4:
Remove redundant checks.
* tools/Makefile.am:
Use gjdoc_gendir when calling antlr.
2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Remove superfluous AC_PROG_JAVA call.
2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr:
Check for cantlr as well.
* tools/Makefile.am:
Only build GJDoc parser when both
CREATE_GJDOC and CREATE_GJDOC_PARSER
are on.
2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Add regen-gjdoc-parser option,
and separate antlr tests.
* m4/ac_prog_antlr.m4:
Turn single test into AC_LIB_ANTLR
and AC_PROG_ANTLR.
* m4/ac_prog_java.m4:
Quote tests.
* tools/Makefile.am:
Support CREATE_GJDOC_PARSER option.
2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
* m4/acinclude.m4:
Only require the class files to be built
to allow the tools and examples to be built,
not the installation of glibj.zip.
* tools/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am,
* lib/Makefile.am:
Add GCJ rules.
* m4/ac_prog_javac.m4:
Check whether JAVAC is gcj.
* m4/ac_prog_javac_works.m4:
Add GCJ rules.
* m4/acinclude.m4:
Don't bother checking for -J
if using GCJ.
* tools/Makefile.am:
Add GCJ rules.
2007-08-23 Daniel Frampton <zyridium@zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk>
* java/util/zip/ZipEntry.java:
Use byte fields instead of integer fields,
store the time as well as the DOS time and
don't retain a global Calendar instance.
(setDOSTime(int)): Set KNOWN_DOSTIME instead
of KNOWN_TIME, and unset KNOWN_TIME.
(getDOSTime()): Compute DOS time from UNIX time
only when needed.
(clone()): Provide cloning via the ZipEntry constructor
where possible.
(setTime(long)): Don't compute DOS time at this point.
(getCalendar()): Removed.
2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/getopt/Parser.java:
(setHeader(String)): Make synchronized.
(setFooter(String)): Likewise.
* tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java,
(reset()): Make synchronized.
(name(Class)): Likewise.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* gnu/java/nio/charset/ByteDecodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
* gnu/java/nio/charset/ByteEncodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* java/text/DecimalFormat.java:
(scanFix): Use 'i + 1' when looking at following character.
(scanNegativePattern): Dito.
2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/javah/ClassWrapper.java:
(makeVtable()): Populate methodNameMap.
(printMethods(CniPrintStream)): Always use pre-populated
methodNameMap for bridge targets.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override
annotation to allow compilation on javac < 1.6 and ecj < 3.4.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support
new Escher API.
* gnu/java/awt/peer/x/XImage.java (getSource): method implemented.
* gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer
for getSource.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/BacktrackStack.java,
* gnu/java/util/regex/CharIndexed.java,
* gnu/java/util/regex/CharIndexedCharArray.java,
* gnu/java/util/regex/CharIndexedCharSequence.java,
* gnu/java/util/regex/CharIndexedInputStream.java,
* gnu/java/util/regex/CharIndexedString.java,
* gnu/java/util/regex/CharIndexedStringBuffer.java,
* gnu/java/util/regex/RE.java,
* gnu/java/util/regex/REException.java,
* gnu/java/util/regex/REFilterInputStream.java,
* gnu/java/util/regex/REMatch.java,
* gnu/java/util/regex/REMatchEnumeration.java,
* gnu/java/util/regex/RESyntax.java,
* gnu/java/util/regex/REToken.java,
* gnu/java/util/regex/RETokenAny.java,
* gnu/java/util/regex/RETokenBackRef.java,
* gnu/java/util/regex/RETokenChar.java,
* gnu/java/util/regex/RETokenEnd.java,
* gnu/java/util/regex/RETokenEndOfPreviousMatch.java,
* gnu/java/util/regex/RETokenEndSub.java,
* gnu/java/util/regex/RETokenIndependent.java,
* gnu/java/util/regex/RETokenLookAhead.java,
* gnu/java/util/regex/RETokenLookBehind.java,
* gnu/java/util/regex/RETokenNamedProperty.java,
* gnu/java/util/regex/RETokenOneOf.java,
* gnu/java/util/regex/RETokenPOSIX.java,
* gnu/java/util/regex/RETokenRange.java,
* gnu/java/util/regex/RETokenRepeated.java,
* gnu/java/util/regex/RETokenStart.java,
* gnu/java/util/regex/RETokenWordBoundary.java,
* gnu/java/util/regex/UncheckedRE.java:
Fix indentation.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/RETokenStart.java:
(getMaximumLength()): Add Override annotation.
(matchThis(CharIndexed, REMatch)): Likewise.
(returnsFixedLengthMatches()): Renamed from
returnsFixedLengthmatches and added Override
annotation.
(findFixedLengthMatches(CharIndexed,REMatch,int)):
Add Override annotation.
(dump(CPStringBuilder)): Likewise.
* gnu/javax/print/ipp/IppRequest.java:
(RequestWriter.writeOperationAttributes(AttributeSet)):
Throw exception, don't just create and drop it.
* javax/management/MBeanServerPermission.java:
(MBeanServerPermissionCollection.add(Permission)): Compare
against individual Strings not the entire array, and
store the result of replace.
* javax/swing/text/html/StyleSheet.java:
(setBaseFontSize(size)): Store result of trim().
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/tools/FileObject.java:
(openReader(boolean)): Document new parameter.
2008-03-27 Michael Franz <mvfranz@gmail.com>
PR classpath/35690:
* javax/tools/FileObject.java:
(toUri()): Fix case from toURI.
(openReader(boolean)): Add missing boolean argument.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/35487:
* gnu/javax/management/Server.java:
(beans): Change to ConcurrentHashMap.
(defaultDomain): Make final.
(outer): Likewise.
(LazyListenersHolder): Added to wrap
listeners, also now a ConcurrentHashMap,
providing lazy initialisation safely.
(sequenceNumber): Documented.
(getBean(ObjectName)): Remove redundant cast.
(addNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Remove map initialisation
and use holder.
(getObjectInstance(ObjectName)): Remove redundant cast.
(registerMBean(Object,ObjectName)): Add bean atomically.
(removeNotificationListener(ObjectName,NotificationListener)):
Simplified.
(removeNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Likewise.
(notify(ObjectName,String)): Documented.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Server.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Translator.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/DefaultLoaderRepository.java,
* javax/management/JMX.java,
* javax/management/MBeanAttributeInfo.java,
* javax/management/MBeanConstructorInfo.java,
* javax/management/MBeanOperationInfo.java,
* javax/management/MBeanServerDelegate.java:
Fix warnings due to generics.
2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/MBeanPermission.java,
* javax/management/MBeanServerDelegate.java,
* javax/management/MBeanServerFactory.java,
* javax/management/MBeanServerInvocationHandler.java,
* javax/management/MBeanServerPermission.java:
Fix warnings due to use of non-generic collections.
2008-08-25 Mario Torre <neugens@aicas.com>
* gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is
null to avoid NPE.
2008-08-22 Mario Torre <neugens@aicas.com>
* gnu/CORBA/OrbFunctional.java (set_parameters): Fix
NullPointerException checking when param is null.
2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(reset()): Reset append position so
we don't try and append to the end of
the old input.
2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
Also allow versions of GJDoc from 0.8* on, as
CVS is 0.8.0-pre.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
(CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is
being used.
2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Add taglets subdirectory to list of excluded
paths when GJDoc is not compiled.
2008-08-19 David P Grove <groved@us.ibm.com>
* scripts/check_jni_methods.sh.in:
Fix build issue on AIX by splitting generation
of method list.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* native/jni/gstreamer-peer/gst_native_pipeline.c:
(get_free_space(int)): Use #else not #elif when
there is no condition.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/31895:
* java/text/DecimalFormat.java:
(setCurrency(Currency)): Update prefixes and
suffixes when currency changes.
* java/text/DecimalFormatSymbols.java:
(DecimalFormatSymbols(Locale)): Set locale earlier
so it can be used by setCurrency(Currency).
(setCurrency(Currency)): Set the symbol correctly using
the locale of the instance.
* java/util/Currency.java:
Throw error instead of just printing a message.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/activation/ActivationDataFlavor.java:
Suppress warnings from public API.
(mimeType): Made final.
(representationClass): Added generic type and
made final.
(normalizeMimeTypeParameter(String,String)):
Use CPStringBuilder.
* javax/activation/CommandInfo.java:
(verb): Made final.
(className): Made final.
* javax/activation/DataHandler.java:
(dataSource): Made final.
* javax/activation/FileDataSource.java:
(file): Made final.
* javax/activation/MailcapCommandMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeType.java:
(toString()): Use CPStringBuilder.
(getBaseType()): Likewise.
* javax/activation/MimeTypeParameterList.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeTypeParseException.java:
(MimeTypeParseException(String,String)): Use
CPStringBuilder.
* javax/activation/MimetypesFileTypeMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/URLDataSource.java:
(url): Made final.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/activation/viewers/ImageViewer.java,
* gnu/javax/activation/viewers/TextEditor.java,
* gnu/javax/activation/viewers/TextViewer.java,
* javax/activation/ActivationDataFlavor.java,
* javax/activation/CommandInfo.java,
* javax/activation/CommandMap.java,
* javax/activation/CommandObject.java,
* javax/activation/DataContentHandler.java,
* javax/activation/DataContentHandlerFactory.java,
* javax/activation/DataHandler.java,
* javax/activation/DataHandlerDataSource.java,
* javax/activation/DataSource.java,
* javax/activation/DataSourceDataContentHandler.java,
* javax/activation/FileDataSource.java,
* javax/activation/FileTypeMap.java,
* javax/activation/MailcapCommandMap.java,
* javax/activation/MimeType.java,
* javax/activation/MimeTypeParameterList.java,
* javax/activation/MimeTypeParseException.java,
* javax/activation/MimetypesFileTypeMap.java,
* javax/activation/ObjectDataContentHandler.java,
* javax/activation/URLDataSource.java,
* javax/activation/UnsupportedDataTypeException.java,
* javax/activation/package.html,
* resource/META-INF/mailcap.default,
* resource/META-INF/mimetypes.default:
Import GNU JAF CVS as of 17/08/2008.
2006-04-25 Archit Shah <ashah@redhat.com>
* javax/activation/MimeTypeParameterList.java:
Insert ';' separator before parameter list.
2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com>
* javax/activation/ObjectDataContentHandler.java:
Fixed typo.
2005-05-28 Chris Burdess <dog@bluezoo.org>
* javax/activation/CommandMap.java,
* javax/activation/MailcapCommandMap.java:
Updated to JAF 1.1.
2004-06-09 Chris Burdess <dog@bluezoo.org>
* javax/activation/MailcapCommandMap.java:
Fixed bug whereby x-java prefix was not
attempted.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* AUTHORS: Added Laszlo.
2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/30436:
* java/util/Scanner.java:
Fix package to be java.util and correct
indentation.
2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at>
PR classpath/30436:
* java/util/Scanner.java:
Initial implementation.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(toMatchResult()): Implemented.
2008-08-13 Joshua Sumali <jsumali@redhat.com>
* doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo
instead of invoke.texi. Remove invoke.texi from EXTRA_DIST.
* doc/invoke.texi: Removed and merged into ...
* doc/cp-tools.texinfo: Here
2008-08-12 Robert Schuster <robertschuster@fsfe.org>
* native/jni/java-net/local.c
(local_bind): Removed fprintf call, fixed access outside
of array bounds.
From-SVN: r141271
487 lines
16 KiB
Java
487 lines
16 KiB
Java
/* XEventPump.java -- Pumps events from X to AWT
|
|
Copyright (C) 2006 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package gnu.java.awt.peer.x;
|
|
|
|
import java.awt.AWTEvent;
|
|
import java.awt.Component;
|
|
import java.awt.Container;
|
|
import java.awt.Graphics;
|
|
import java.awt.Insets;
|
|
import java.awt.Rectangle;
|
|
import java.awt.Toolkit;
|
|
import java.awt.Window;
|
|
import java.awt.event.ComponentEvent;
|
|
import java.awt.event.KeyEvent;
|
|
import java.awt.event.MouseEvent;
|
|
import java.awt.event.PaintEvent;
|
|
import java.awt.event.WindowEvent;
|
|
import java.util.HashMap;
|
|
|
|
import gnu.java.awt.ComponentReshapeEvent;
|
|
import gnu.x11.Atom;
|
|
import gnu.x11.Display;
|
|
import gnu.x11.event.ButtonPress;
|
|
import gnu.x11.event.ButtonRelease;
|
|
import gnu.x11.event.ClientMessage;
|
|
import gnu.x11.event.ConfigureNotify;
|
|
import gnu.x11.event.DestroyNotify;
|
|
import gnu.x11.event.Event;
|
|
import gnu.x11.event.Expose;
|
|
import gnu.x11.event.Input;
|
|
import gnu.x11.event.KeyPress;
|
|
import gnu.x11.event.KeyRelease;
|
|
import gnu.x11.event.MotionNotify;
|
|
import gnu.x11.event.PropertyNotify;
|
|
import gnu.x11.event.ResizeRequest;
|
|
import gnu.x11.event.UnmapNotify;
|
|
|
|
/**
|
|
* Fetches events from X, translates them to AWT events and pumps them up
|
|
* into the AWT event queue.
|
|
*
|
|
* @author Roman Kennke (kennke@aicas.com)
|
|
*/
|
|
public class XEventPump
|
|
implements Runnable
|
|
{
|
|
|
|
/**
|
|
* The X Display from which we fetch and pump up events.
|
|
*/
|
|
private Display display;
|
|
|
|
/**
|
|
* Maps X Windows to AWT Windows to be able to correctly determine the
|
|
* event targets.
|
|
*/
|
|
private HashMap windows;
|
|
|
|
/**
|
|
* Indicates if we are currently inside a drag operation. This is
|
|
* set to the button ID when a button is pressed and to -1 (indicating
|
|
* that no drag is active) when the mouse is released.
|
|
*/
|
|
private int drag;
|
|
|
|
/**
|
|
* Creates a new XEventPump for the specified X Display.
|
|
*
|
|
* @param d the X Display
|
|
*/
|
|
XEventPump(Display d)
|
|
{
|
|
display = d;
|
|
windows = new HashMap();
|
|
drag = -1;
|
|
Thread thread = new Thread(this, "X Event Pump");
|
|
thread.setDaemon(true);
|
|
thread.start();
|
|
}
|
|
|
|
/**
|
|
* The main event pump loop. This basically fetches events from the
|
|
* X Display and pumps them into the system event queue.
|
|
*/
|
|
public void run()
|
|
{
|
|
while (display.connected)
|
|
{
|
|
try
|
|
{
|
|
Event xEvent = display.next_event();
|
|
handleEvent(xEvent);
|
|
}
|
|
catch (ThreadDeath death)
|
|
{
|
|
// If someone wants to kill us, let them.
|
|
return;
|
|
}
|
|
catch (Throwable x)
|
|
{
|
|
System.err.println("Exception during event dispatch:");
|
|
x.printStackTrace(System.err);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Adds an X Window to AWT Window mapping. This is required so that the
|
|
* event pump can correctly determine the event targets.
|
|
*
|
|
* @param xWindow the X Window
|
|
* @param awtWindow the AWT Window
|
|
*/
|
|
void registerWindow(gnu.x11.Window xWindow, Window awtWindow)
|
|
{
|
|
if (XToolkit.DEBUG)
|
|
System.err.println("registering window id: " + xWindow.id);
|
|
windows.put(new Integer(xWindow.id), awtWindow);
|
|
}
|
|
|
|
void unregisterWindow(gnu.x11.Window xWindow)
|
|
{
|
|
windows.remove(new Integer(xWindow.id));
|
|
}
|
|
|
|
private void handleButtonPress(ButtonPress event)
|
|
{
|
|
Integer key = new Integer(event.getEventWindowID());
|
|
Window awtWindow = (Window) windows.get(key);
|
|
|
|
// Create and post the mouse event.
|
|
int button = event.detail();
|
|
|
|
// AWT cannot handle more than 3 buttons and expects 0 instead.
|
|
if (button >= gnu.x11.Input.BUTTON3)
|
|
button = 0;
|
|
drag = button;
|
|
|
|
Component target =
|
|
findMouseEventTarget(awtWindow, event.getEventX(), event.getEventY());
|
|
if(target == null)
|
|
{
|
|
target = awtWindow;
|
|
}
|
|
|
|
MouseEvent mp = new MouseEvent(target, MouseEvent.MOUSE_PRESSED,
|
|
System.currentTimeMillis(),
|
|
KeyboardMapping.mapModifiers(event.getState())
|
|
| buttonToModifier(button),
|
|
event.getEventX(), event.getEventY(),
|
|
1, false, button);
|
|
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mp);
|
|
}
|
|
|
|
private void handleButtonRelease(ButtonRelease event)
|
|
{
|
|
Integer key = new Integer(event.getEventWindowID());
|
|
Window awtWindow = (Window) windows.get(key);
|
|
|
|
int button = event.detail();
|
|
|
|
// AWT cannot handle more than 3 buttons and expects 0 instead.
|
|
if (button >= gnu.x11.Input.BUTTON3)
|
|
button = 0;
|
|
drag = -1;
|
|
|
|
Component target =
|
|
findMouseEventTarget(awtWindow, event.getEventX(), event.getEventY());
|
|
if(target == null)
|
|
{
|
|
target = awtWindow;
|
|
}
|
|
|
|
MouseEvent mr = new MouseEvent(target, MouseEvent.MOUSE_RELEASED,
|
|
System.currentTimeMillis(),
|
|
KeyboardMapping.mapModifiers(event.getState())
|
|
| buttonToModifier(button),
|
|
event.getEventX(), event.getEventY(),
|
|
1, false, button);
|
|
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mr);
|
|
}
|
|
|
|
|
|
private void handleMotionNotify(MotionNotify event)
|
|
{
|
|
Integer key = new Integer(event.getEventWindowID());
|
|
Window awtWindow = (Window) windows.get(key);
|
|
|
|
int button = event.detail();
|
|
|
|
// AWT cannot handle more than 3 buttons and expects 0 instead.
|
|
if (button >= gnu.x11.Input.BUTTON3)
|
|
button = 0;
|
|
|
|
MouseEvent mm = null;
|
|
if (drag == -1)
|
|
{
|
|
mm = new MouseEvent(awtWindow, MouseEvent.MOUSE_MOVED,
|
|
System.currentTimeMillis(),
|
|
KeyboardMapping.mapModifiers(event.getState())
|
|
| buttonToModifier(button),
|
|
event.getEventX(), event.getEventY(),
|
|
1, false);
|
|
|
|
}
|
|
else
|
|
{
|
|
mm = new MouseEvent(awtWindow, MouseEvent.MOUSE_DRAGGED,
|
|
System.currentTimeMillis(),
|
|
KeyboardMapping.mapModifiers(event.getState())
|
|
| buttonToModifier(drag),
|
|
event.getEventX(), event.getEventY(),
|
|
1, false);
|
|
}
|
|
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mm);
|
|
}
|
|
|
|
// FIME: refactor and make faster, maybe caching the event and handle
|
|
// and/or check timing (timing is generated for PropertyChange)?
|
|
private void handleExpose(Expose event)
|
|
{
|
|
Integer key = new Integer(event.window_id);
|
|
Window awtWindow = (Window) windows.get(key);
|
|
|
|
if (XToolkit.DEBUG)
|
|
System.err.println("expose request for window id: " + key);
|
|
|
|
Rectangle r = new Rectangle(event.x(), event.y(), event.width(),
|
|
event.height());
|
|
// We need to clear the background of the exposed rectangle.
|
|
assert awtWindow != null : "awtWindow == null for window ID: " + key;
|
|
|
|
Graphics g = awtWindow.getGraphics();
|
|
g.clearRect(r.x, r.y, r.width, r.height);
|
|
g.dispose();
|
|
|
|
XWindowPeer xwindow = (XWindowPeer) awtWindow.getPeer();
|
|
Insets i = xwindow.insets();
|
|
if (event.width() != awtWindow.getWidth() - i.left - i.right
|
|
|| event.height() != awtWindow.getHeight() - i.top - i.bottom)
|
|
{
|
|
int w = event.width();
|
|
int h = event.height();
|
|
int x = xwindow.xwindow.x;
|
|
int y = xwindow.xwindow.y;
|
|
|
|
if (XToolkit.DEBUG)
|
|
System.err.println("Setting size on AWT window: " + w
|
|
+ ", " + h + ", " + awtWindow.getWidth()
|
|
+ ", " + awtWindow.getHeight());
|
|
|
|
// new width and height
|
|
xwindow.xwindow.width = w;
|
|
xwindow.xwindow.height = h;
|
|
|
|
// reshape the window
|
|
ComponentReshapeEvent cre =
|
|
new ComponentReshapeEvent(awtWindow, x, y, w, h);
|
|
awtWindow.dispatchEvent(cre);
|
|
}
|
|
|
|
ComponentEvent ce =
|
|
new ComponentEvent(awtWindow, ComponentEvent.COMPONENT_RESIZED);
|
|
awtWindow.dispatchEvent(ce);
|
|
|
|
PaintEvent pev = new PaintEvent(awtWindow, PaintEvent.UPDATE, r);
|
|
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(pev);
|
|
}
|
|
|
|
private void handleDestroyNotify(DestroyNotify destroyNotify)
|
|
{
|
|
if (XToolkit.DEBUG)
|
|
System.err.println("DestroyNotify event: " + destroyNotify);
|
|
|
|
Integer key = new Integer(destroyNotify.event_window_id);
|
|
Window awtWindow = (Window) windows.get(key);
|
|
|
|
AWTEvent event = new WindowEvent(awtWindow, WindowEvent.WINDOW_CLOSED);
|
|
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(event);
|
|
}
|
|
|
|
private void handleClientMessage(ClientMessage clientMessage)
|
|
{
|
|
if (XToolkit.DEBUG)
|
|
System.err.println("ClientMessage event: " + clientMessage);
|
|
|
|
if (clientMessage.delete_window())
|
|
{
|
|
if (XToolkit.DEBUG)
|
|
System.err.println("ClientMessage is a delete_window event");
|
|
|
|
Integer key = new Integer(clientMessage.window_id);
|
|
Window awtWindow = (Window) windows.get(key);
|
|
|
|
AWTEvent event = new WindowEvent(awtWindow, WindowEvent.WINDOW_CLOSING);
|
|
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(event);
|
|
}
|
|
}
|
|
|
|
private void handleEvent(Event xEvent)
|
|
{
|
|
if (XToolkit.DEBUG)
|
|
System.err.println("fetched event: " + xEvent);
|
|
|
|
switch (xEvent.code() & 0x7f)
|
|
{
|
|
case ButtonPress.CODE:
|
|
this.handleButtonPress((ButtonPress) xEvent);
|
|
break;
|
|
case ButtonRelease.CODE:
|
|
this.handleButtonRelease((ButtonRelease) xEvent);
|
|
break;
|
|
case MotionNotify.CODE:
|
|
this.handleMotionNotify((MotionNotify) xEvent);
|
|
break;
|
|
case Expose.CODE:
|
|
this.handleExpose((Expose) xEvent);
|
|
break;
|
|
case KeyPress.CODE:
|
|
case KeyRelease.CODE:
|
|
Integer key = new Integer(((Input) xEvent).getEventWindowID());
|
|
Window awtWindow = (Window) windows.get(key);
|
|
handleKeyEvent(xEvent, awtWindow);
|
|
break;
|
|
case DestroyNotify.CODE:
|
|
this.handleDestroyNotify((DestroyNotify) xEvent);
|
|
break;
|
|
case ClientMessage.CODE:
|
|
this.handleClientMessage((ClientMessage) xEvent);
|
|
break;
|
|
case PropertyNotify.CODE:
|
|
key = new Integer (((PropertyNotify) xEvent).getWindowID());
|
|
awtWindow = (Window) windows.get(key);
|
|
AWTEvent event = new WindowEvent(awtWindow, WindowEvent.WINDOW_STATE_CHANGED);
|
|
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(event);
|
|
break;
|
|
default:
|
|
if (XToolkit.DEBUG)
|
|
System.err.println("Unhandled X event: " + xEvent);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Handles key events from X.
|
|
*
|
|
* @param xEvent the X event
|
|
* @param awtWindow the AWT window to which the event gets posted
|
|
*/
|
|
private void handleKeyEvent(Event xEvent, Window awtWindow)
|
|
{
|
|
Input keyEvent = (Input) xEvent;
|
|
int xKeyCode = keyEvent.detail();
|
|
int xMods = keyEvent.getState();
|
|
int keyCode = KeyboardMapping.mapToKeyCode(xEvent.display.input, xKeyCode,
|
|
xMods);
|
|
char keyChar = KeyboardMapping.mapToKeyChar(xEvent.display.input, xKeyCode,
|
|
xMods);
|
|
if (XToolkit.DEBUG)
|
|
System.err.println("XEventPump.handleKeyEvent: " + xKeyCode + ", "
|
|
+ xMods + ": " + ((int) keyChar) + ", " + keyCode);
|
|
int awtMods = KeyboardMapping.mapModifiers(xMods);
|
|
long when = System.currentTimeMillis();
|
|
KeyEvent ke;
|
|
if (keyEvent.code() == KeyPress.CODE)
|
|
{
|
|
ke = new KeyEvent(awtWindow, KeyEvent.KEY_PRESSED, when,
|
|
awtMods, keyCode,
|
|
KeyEvent.CHAR_UNDEFINED);
|
|
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(ke);
|
|
if (keyChar != KeyEvent.CHAR_UNDEFINED)
|
|
{
|
|
ke = new KeyEvent(awtWindow, KeyEvent.KEY_TYPED, when,
|
|
awtMods, KeyEvent.VK_UNDEFINED,
|
|
keyChar);
|
|
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(ke);
|
|
}
|
|
|
|
}
|
|
else
|
|
{
|
|
ke = new KeyEvent(awtWindow, KeyEvent.KEY_RELEASED, when,
|
|
awtMods, keyCode,
|
|
KeyEvent.CHAR_UNDEFINED);
|
|
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(ke);
|
|
}
|
|
|
|
}
|
|
|
|
/** Translates an X button identifier to the AWT's MouseEvent modifier
|
|
* mask. As the AWT cannot handle more than 3 buttons those return
|
|
* <code>0</code>.
|
|
*/
|
|
static int buttonToModifier(int button)
|
|
{
|
|
switch (button)
|
|
{
|
|
case gnu.x11.Input.BUTTON1:
|
|
return MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON1_MASK;
|
|
case gnu.x11.Input.BUTTON2:
|
|
return MouseEvent.BUTTON2_DOWN_MASK | MouseEvent.BUTTON2_MASK;
|
|
case gnu.x11.Input.BUTTON3:
|
|
return MouseEvent.BUTTON3_DOWN_MASK | MouseEvent.BUTTON3_MASK;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Finds the heavyweight mouse event target.
|
|
*
|
|
* @param src the original source of the event
|
|
*
|
|
* @param pt the event coordinates
|
|
*
|
|
* @return the real mouse event target
|
|
*/
|
|
private Component findMouseEventTarget(Component src, int x, int y)
|
|
{
|
|
Component found = null;
|
|
if (src instanceof Container)
|
|
{
|
|
Container cont = (Container) src;
|
|
int numChildren = cont.getComponentCount();
|
|
for (int i = 0; i < numChildren && found == null; i++)
|
|
{
|
|
Component child = cont.getComponent(i);
|
|
if (child != null && child.isVisible()
|
|
&& child.contains(x - child.getX(), y - child.getY()))
|
|
{
|
|
if (child instanceof Container)
|
|
{
|
|
Component deeper = findMouseEventTarget(child,
|
|
x - child.getX(),
|
|
y - child.getY());
|
|
if (deeper != null)
|
|
found = deeper;
|
|
}
|
|
else if (! child.isLightweight())
|
|
found = child;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Consider the source itself.
|
|
if (found == null && src.contains(x, y) && ! src.isLightweight())
|
|
found = src;
|
|
|
|
return found;
|
|
}
|
|
}
|