
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
509 lines
16 KiB
Java
509 lines
16 KiB
Java
/* XGraphics2D.java -- A Java based Graphics2D impl for X
|
|
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.Color;
|
|
import java.awt.Font;
|
|
import java.awt.Graphics;
|
|
import java.awt.GraphicsConfiguration;
|
|
import java.awt.Image;
|
|
import java.awt.Paint;
|
|
import java.awt.Rectangle;
|
|
import java.awt.Shape;
|
|
import java.awt.Toolkit;
|
|
import java.awt.Transparency;
|
|
import java.awt.geom.AffineTransform;
|
|
import java.awt.image.BufferedImage;
|
|
import java.awt.image.ColorModel;
|
|
import java.awt.image.DataBuffer;
|
|
import java.awt.image.ImageObserver;
|
|
import java.awt.image.Raster;
|
|
import java.awt.peer.FontPeer;
|
|
import java.util.HashMap;
|
|
import java.util.WeakHashMap;
|
|
|
|
import gnu.java.awt.image.AsyncImage;
|
|
import gnu.java.awt.java2d.AbstractGraphics2D;
|
|
import gnu.java.awt.java2d.ScanlineCoverage;
|
|
import gnu.x11.Colormap;
|
|
import gnu.x11.Drawable;
|
|
import gnu.x11.GC;
|
|
import gnu.x11.image.ZPixmap;
|
|
|
|
public class XGraphics2D
|
|
extends AbstractGraphics2D
|
|
{
|
|
|
|
/**
|
|
* When this property is set to true, then images are always rendered as
|
|
* opaque images, ignoring their translucence. This is intended for
|
|
* debugging and demonstration purposes.
|
|
*/
|
|
private static final boolean RENDER_OPAQUE =
|
|
Boolean.getBoolean("escherpeer.renderopaque");
|
|
|
|
/**
|
|
* The X Drawable to draw on.
|
|
*/
|
|
private Drawable xdrawable;
|
|
|
|
/**
|
|
* The X graphics context (GC).
|
|
*/
|
|
private GC xgc;
|
|
|
|
/**
|
|
* Indicates if this graphics has already been disposed.
|
|
*/
|
|
private boolean disposed;
|
|
|
|
/**
|
|
* The current foreground color, possibly null.
|
|
*/
|
|
private Color foreground;
|
|
|
|
XGraphics2D(Drawable d)
|
|
{
|
|
super();
|
|
xdrawable = d;
|
|
xgc = new GC(d);
|
|
init();
|
|
disposed = false;
|
|
//setClip(new Rectangle(0, 0, xdrawable.width, xdrawable.height));
|
|
}
|
|
|
|
@Override
|
|
protected void rawDrawLine(int x0, int y0, int x1, int y1)
|
|
{
|
|
xdrawable.segment(xgc, x0, y0, x1, y1);
|
|
}
|
|
|
|
@Override
|
|
protected void rawDrawRect(int x, int y, int w, int h)
|
|
{
|
|
xdrawable.rectangle(xgc, x, y, w, h, false);
|
|
}
|
|
|
|
@Override
|
|
protected void rawFillRect(int x, int y, int w, int h)
|
|
{
|
|
xdrawable.rectangle(xgc, x, y, w, h, true);
|
|
}
|
|
|
|
/**
|
|
* Returns the color model of this Graphics object.
|
|
*
|
|
* @return the color model of this Graphics object
|
|
*/
|
|
protected ColorModel getColorModel()
|
|
{
|
|
return Toolkit.getDefaultToolkit().getColorModel();
|
|
}
|
|
|
|
/**
|
|
* Returns the color model of the target device.
|
|
*
|
|
* @return the color model of the target device
|
|
*/
|
|
protected ColorModel getDestinationColorModel()
|
|
{
|
|
return Toolkit.getDefaultToolkit().getColorModel();
|
|
}
|
|
|
|
/**
|
|
* Returns the bounds of the target.
|
|
*
|
|
* @return the bounds of the target
|
|
*/
|
|
protected Rectangle getDeviceBounds()
|
|
{
|
|
return new Rectangle(0, 0, xdrawable.width, xdrawable.height);
|
|
}
|
|
|
|
public GraphicsConfiguration getDeviceConfiguration()
|
|
{
|
|
// FIXME: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented");
|
|
}
|
|
|
|
public void dispose()
|
|
{
|
|
if (!disposed)
|
|
{
|
|
xgc.free();
|
|
xdrawable.display.flush();
|
|
disposed = true;
|
|
}
|
|
}
|
|
|
|
public Graphics create()
|
|
{
|
|
// super.create() returns a copy created by clone(), so it should
|
|
// be a XGraphics2D.
|
|
XGraphics2D copy = (XGraphics2D) super.create();
|
|
copy.xgc = xgc.copy();
|
|
return copy;
|
|
}
|
|
|
|
public void setClip(Shape c)
|
|
{
|
|
super.setClip(c);
|
|
if (c instanceof Rectangle)
|
|
{
|
|
Rectangle r = (Rectangle) c;
|
|
AffineTransform t = getTransform();
|
|
int translateX = (int) t.getTranslateX();
|
|
//System.err.println("translateX: " + translateX);
|
|
int translateY = (int) t.getTranslateY();
|
|
//System.err.println("translateY: " + translateY);
|
|
//System.err.println("clip: " + c);
|
|
gnu.x11.Rectangle clip = new gnu.x11.Rectangle(r.x, r.y, r.width,
|
|
r.height);
|
|
xgc.set_clip_rectangles(translateX, translateY,
|
|
new gnu.x11.Rectangle[]{clip}, GC.UN_SORTED);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Notifies the backend that the raster has changed in the specified
|
|
* rectangular area. The raster that is provided in this method is always
|
|
* the same as the one returned in {@link #getDestinationRaster}.
|
|
* Backends that reflect changes to this raster directly don't need to do
|
|
* anything here.
|
|
*
|
|
* @param raster the updated raster, identical to the raster returned
|
|
* by {@link #getDestinationRaster()}
|
|
* @param x the upper left corner of the updated region, X coordinate
|
|
* @param y the upper lef corner of the updated region, Y coordinate
|
|
* @param w the width of the updated region
|
|
* @param h the height of the updated region
|
|
*/
|
|
protected void updateRaster(Raster raster, int x, int y, int w, int h)
|
|
{
|
|
if (w > 0 && h > 0)
|
|
{
|
|
ZPixmap zPixmap = new ZPixmap(xdrawable.display, w, h,
|
|
xdrawable.display.default_pixmap_format);
|
|
int[] pixel = null;
|
|
int x1 = x + w;
|
|
int y1 = y + h;
|
|
for (int tx = x; tx < x1; tx++)
|
|
{
|
|
for (int ty = y; ty < y1; ty++)
|
|
{
|
|
pixel = raster.getPixel(tx, ty, pixel);
|
|
//System.err.println("tx: " + tx + ", ty: " + ty + ", pixel: " + pixel[0] + ", " + pixel[1] + ", " + pixel[2]);
|
|
// System.err.print("r: " + pixel[0]);
|
|
// System.err.print(", g: " + pixel[1]);
|
|
// System.err.println(", b: " + pixel[2]);
|
|
zPixmap.set_red(tx - x, ty - y, pixel[0]);
|
|
zPixmap.set_green(tx - x, ty - y, pixel[1]);
|
|
zPixmap.set_blue(tx - x, ty - y, pixel[2]);
|
|
}
|
|
}
|
|
xdrawable.put_image(xgc, zPixmap, x, y);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void renderScanline(int y, ScanlineCoverage c)
|
|
{
|
|
if (y >= xdrawable.height)
|
|
return;
|
|
|
|
// TODO: Handle Composite and Paint.
|
|
ScanlineCoverage.Iterator iter = c.iterate();
|
|
int coverageAlpha = 0;
|
|
int maxCoverage = c.getMaxCoverage();
|
|
while (iter.hasNext())
|
|
{
|
|
ScanlineCoverage.Range range = iter.next();
|
|
|
|
coverageAlpha = range.getCoverage();
|
|
int x0 = range.getXPos();
|
|
int l = range.getLength();
|
|
if (coverageAlpha == c.getMaxCoverage())
|
|
{
|
|
// Simply paint the current color over the existing pixels.
|
|
xdrawable.fill_rectangle(xgc, x0, y, l, 1);
|
|
}
|
|
else if (coverageAlpha > 0)
|
|
{
|
|
// Composite the current color with the existing pixels.
|
|
int x1 = x0 + l;
|
|
x0 = Math.min(Math.max(0, x0), xdrawable.width - 1);
|
|
x1 = Math.min(Math.max(0, x1), xdrawable.width - 1);
|
|
if ((x1 - x0) < 1)
|
|
continue;
|
|
l = x1 - x0;
|
|
gnu.x11.image.ZPixmap existing = (ZPixmap)
|
|
xdrawable.image(x0, y, l, 1, 0xFFFFFFFF,
|
|
gnu.x11.image.Image.Format.ZPIXMAP);
|
|
for (int x = 0; x < l; x++)
|
|
{
|
|
Color col = getColor();
|
|
if (col == null)
|
|
{
|
|
col = Color.BLACK;
|
|
}
|
|
int red = col.getRed();
|
|
int green = col.getGreen();
|
|
int blue = col.getBlue();
|
|
int redOut = existing.get_red(x, 0);
|
|
int greenOut = existing.get_green(x, 0);
|
|
int blueOut = existing.get_blue(x, 0);
|
|
int outAlpha = maxCoverage - coverageAlpha;
|
|
redOut = redOut * outAlpha + red * coverageAlpha;
|
|
redOut = redOut / maxCoverage;
|
|
greenOut = greenOut * outAlpha + green * coverageAlpha;
|
|
greenOut = greenOut / maxCoverage;
|
|
blueOut = blueOut * outAlpha + blue * coverageAlpha;
|
|
blueOut = blueOut / maxCoverage;
|
|
existing.set(x, 0, redOut, greenOut, blueOut);
|
|
}
|
|
xdrawable.put_image(xgc, existing, x0, y);
|
|
}
|
|
}
|
|
}
|
|
|
|
protected void init()
|
|
{
|
|
super.init();
|
|
}
|
|
|
|
public void setPaint(Paint p)
|
|
{
|
|
super.setPaint(p);
|
|
if (p instanceof Color)
|
|
{
|
|
// TODO: Optimize for different standard bit-depths.
|
|
Color c = (Color) p;
|
|
/* XToolkit tk = (XToolkit) Toolkit.getDefaultToolkit();
|
|
HashMap colorMap = tk.colorMap;
|
|
gnu.x11.Color col = (gnu.x11.Color) colorMap.get(c);
|
|
if (col == null)
|
|
{
|
|
Colormap map = xdrawable.display.default_colormap;
|
|
col = map.alloc_color (c.getRed() * 256,
|
|
c.getGreen() * 256,
|
|
c.getBlue() * 256);
|
|
colorMap.put(c, col);
|
|
}*/
|
|
//xgc.set_foreground(col);
|
|
|
|
xgc.set_foreground(c.getRGB());
|
|
foreground = c;
|
|
}
|
|
}
|
|
|
|
protected void fillShape(Shape s, boolean isFont)
|
|
{
|
|
synchronized (xdrawable.display) {
|
|
super.fillShape(s, isFont);
|
|
}
|
|
}
|
|
|
|
private static WeakHashMap<Image,ZPixmap> imageCache = new WeakHashMap<Image,ZPixmap>();
|
|
|
|
protected boolean rawDrawImage(Image image, int x, int y, ImageObserver obs)
|
|
{
|
|
image = unwrap(image);
|
|
boolean ret;
|
|
if (image instanceof XImage)
|
|
{
|
|
XImage xImage = (XImage) image;
|
|
xdrawable.copy_area(xImage.pixmap, xgc, 0, 0, xImage.getWidth(obs),
|
|
xImage.getHeight(obs), x, y);
|
|
ret = true;
|
|
}
|
|
else if (image instanceof PixmapVolatileImage)
|
|
{
|
|
PixmapVolatileImage pvi = (PixmapVolatileImage) image;
|
|
xdrawable.copy_area(pvi.getPixmap(), xgc, 0, 0, pvi.getWidth(obs),
|
|
pvi.getHeight(obs), x, y);
|
|
ret = true;
|
|
}
|
|
else if (image instanceof BufferedImage)
|
|
{
|
|
BufferedImage bi = (BufferedImage) image;
|
|
DataBuffer db = bi.getRaster().getDataBuffer();
|
|
if (db instanceof ZPixmapDataBuffer)
|
|
{
|
|
ZPixmapDataBuffer zpmdb = (ZPixmapDataBuffer) db;
|
|
ZPixmap zpixmap = zpmdb.getZPixmap();
|
|
xdrawable.put_image(xgc, zpixmap, x, y);
|
|
ret = true;
|
|
}
|
|
else
|
|
{
|
|
int transparency = bi.getTransparency();
|
|
int w = bi.getWidth();
|
|
int h = bi.getHeight();
|
|
if (imageCache.containsKey(image))
|
|
{
|
|
ZPixmap zpixmap = imageCache.get(image);
|
|
xdrawable.put_image(xgc, zpixmap, x, y);
|
|
}
|
|
else if (transparency == Transparency.OPAQUE || RENDER_OPAQUE)
|
|
{
|
|
XGraphicsDevice gd = XToolkit.getDefaultDevice();
|
|
ZPixmap zpixmap = new ZPixmap(gd.getDisplay(), w, h);
|
|
for (int yy = 0; yy < h; yy++)
|
|
{
|
|
for (int xx = 0; xx < w; xx++)
|
|
{
|
|
int rgb = bi.getRGB(xx, yy);
|
|
zpixmap.set(xx, yy, rgb);
|
|
}
|
|
}
|
|
xdrawable.put_image(xgc, zpixmap, x, y);
|
|
imageCache.put(image, zpixmap);
|
|
} else {
|
|
|
|
// TODO optimize reusing the rectangles
|
|
Rectangle source =
|
|
new Rectangle(0, 0, xdrawable.width, xdrawable.height);
|
|
Rectangle target = new Rectangle(x, y, w, h);
|
|
|
|
Rectangle destination = source.intersection(target);
|
|
|
|
x = destination.x;
|
|
y = destination.y;
|
|
w = destination.width;
|
|
h = destination.height;
|
|
|
|
ZPixmap zpixmap =
|
|
(ZPixmap) xdrawable.image(x, y, w, h,
|
|
0xffffffff,
|
|
gnu.x11.image.Image.Format.ZPIXMAP);
|
|
for (int yy = 0; yy < h; yy++)
|
|
{
|
|
for (int xx = 0; xx < w; xx++)
|
|
{
|
|
int rgb = bi.getRGB(xx, yy);
|
|
int alpha = 0xff & (rgb >> 24);
|
|
if (alpha == 0)
|
|
{
|
|
// Completely translucent.
|
|
rgb = zpixmap.get_red(xx, yy) << 16
|
|
| zpixmap.get_green(xx, yy) << 8
|
|
| zpixmap.get_blue(xx, yy);
|
|
}
|
|
else if (alpha < 255)
|
|
{
|
|
// Composite pixels.
|
|
int red = 0xff & (rgb >> 16);
|
|
red = red * alpha
|
|
+ (255 - alpha) * zpixmap.get_red(xx, yy);
|
|
red = red / 255;
|
|
int green = 0xff & (rgb >> 8);
|
|
green = green * alpha
|
|
+ (255 - alpha) * zpixmap.get_green(xx, yy);
|
|
green = green / 255;
|
|
int blue = 0xff & rgb;
|
|
blue = blue * alpha
|
|
+ (255 - alpha) * zpixmap.get_blue(xx, yy);
|
|
blue = blue / 255;
|
|
rgb = red << 16 | green << 8 | blue;
|
|
}
|
|
// else keep rgb value from source image.
|
|
|
|
zpixmap.set(xx, yy, rgb);
|
|
}
|
|
}
|
|
xdrawable.put_image(xgc, zpixmap, x, y);
|
|
// We can't cache prerendered translucent images, because
|
|
// we never know how the background changes.
|
|
}
|
|
ret = true;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
ret = super.rawDrawImage(image, x, y, obs);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
public void setFont(Font f)
|
|
{
|
|
super.setFont(f);
|
|
FontPeer p = getFont().getPeer();
|
|
if (p instanceof XFontPeer)
|
|
{
|
|
XFontPeer xFontPeer = (XFontPeer) p;
|
|
xgc.set_font(xFontPeer.getXFont());
|
|
}
|
|
}
|
|
|
|
public void drawString(String s, int x, int y)
|
|
{
|
|
FontPeer p = getFont().getPeer();
|
|
if (p instanceof XFontPeer)
|
|
{
|
|
int tx = (int) transform.getTranslateX();
|
|
int ty = (int) transform.getTranslateY();
|
|
xdrawable.text(xgc, x + tx, y + ty, s);
|
|
}
|
|
else
|
|
{
|
|
super.drawString(s, x, y);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Extracts an image instance out of an AsyncImage. If the image isn't
|
|
* an AsyncImage, then the original instance is returned.
|
|
*
|
|
* @param im the image
|
|
*
|
|
* @return the image to render
|
|
*/
|
|
private Image unwrap(Image im)
|
|
{
|
|
Image image = im;
|
|
if (image instanceof AsyncImage)
|
|
{
|
|
AsyncImage aIm = (AsyncImage) image;
|
|
image = aIm.getRealImage();
|
|
}
|
|
return image;
|
|
}
|
|
|
|
}
|
|
|