
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
854 lines
27 KiB
Java
854 lines
27 KiB
Java
/* StreamSerializer.java --
|
|
Copyright (C) 2004,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.xml.transform;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.io.ByteArrayOutputStream;
|
|
import java.io.IOException;
|
|
import java.io.OutputStream;
|
|
import java.nio.ByteBuffer;
|
|
import java.nio.CharBuffer;
|
|
import java.nio.charset.Charset;
|
|
import java.nio.charset.CharsetEncoder;
|
|
import java.util.Collection;
|
|
import java.util.Collections;
|
|
import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.Iterator;
|
|
import java.util.LinkedList;
|
|
import java.util.Map;
|
|
import javax.xml.XMLConstants;
|
|
import org.w3c.dom.Attr;
|
|
import org.w3c.dom.Document;
|
|
import org.w3c.dom.DocumentType;
|
|
import org.w3c.dom.NamedNodeMap;
|
|
import org.w3c.dom.Node;
|
|
|
|
/**
|
|
* Serializes a DOM node to an output stream.
|
|
*
|
|
* @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
|
|
*/
|
|
public class StreamSerializer
|
|
{
|
|
|
|
static final int SPACE = 0x20;
|
|
static final int BANG = 0x21; // !
|
|
static final int APOS = 0x27; // '
|
|
static final int SLASH = 0x2f; // /
|
|
static final int BRA = 0x3c; // <
|
|
static final int KET = 0x3e; // >
|
|
static final int EQ = 0x3d; // =
|
|
|
|
/**
|
|
* HTML 4.01 boolean attributes
|
|
*/
|
|
static final Map HTML_BOOLEAN_ATTRIBUTES = new HashMap();
|
|
static
|
|
{
|
|
HashSet set;
|
|
|
|
set = new HashSet();
|
|
set.add("nohref");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("area", set);
|
|
|
|
set = new HashSet();
|
|
set.add("ismap");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("img", set);
|
|
|
|
set = new HashSet();
|
|
set.add("declare");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("object", set);
|
|
|
|
set = new HashSet();
|
|
set.add("noshade");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("hr", set);
|
|
|
|
set = new HashSet();
|
|
set.add("compact");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("dl", set);
|
|
HTML_BOOLEAN_ATTRIBUTES.put("ol", set);
|
|
HTML_BOOLEAN_ATTRIBUTES.put("ul", set);
|
|
HTML_BOOLEAN_ATTRIBUTES.put("dir", set);
|
|
HTML_BOOLEAN_ATTRIBUTES.put("menu", set);
|
|
|
|
set = new HashSet();
|
|
set.add("checked");
|
|
set.add("disabled");
|
|
set.add("readonly");
|
|
set.add("ismap");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("input", set);
|
|
|
|
set = new HashSet();
|
|
set.add("multiple");
|
|
set.add("disabled");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("select", set);
|
|
|
|
set = new HashSet();
|
|
set.add("disabled");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("optgroup", set);
|
|
|
|
set = new HashSet();
|
|
set.add("selected");
|
|
set.add("disabled");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("option", set);
|
|
|
|
set = new HashSet();
|
|
set.add("disabled");
|
|
set.add("readonly");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("textarea", set);
|
|
|
|
set = new HashSet();
|
|
set.add("disabled");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("button", set);
|
|
|
|
set = new HashSet();
|
|
set.add("nowrap");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("th", set);
|
|
HTML_BOOLEAN_ATTRIBUTES.put("td", set);
|
|
|
|
set = new HashSet();
|
|
set.add("noresize");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("frame", set);
|
|
|
|
set = new HashSet();
|
|
set.add("defer");
|
|
HTML_BOOLEAN_ATTRIBUTES.put("script", set);
|
|
}
|
|
|
|
// HTML namespace URIs
|
|
static final HashSet HTML_URIS = new HashSet();
|
|
static {
|
|
HTML_URIS.add("http://www.w3.org/1999/xhtml");
|
|
}
|
|
|
|
protected final String encoding;
|
|
final Charset charset;
|
|
final CharsetEncoder encoder;
|
|
final int mode;
|
|
final LinkedList namespaces;
|
|
protected String eol;
|
|
Collection cdataSectionElements = Collections.EMPTY_SET;
|
|
|
|
protected boolean discardDefaultContent;
|
|
protected boolean xmlDeclaration = true;
|
|
|
|
// has a META element with the encoding been added?
|
|
private boolean htmlEncoded;
|
|
|
|
public StreamSerializer()
|
|
{
|
|
this(Stylesheet.OUTPUT_XML, null, null);
|
|
}
|
|
|
|
public StreamSerializer(String encoding)
|
|
{
|
|
this(Stylesheet.OUTPUT_XML, encoding, null);
|
|
}
|
|
|
|
public StreamSerializer(int mode, String encoding, String eol)
|
|
{
|
|
this.mode = mode;
|
|
if (encoding == null)
|
|
encoding = (mode == Stylesheet.OUTPUT_HTML) ? "ISO-8859-1" : "UTF-8";
|
|
this.encoding = encoding.intern();
|
|
charset = Charset.forName(this.encoding);
|
|
encoder = charset.newEncoder();
|
|
this.eol = (eol != null) ? eol : System.getProperty("line.separator");
|
|
namespaces = new LinkedList();
|
|
}
|
|
|
|
void setCdataSectionElements(Collection c)
|
|
{
|
|
cdataSectionElements = c;
|
|
}
|
|
|
|
public void serialize(final Node node, final OutputStream out)
|
|
throws IOException
|
|
{
|
|
serialize(node, out, false);
|
|
}
|
|
|
|
void serialize(Node node, final OutputStream out,
|
|
boolean convertToCdata)
|
|
throws IOException
|
|
{
|
|
while (node != null)
|
|
{
|
|
Node next = node.getNextSibling();
|
|
doSerialize(node, out, convertToCdata);
|
|
node = next;
|
|
}
|
|
}
|
|
|
|
private void doSerialize(final Node node, final OutputStream out,
|
|
boolean convertToCdata)
|
|
throws IOException
|
|
{
|
|
if (out == null)
|
|
throw new NullPointerException("no output stream");
|
|
htmlEncoded = false;
|
|
String value, prefix;
|
|
Node children;
|
|
String uri = node.getNamespaceURI();
|
|
short nt = node.getNodeType();
|
|
if (convertToCdata && nt == Node.TEXT_NODE)
|
|
nt = Node.CDATA_SECTION_NODE;
|
|
switch (nt)
|
|
{
|
|
case Node.ATTRIBUTE_NODE:
|
|
prefix = node.getPrefix();
|
|
if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(uri) ||
|
|
XMLConstants.XMLNS_ATTRIBUTE.equals(prefix) ||
|
|
(prefix != null && prefix.startsWith("xmlns:")))
|
|
{
|
|
String nsuri = node.getNodeValue();
|
|
if (isDefined(nsuri, prefix))
|
|
break;
|
|
String name = node.getLocalName();
|
|
if (name == null)
|
|
{
|
|
// Namespace-unaware
|
|
name = node.getNodeName();
|
|
int ci = name.indexOf(':');
|
|
if (ci != -1)
|
|
name = name.substring(ci + 1);
|
|
}
|
|
define(nsuri, name);
|
|
}
|
|
else if (uri != null && !isDefined(uri, prefix))
|
|
{
|
|
prefix = define(uri, prefix);
|
|
String nsname = (prefix == null) ? "xmlns" : "xmlns:" + prefix;
|
|
out.write(SPACE);
|
|
out.write(encodeText(nsname));
|
|
out.write(EQ);
|
|
String nsvalue = "\"" + encode(uri, true, true) + "\"";
|
|
out.write(nsvalue.getBytes(encoding));
|
|
}
|
|
out.write(SPACE);
|
|
String a_nodeName = node.getNodeName();
|
|
out.write(encodeText(a_nodeName));
|
|
String a_nodeValue = node.getNodeValue();
|
|
if (mode == Stylesheet.OUTPUT_HTML &&
|
|
a_nodeName.equals(a_nodeValue) &&
|
|
isHTMLBoolean((Attr) node, a_nodeName))
|
|
break;
|
|
out.write(EQ);
|
|
value = "\"" + encode(a_nodeValue, true, true) + "\"";
|
|
out.write(encodeText(value));
|
|
break;
|
|
case Node.ELEMENT_NODE:
|
|
pushNamespaceContext();
|
|
value = node.getNodeName();
|
|
out.write(BRA);
|
|
out.write(encodeText(value));
|
|
prefix = node.getPrefix();
|
|
if (uri != null && !isDefined(uri, prefix))
|
|
{
|
|
prefix = define(uri, prefix);
|
|
String nsname = (prefix == null) ? "xmlns" : "xmlns:" + prefix;
|
|
out.write(SPACE);
|
|
out.write(encodeText(nsname));
|
|
out.write(EQ);
|
|
String nsvalue = "\"" + encode(uri, true, true) + "\"";
|
|
out.write(encodeText(nsvalue));
|
|
}
|
|
NamedNodeMap attrs = node.getAttributes();
|
|
if (attrs != null)
|
|
{
|
|
int len = attrs.getLength();
|
|
for (int i = 0; i < len; i++)
|
|
{
|
|
Attr attr = (Attr) attrs.item(i);
|
|
if (discardDefaultContent && !attr.getSpecified())
|
|
{
|
|
// NOOP
|
|
}
|
|
else
|
|
serialize(attr, out, false);
|
|
}
|
|
}
|
|
convertToCdata = cdataSectionElements.contains(value);
|
|
children = node.getFirstChild();
|
|
if (children == null)
|
|
{
|
|
out.write(SLASH);
|
|
out.write(KET);
|
|
}
|
|
else
|
|
{
|
|
out.write(KET);
|
|
serialize(children, out, convertToCdata);
|
|
out.write(BRA);
|
|
out.write(SLASH);
|
|
out.write(encodeText(value));
|
|
out.write(KET);
|
|
}
|
|
popNamespaceContext();
|
|
break;
|
|
case Node.TEXT_NODE:
|
|
value = node.getNodeValue();
|
|
if (!"yes".equals(node.getUserData("disable-output-escaping")) &&
|
|
mode != Stylesheet.OUTPUT_TEXT)
|
|
value = encode(value, false, false);
|
|
out.write(encodeText(value));
|
|
break;
|
|
case Node.CDATA_SECTION_NODE:
|
|
value = node.getNodeValue();
|
|
// Where any instanceof of ]]> occur, split into multiple CDATA
|
|
// sections
|
|
int bbk = value.indexOf("]]>");
|
|
while (bbk != -1)
|
|
{
|
|
String head = value.substring(0, bbk + 2);
|
|
out.write(encodeText("<![CDATA[" + head + "]]>"));
|
|
value = value.substring(bbk + 2);
|
|
bbk = value.indexOf("]]>");
|
|
}
|
|
// Write final tail value
|
|
out.write(encodeText("<![CDATA[" + value + "]]>"));
|
|
break;
|
|
case Node.COMMENT_NODE:
|
|
value = "<!--" + node.getNodeValue() + "-->";
|
|
out.write(encodeText(value));
|
|
Node cp = node.getParentNode();
|
|
if (cp != null && cp.getNodeType() == Node.DOCUMENT_NODE)
|
|
out.write(encodeText(eol));
|
|
break;
|
|
case Node.DOCUMENT_NODE:
|
|
case Node.DOCUMENT_FRAGMENT_NODE:
|
|
if (mode == Stylesheet.OUTPUT_XML)
|
|
{
|
|
if ("UTF-16".equalsIgnoreCase(encoding))
|
|
{
|
|
out.write(0xfe);
|
|
out.write(0xff);
|
|
}
|
|
if (!"yes".equals(node.getUserData("omit-xml-declaration")) &&
|
|
xmlDeclaration)
|
|
{
|
|
Document doc = (node instanceof Document) ?
|
|
(Document) node : null;
|
|
String version = (doc != null) ? doc.getXmlVersion() : null;
|
|
if (version == null)
|
|
version = (String) node.getUserData("version");
|
|
if (version == null)
|
|
version = "1.0";
|
|
out.write(BRA);
|
|
out.write(0x3f);
|
|
out.write("xml version=\"".getBytes("US-ASCII"));
|
|
out.write(version.getBytes("US-ASCII"));
|
|
out.write(0x22);
|
|
if (!("UTF-8".equalsIgnoreCase(encoding)))
|
|
{
|
|
out.write(" encoding=\"".getBytes("US-ASCII"));
|
|
out.write(encoding.getBytes("US-ASCII"));
|
|
out.write(0x22);
|
|
}
|
|
if ((doc != null && doc.getXmlStandalone()) ||
|
|
"yes".equals(node.getUserData("standalone")))
|
|
out.write(" standalone=\"yes\"".getBytes("US-ASCII"));
|
|
out.write(0x3f);
|
|
out.write(KET);
|
|
out.write(encodeText(eol));
|
|
}
|
|
// TODO warn if not outputting the declaration would be a
|
|
// problem
|
|
}
|
|
else if (mode == Stylesheet.OUTPUT_HTML)
|
|
{
|
|
// Ensure that encoding is accessible if head element is present
|
|
String mediaType = (String) node.getUserData("media-type");
|
|
if (mediaType == null)
|
|
mediaType = "text/html";
|
|
String contentType = mediaType + "; charset=" +
|
|
((encoding.indexOf(' ') != -1) ?
|
|
"\"" + encoding + "\"" :
|
|
encoding);
|
|
Document doc = (node instanceof Document) ? (Document) node :
|
|
node.getOwnerDocument();
|
|
Node html = null;
|
|
for (Node ctx = node.getFirstChild(); ctx != null;
|
|
ctx = ctx.getNextSibling())
|
|
{
|
|
if (ctx.getNodeType() == Node.ELEMENT_NODE &&
|
|
isHTMLElement(ctx, "html"))
|
|
{
|
|
html = ctx;
|
|
break;
|
|
}
|
|
}
|
|
if (html != null)
|
|
{
|
|
Node head = null;
|
|
for (Node ctx = html.getFirstChild(); ctx != null;
|
|
ctx = ctx.getNextSibling())
|
|
{
|
|
if (isHTMLElement(ctx, "head"))
|
|
{
|
|
head = ctx;
|
|
break;
|
|
}
|
|
}
|
|
if (head != null)
|
|
{
|
|
Node meta = null;
|
|
Node metaContent = null;
|
|
for (Node ctx = head.getFirstChild(); ctx != null;
|
|
ctx = ctx.getNextSibling())
|
|
{
|
|
if (isHTMLElement(ctx, "meta"))
|
|
{
|
|
NamedNodeMap metaAttrs = ctx.getAttributes();
|
|
int len = metaAttrs.getLength();
|
|
String httpEquiv = null;
|
|
Node content = null;
|
|
for (int i = 0; i < len; i++)
|
|
{
|
|
Node attr = metaAttrs.item(i);
|
|
String attrName = attr.getNodeName();
|
|
if ("http-equiv".equalsIgnoreCase(attrName))
|
|
httpEquiv = attr.getNodeValue();
|
|
else if ("content".equalsIgnoreCase(attrName))
|
|
content = attr;
|
|
}
|
|
if ("Content-Type".equalsIgnoreCase(httpEquiv))
|
|
{
|
|
meta = ctx;
|
|
metaContent = content;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (meta == null)
|
|
{
|
|
meta = doc.createElement("meta");
|
|
// Insert first
|
|
Node first = head.getFirstChild();
|
|
if (first == null)
|
|
head.appendChild(meta);
|
|
else
|
|
head.insertBefore(meta, first);
|
|
Node metaHttpEquiv = doc.createAttribute("http-equiv");
|
|
meta.getAttributes().setNamedItem(metaHttpEquiv);
|
|
metaHttpEquiv.setNodeValue("Content-Type");
|
|
}
|
|
if (metaContent == null)
|
|
{
|
|
metaContent = doc.createAttribute("content");
|
|
meta.getAttributes().setNamedItem(metaContent);
|
|
}
|
|
metaContent.setNodeValue(contentType);
|
|
htmlEncoded = true;
|
|
}
|
|
}
|
|
}
|
|
children = node.getFirstChild();
|
|
if (children != null)
|
|
serialize(children, out, convertToCdata);
|
|
break;
|
|
case Node.DOCUMENT_TYPE_NODE:
|
|
DocumentType doctype = (DocumentType) node;
|
|
out.write(BRA);
|
|
out.write(BANG);
|
|
out.write(encodeText("DOCTYPE "));
|
|
value = doctype.getNodeName();
|
|
out.write(encodeText(value));
|
|
String publicId = doctype.getPublicId();
|
|
if (publicId != null)
|
|
{
|
|
out.write(encodeText(" PUBLIC "));
|
|
out.write(APOS);
|
|
out.write(encodeText(publicId));
|
|
out.write(APOS);
|
|
}
|
|
String systemId = doctype.getSystemId();
|
|
if (systemId != null)
|
|
{
|
|
out.write(encodeText(" SYSTEM "));
|
|
out.write(APOS);
|
|
out.write(encodeText(systemId));
|
|
out.write(APOS);
|
|
}
|
|
String internalSubset = doctype.getInternalSubset();
|
|
if (internalSubset != null)
|
|
{
|
|
out.write(encodeText(internalSubset));
|
|
}
|
|
out.write(KET);
|
|
out.write(eol.getBytes(encoding));
|
|
break;
|
|
case Node.ENTITY_REFERENCE_NODE:
|
|
value = "&" + node.getNodeValue() + ";";
|
|
out.write(encodeText(value));
|
|
break;
|
|
case Node.PROCESSING_INSTRUCTION_NODE:
|
|
value = "<?" + node.getNodeName() + " " + node.getNodeValue() + "?>";
|
|
out.write(encodeText(value));
|
|
Node pp = node.getParentNode();
|
|
if (pp != null && pp.getNodeType() == Node.DOCUMENT_NODE)
|
|
{
|
|
out.write(encodeText(eol));
|
|
}
|
|
break;
|
|
default:
|
|
System.err.println("Unhandled node type: "+nt);
|
|
}
|
|
}
|
|
|
|
boolean isHTMLElement(Node node, String name)
|
|
{
|
|
if (node.getNodeType() != Node.ELEMENT_NODE)
|
|
return false;
|
|
String localName = node.getLocalName();
|
|
if (localName == null)
|
|
localName = node.getNodeName();
|
|
if (!name.equalsIgnoreCase(localName))
|
|
return false;
|
|
String uri = node.getNamespaceURI();
|
|
return (uri == null || HTML_URIS.contains(uri));
|
|
}
|
|
|
|
boolean isDefined(String uri, String prefix)
|
|
{
|
|
if (XMLConstants.XML_NS_URI.equals(uri))
|
|
return "xml".equals(prefix);
|
|
if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(uri))
|
|
return "xmlns".equals(prefix);
|
|
if (prefix == null)
|
|
prefix = "";
|
|
for (Iterator i = namespaces.iterator(); i.hasNext(); )
|
|
{
|
|
Map ctx = (Map) i.next();
|
|
String val = (String) ctx.get(uri);
|
|
if (val != null && val.equals(prefix))
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void pushNamespaceContext()
|
|
{
|
|
namespaces.addFirst(new HashMap());
|
|
}
|
|
|
|
String define(String uri, String prefix)
|
|
{
|
|
if (namespaces.isEmpty())
|
|
return prefix;
|
|
HashMap ctx = (HashMap) namespaces.getFirst();
|
|
while (ctx.containsValue(prefix))
|
|
{
|
|
// Fabricate new prefix
|
|
prefix = prefix + "_";
|
|
}
|
|
ctx.put(uri, prefix);
|
|
return prefix;
|
|
}
|
|
|
|
void popNamespaceContext()
|
|
{
|
|
namespaces.removeFirst();
|
|
}
|
|
|
|
final byte[] encodeText(String text)
|
|
throws IOException
|
|
{
|
|
encoder.reset();
|
|
boolean htmlNeedingEncoding =
|
|
(mode == Stylesheet.OUTPUT_HTML && !htmlEncoded);
|
|
if (!encoder.canEncode(text) || htmlNeedingEncoding)
|
|
{
|
|
// Check each character
|
|
CPStringBuilder buf = new CPStringBuilder();
|
|
int len = text.length();
|
|
for (int i = 0; i < len; i++)
|
|
{
|
|
char c = text.charAt(i);
|
|
if (!encoder.canEncode(c))
|
|
{
|
|
// Replace with character entity reference
|
|
String hex = Integer.toHexString((int) c);
|
|
buf.append("&#x");
|
|
buf.append(hex);
|
|
buf.append(';');
|
|
}
|
|
else if (htmlNeedingEncoding)
|
|
{
|
|
String entityName = getHTMLCharacterEntity(c);
|
|
if (entityName != null)
|
|
{
|
|
buf.append('&');
|
|
buf.append(entityName);
|
|
buf.append(';');
|
|
}
|
|
else
|
|
buf.append(c);
|
|
}
|
|
else
|
|
buf.append(c);
|
|
}
|
|
text = buf.toString();
|
|
}
|
|
ByteBuffer encoded = encoder.encode(CharBuffer.wrap(text));
|
|
int len = encoded.limit() - encoded.position();
|
|
if (encoded.hasArray())
|
|
{
|
|
byte[] ret = encoded.array();
|
|
if (ret.length > len)
|
|
{
|
|
// Why?
|
|
byte[] ret2 = new byte[len];
|
|
System.arraycopy(ret, 0, ret2, 0, len);
|
|
ret = ret2;
|
|
}
|
|
return ret;
|
|
}
|
|
encoded.flip();
|
|
byte[] ret = new byte[len];
|
|
encoded.get(ret, 0, len);
|
|
return ret;
|
|
}
|
|
|
|
String encode(String text, boolean encodeCtl, boolean inAttr)
|
|
{
|
|
int len = text.length();
|
|
CPStringBuilder buf = null;
|
|
for (int i = 0; i < len; i++)
|
|
{
|
|
char c = text.charAt(i);
|
|
if (c == '<')
|
|
{
|
|
if (buf == null)
|
|
buf = new CPStringBuilder(text.substring(0, i));
|
|
buf.append("<");
|
|
}
|
|
else if (c == '>')
|
|
{
|
|
if (buf == null)
|
|
buf = new CPStringBuilder(text.substring(0, i));
|
|
buf.append(">");
|
|
}
|
|
else if (c == '&')
|
|
{
|
|
if (mode == Stylesheet.OUTPUT_HTML && (i + 1) < len &&
|
|
text.charAt(i + 1) == '{')
|
|
{
|
|
if (buf != null)
|
|
buf.append(c);
|
|
}
|
|
else
|
|
{
|
|
if (buf == null)
|
|
buf = new CPStringBuilder(text.substring(0, i));
|
|
buf.append("&");
|
|
}
|
|
}
|
|
else if (c == '\'' && inAttr)
|
|
{
|
|
if (buf == null)
|
|
buf = new CPStringBuilder(text.substring(0, i));
|
|
if (mode == Stylesheet.OUTPUT_HTML)
|
|
// HTML does not define ', use character entity ref
|
|
buf.append("'");
|
|
else
|
|
buf.append("'");
|
|
}
|
|
else if (c == '"' && inAttr)
|
|
{
|
|
if (buf == null)
|
|
buf = new CPStringBuilder(text.substring(0, i));
|
|
buf.append(""");
|
|
}
|
|
else if (encodeCtl)
|
|
{
|
|
if (c < 0x20)
|
|
{
|
|
if (buf == null)
|
|
buf = new CPStringBuilder(text.substring(0, i));
|
|
buf.append('&');
|
|
buf.append('#');
|
|
buf.append((int) c);
|
|
buf.append(';');
|
|
}
|
|
else if (buf != null)
|
|
buf.append(c);
|
|
}
|
|
else if (buf != null)
|
|
buf.append(c);
|
|
}
|
|
return (buf == null) ? text : buf.toString();
|
|
}
|
|
|
|
String toString(Node node)
|
|
{
|
|
ByteArrayOutputStream out = new ByteArrayOutputStream();
|
|
try
|
|
{
|
|
serialize(node, out);
|
|
return new String(out.toByteArray(), encoding);
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
throw new RuntimeException(e.getMessage());
|
|
}
|
|
}
|
|
|
|
boolean isHTMLBoolean(Attr attr, String attrName)
|
|
{
|
|
attrName = attrName.toLowerCase();
|
|
Node element = attr.getOwnerElement();
|
|
String elementName = element.getLocalName();
|
|
if (elementName == null)
|
|
{
|
|
elementName = element.getNodeName();
|
|
}
|
|
elementName = elementName.toLowerCase();
|
|
Collection attributes =
|
|
(Collection) HTML_BOOLEAN_ATTRIBUTES.get(elementName);
|
|
return (attributes != null && attributes.contains(attrName));
|
|
}
|
|
|
|
static String getHTMLCharacterEntity(char c)
|
|
{
|
|
// Hardcode these here to avoid loading the HTML DTD
|
|
switch (c)
|
|
{
|
|
case 160: return "nbsp";
|
|
case 161: return "iexcl";
|
|
case 162: return "cent";
|
|
case 163: return "pound";
|
|
case 164: return "curren";
|
|
case 165: return "yen";
|
|
case 166: return "brvbar";
|
|
case 167: return "sect";
|
|
case 168: return "uml";
|
|
case 169: return "copy";
|
|
case 170: return "ordf";
|
|
case 171: return "laquo";
|
|
case 172: return "not";
|
|
case 173: return "shy";
|
|
case 174: return "reg";
|
|
case 175: return "macr";
|
|
case 176: return "deg";
|
|
case 177: return "plusmn";
|
|
case 178: return "sup2";
|
|
case 179: return "sup3";
|
|
case 180: return "acute";
|
|
case 181: return "micro";
|
|
case 182: return "para";
|
|
case 183: return "middot";
|
|
case 184: return "cedil";
|
|
case 185: return "sup1";
|
|
case 186: return "ordm";
|
|
case 187: return "raquo";
|
|
case 188: return "frac14";
|
|
case 189: return "frac12";
|
|
case 190: return "frac34";
|
|
case 191: return "iquest";
|
|
case 192: return "Agrave";
|
|
case 193: return "Aacute";
|
|
case 194: return "Acirc";
|
|
case 195: return "Atilde";
|
|
case 196: return "Auml";
|
|
case 197: return "Aring";
|
|
case 198: return "AElig";
|
|
case 199: return "Ccedil";
|
|
case 200: return "Egrave";
|
|
case 201: return "Eacute";
|
|
case 202: return "Ecirc";
|
|
case 203: return "Euml";
|
|
case 204: return "Igrave";
|
|
case 205: return "Iacute";
|
|
case 206: return "Icirc";
|
|
case 207: return "Iuml";
|
|
case 208: return "ETH";
|
|
case 209: return "Ntilde";
|
|
case 210: return "Ograve";
|
|
case 211: return "Oacute";
|
|
case 212: return "Ocirc";
|
|
case 213: return "Otilde";
|
|
case 214: return "Ouml";
|
|
case 215: return "times";
|
|
case 216: return "Oslash";
|
|
case 217: return "Ugrave";
|
|
case 218: return "Uacute";
|
|
case 219: return "Ucirc";
|
|
case 220: return "Uuml";
|
|
case 221: return "Yacute";
|
|
case 222: return "THORN";
|
|
case 223: return "szlig";
|
|
case 224: return "agrave";
|
|
case 225: return "aacute";
|
|
case 226: return "acirc";
|
|
case 227: return "atilde";
|
|
case 228: return "auml";
|
|
case 229: return "aring";
|
|
case 230: return "aelig";
|
|
case 231: return "ccedil";
|
|
case 232: return "egrave";
|
|
case 233: return "eacute";
|
|
case 234: return "ecirc";
|
|
case 235: return "euml";
|
|
case 236: return "igrave";
|
|
case 237: return "iacute";
|
|
case 238: return "icirc";
|
|
case 239: return "iuml";
|
|
case 240: return "eth";
|
|
case 241: return "ntilde";
|
|
case 242: return "ograve";
|
|
case 243: return "oacute";
|
|
case 244: return "ocirc";
|
|
case 245: return "otilde";
|
|
case 246: return "ouml";
|
|
case 247: return "divide";
|
|
case 248: return "oslash";
|
|
case 249: return "ugrave";
|
|
case 250: return "uacute";
|
|
case 251: return "ucirc";
|
|
case 252: return "uuml";
|
|
case 253: return "yacute";
|
|
case 254: return "thorn";
|
|
case 255: return "yuml";
|
|
default: return null;
|
|
}
|
|
}
|
|
|
|
}
|