mirror of
https://gcc.gnu.org/git/gcc.git
synced 2026-02-23 20:23:06 -05:00
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
452 lines
13 KiB
Java
452 lines
13 KiB
Java
/* ScanlineConverter.java -- Rasterizes Shapes
|
|
Copyright (C) 2006, 2007 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.java2d;
|
|
|
|
import gnu.java.math.Fixed;
|
|
|
|
import java.awt.RenderingHints;
|
|
import java.awt.Shape;
|
|
import java.awt.geom.AffineTransform;
|
|
import java.awt.geom.PathIterator;
|
|
|
|
/**
|
|
* Rasterizes {@link Shape} objects on an AbstractGraphics2D.
|
|
*/
|
|
public final class ScanlineConverter
|
|
{
|
|
|
|
/**
|
|
* The number of digits to use for fixed point arithmetics.
|
|
*/
|
|
private static int FIXED_DIGITS = 6;
|
|
|
|
/**
|
|
* The fixed point constant for the number one.
|
|
*/
|
|
private static int ONE = Fixed.fixedValue(FIXED_DIGITS, 1);
|
|
|
|
/**
|
|
* The actual number of scanlines.
|
|
*/
|
|
private int numScanlines;
|
|
|
|
/**
|
|
* The number of scanlines. This can contain more elements than we have
|
|
* scanlines. The real number of scanlines is stored in
|
|
* {@link #numScanlines}. This can also contain null values for empty
|
|
* scanlines.
|
|
*/
|
|
private Scanline[] scanlines;
|
|
|
|
/**
|
|
* The upper bounds which correspond to the index 0 in the scanline array.
|
|
*
|
|
* This is a fixed point value.
|
|
*/
|
|
private int upperBounds;
|
|
|
|
/**
|
|
* The resolution of the scanline converter.
|
|
*
|
|
* This is a fixed point value.
|
|
*/
|
|
private int resolution;
|
|
|
|
/**
|
|
* The number of significant bits for the 'Y' resolution.
|
|
*/
|
|
private int yResolution;
|
|
|
|
/**
|
|
* One half step according to the resolution. This is stored to avoid
|
|
* unnecessary operations during rendering.
|
|
*/
|
|
private int halfStep;
|
|
|
|
/**
|
|
* This is used in {@link #addShape(PathIterator, boolean)} to
|
|
* receive the coordinates of the path.
|
|
*/
|
|
private float[] coords;
|
|
|
|
/**
|
|
* The active edges.
|
|
*/
|
|
private ActiveEdges activeEdges;
|
|
|
|
private PolyEdge edgePool;
|
|
private PolyEdge edgePoolLast;
|
|
|
|
private int minY;
|
|
private int maxY;
|
|
private int minX;
|
|
private int maxX;
|
|
|
|
/**
|
|
* Holds and manages information about the pixel coverage.
|
|
*/
|
|
private ScanlineCoverage scanlineCoverage;
|
|
|
|
/**
|
|
* Create a new ScanlineConverter.
|
|
*/
|
|
ScanlineConverter()
|
|
{
|
|
scanlines = new Scanline[10];
|
|
coords = new float[6];
|
|
activeEdges = new ActiveEdges();
|
|
edgePool = new PolyEdge();
|
|
edgePoolLast = edgePool;
|
|
scanlineCoverage = new ScanlineCoverage();
|
|
}
|
|
|
|
/**
|
|
* Renders the specified shape using the specified clip and transform.
|
|
*
|
|
* @param p the pixelizer that receives the coverage information
|
|
* @param shape the shape to render
|
|
* @param clip the clip
|
|
* @param trans the transform
|
|
*/
|
|
public void renderShape(Pixelizer p, Shape shape, Shape clip,
|
|
AffineTransform trans, int res, int yRes,
|
|
RenderingHints hints)
|
|
{
|
|
// TODO: Do something useful with the rendering hints. Like, adjusting
|
|
// the resolution.
|
|
|
|
// Prepare resolution and upper bounds.
|
|
clear();
|
|
setResolution(res, yRes);
|
|
|
|
boolean haveClip = clip != null;
|
|
|
|
// Add shapes.
|
|
float flatness = Fixed.floatValue(FIXED_DIGITS, resolution / 2);
|
|
PathIterator path = shape.getPathIterator(trans, flatness);
|
|
addShape(path, false);
|
|
if (haveClip)
|
|
{
|
|
path= clip.getPathIterator(trans, flatness);
|
|
addShape(path, true);
|
|
}
|
|
|
|
setUpperBounds(minY);
|
|
|
|
PolyEdge edge = edgePool;
|
|
while (edge != edgePoolLast)
|
|
{
|
|
addEdge(edge);
|
|
edge = edge.poolNext;
|
|
}
|
|
|
|
int y = upperBounds;
|
|
int index;
|
|
activeEdges.clear();
|
|
// The render loop...
|
|
Scanline scanline = null;
|
|
int lastRealY = Fixed.intValue(FIXED_DIGITS, y);
|
|
while (y <= maxY)
|
|
{
|
|
// First we put together our list of active edges.
|
|
index = scanlineIndex(y);
|
|
// If we go outside the scanline array we still need to render the
|
|
// remaining edges until they end.
|
|
scanline = index < scanlines.length ? scanlines[index] : null;
|
|
if (scanline != null)
|
|
{
|
|
edge = scanline.getEdges();
|
|
while (edge != null)
|
|
{
|
|
activeEdges.add(edge);
|
|
edge = edge.scanlineNext;
|
|
}
|
|
}
|
|
|
|
// Then we intersect all active edges with the current scanline
|
|
// and sort them according to their intersection points.
|
|
activeEdges.intersectSortAndPack(FIXED_DIGITS, y + halfStep);
|
|
|
|
// Ok, now we can perform the actual scanlining.
|
|
int realY = Fixed.intValue(FIXED_DIGITS, y + resolution);
|
|
boolean push = lastRealY != realY;
|
|
|
|
doScanline(p, y, push, haveClip);
|
|
|
|
// Remove obsolete active edges.
|
|
//activeEdges.remove(y + halfStep);
|
|
// Go on with the next line...
|
|
y += resolution;
|
|
lastRealY = realY;
|
|
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Clears all scanlines.
|
|
*/
|
|
private void clear()
|
|
{
|
|
// Reset edge pool.
|
|
edgePoolLast = edgePool;
|
|
|
|
// Reset scanlines.
|
|
for (int i = scanlines.length - 1; i >= 0 ; i--)
|
|
{
|
|
Scanline sl = scanlines[i];
|
|
if (sl != null)
|
|
sl.clear();
|
|
}
|
|
|
|
// Reset scanline coverage.
|
|
scanlineCoverage.clear();
|
|
|
|
// Reset bounds.
|
|
minY = Integer.MAX_VALUE;
|
|
maxY = Integer.MIN_VALUE;
|
|
minX = Integer.MAX_VALUE;
|
|
maxX = Integer.MIN_VALUE;
|
|
}
|
|
|
|
/**
|
|
* Performs the scanlining on the current set of active edges.
|
|
*
|
|
* @param p the pixelizer to receive the pixel coverage data
|
|
* @param y the Y coordinate
|
|
* @param push true when the scanline is ready to be pushed to the
|
|
* pixelizer
|
|
* @param haveClip true when there's a clip, false otherwise
|
|
*/
|
|
private void doScanline(Pixelizer p, int y, boolean push,
|
|
boolean haveClip)
|
|
{
|
|
// First, rewind the scanline coverage.
|
|
scanlineCoverage.rewind();
|
|
|
|
// We begin outside the clip and outside the shape. We only draw when
|
|
// we are inside the clip AND inside the shape.
|
|
boolean inClip = ! haveClip;
|
|
boolean inShape = false;
|
|
PolyEdge lastEdge = null;
|
|
int numEdges = activeEdges.getNumActiveEdges();
|
|
for (int i = 0; i < numEdges; i++)
|
|
{
|
|
PolyEdge edge = activeEdges.getActiveEdge(i);
|
|
if (inClip && inShape)
|
|
{
|
|
assert lastEdge != null;
|
|
int x0 = lastEdge.xIntersection;
|
|
int x1 = edge.xIntersection;
|
|
assert x0 <= x1;
|
|
|
|
int pix0 = Fixed.intValue(FIXED_DIGITS, x0);
|
|
int pix1 = Fixed.intValue(FIXED_DIGITS, x1);
|
|
int frac0 = ONE - Fixed.trunc(FIXED_DIGITS, x0);
|
|
int frac1 = ONE - Fixed.trunc(FIXED_DIGITS, x1);
|
|
// Only keep the first 4 digits after the point.
|
|
frac0 = frac0 >> (FIXED_DIGITS - yResolution);
|
|
frac1 = frac1 >> (FIXED_DIGITS - yResolution);
|
|
scanlineCoverage.add(pix0, 1 * (1 << yResolution), frac0);
|
|
scanlineCoverage.add(pix1, -1 * (1 << yResolution), -frac1);
|
|
}
|
|
if (edge.isClip)
|
|
inClip = ! inClip;
|
|
else
|
|
inShape = ! inShape;
|
|
|
|
lastEdge = edge;
|
|
}
|
|
|
|
// Push out the whole scanline to the pixelizer.
|
|
if (push && ! scanlineCoverage.isEmpty())
|
|
{
|
|
p.renderScanline(Fixed.intValue(FIXED_DIGITS, y), scanlineCoverage);
|
|
scanlineCoverage.clear();
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* Sets the resolution. A value of 0 rasterizes the shape normally without
|
|
* anti-aliasing. Greater values renders with a resolution of 2 ^ res.
|
|
*
|
|
* @param res the resolution
|
|
*/
|
|
private void setResolution(int res, int yRes)
|
|
{
|
|
int scanlinesPerPixel = 1 << res;
|
|
int one = Fixed.fixedValue(FIXED_DIGITS, 1);
|
|
resolution = one / (scanlinesPerPixel);
|
|
halfStep = resolution / 2;
|
|
|
|
scanlineCoverage.setMaxCoverage(scanlinesPerPixel << yResolution);
|
|
|
|
yResolution = yRes;
|
|
}
|
|
|
|
/**
|
|
* Sets the vertical bounds of that shape that is beeing rendered.
|
|
*
|
|
* @param y0 the upper bounds
|
|
*/
|
|
private void setUpperBounds(int y0)
|
|
{
|
|
upperBounds = fit(y0);
|
|
}
|
|
|
|
/**
|
|
* Add a shape to the scanline converter.
|
|
*
|
|
* @param path
|
|
* @param clip
|
|
*/
|
|
private void addShape(PathIterator path, boolean clip)
|
|
{
|
|
int startX = 0;
|
|
int startY = 0;
|
|
int lastX = 0;
|
|
int lastY = 0;
|
|
while (! path.isDone())
|
|
{
|
|
int type = path.currentSegment(coords);
|
|
switch (type)
|
|
{
|
|
case PathIterator.SEG_MOVETO:
|
|
startX = lastX = Fixed.fixedValue(FIXED_DIGITS, coords[0]);
|
|
startY = lastY = Fixed.fixedValue(FIXED_DIGITS, coords[1]);
|
|
minY = Math.min(startY, minY);
|
|
maxY = Math.max(startY, maxY);
|
|
minX = Math.min(startX, minX);
|
|
maxX = Math.max(startX, maxX);
|
|
break;
|
|
case PathIterator.SEG_LINETO:
|
|
int x = Fixed.fixedValue(FIXED_DIGITS, coords[0]);
|
|
int y = Fixed.fixedValue(FIXED_DIGITS, coords[1]);
|
|
edgePoolAdd(lastX, lastY, x, y, clip);
|
|
lastX = x;
|
|
lastY = y;
|
|
minY = Math.min(lastY, minY);
|
|
maxY = Math.max(lastY, maxY);
|
|
minX = Math.min(lastX, minX);
|
|
maxX = Math.max(lastX, maxX);
|
|
break;
|
|
case PathIterator.SEG_CLOSE:
|
|
edgePoolAdd(lastX, lastY, startX, startY, clip);
|
|
lastX = startX;
|
|
lastY = startY;
|
|
break;
|
|
case PathIterator.SEG_CUBICTO:
|
|
case PathIterator.SEG_QUADTO:
|
|
default:
|
|
assert false;
|
|
}
|
|
path.next();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Adds an edge into the scanline array.
|
|
*/
|
|
private void addEdge(PolyEdge edge)
|
|
{
|
|
// Determine index.
|
|
int upper = Math.min(edge.y0, edge.y1);
|
|
// Fit to raster.
|
|
int index = scanlineIndex(upper);
|
|
// Grow array when necessary.
|
|
if (index >= scanlines.length)
|
|
{
|
|
int oldSize = scanlines.length;
|
|
int newSize = Math.max(oldSize + oldSize / 2 + 1, index + 10);
|
|
Scanline[] newScanlines = new Scanline[newSize];
|
|
System.arraycopy(scanlines, 0, newScanlines, 0, oldSize);
|
|
scanlines = newScanlines;
|
|
}
|
|
|
|
// Add edge.
|
|
if (scanlines[index] == null)
|
|
{
|
|
scanlines[index] = new Scanline();
|
|
}
|
|
scanlines[index].addEdge(edge);
|
|
}
|
|
|
|
/**
|
|
* Fits an Y coordinate to the grid.
|
|
*
|
|
* @param y the Y coordinate to fit
|
|
*
|
|
* @return the fitted Y coordinate
|
|
*/
|
|
private int fit(int y)
|
|
{
|
|
int val1 = Fixed.div(FIXED_DIGITS, y, resolution);
|
|
int rounded = Fixed.round(FIXED_DIGITS, val1);
|
|
return Fixed.mul(FIXED_DIGITS, rounded, resolution);
|
|
}
|
|
|
|
/**
|
|
* Calculates the scanline index for the specified y coordinate.
|
|
*
|
|
* @param y the y coordinate as fixed point value
|
|
*
|
|
* @return the scanline index
|
|
*/
|
|
private int scanlineIndex(int y)
|
|
{
|
|
int fitted = fit(y);
|
|
// Cleverly skip the fixed point conversions here.
|
|
return (fitted - upperBounds)/ resolution;
|
|
}
|
|
|
|
private void edgePoolAdd(int x0, int y0, int x1, int y1, boolean clip)
|
|
{
|
|
// Don't need no horizontal edges.
|
|
if (y0 != y1)
|
|
{
|
|
edgePoolLast.init(FIXED_DIGITS, x0, y0, x1, y1, clip);
|
|
if (edgePoolLast.poolNext == null)
|
|
{
|
|
edgePoolLast.poolNext = new PolyEdge();
|
|
}
|
|
edgePoolLast = edgePoolLast.poolNext;
|
|
}
|
|
}
|
|
}
|