
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
1556 lines
46 KiB
Java
1556 lines
46 KiB
Java
/* DomDocument.java --
|
|
Copyright (C) 1999,2000,2001,2004 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.dom;
|
|
|
|
import java.util.Iterator;
|
|
import javax.xml.XMLConstants;
|
|
|
|
import org.w3c.dom.Attr;
|
|
import org.w3c.dom.CDATASection;
|
|
import org.w3c.dom.Comment;
|
|
import org.w3c.dom.Document;
|
|
import org.w3c.dom.DocumentFragment;
|
|
import org.w3c.dom.DocumentType;
|
|
import org.w3c.dom.DOMConfiguration;
|
|
import org.w3c.dom.DOMImplementation;
|
|
import org.w3c.dom.DOMException;
|
|
import org.w3c.dom.Element;
|
|
import org.w3c.dom.Entity;
|
|
import org.w3c.dom.EntityReference;
|
|
import org.w3c.dom.NamedNodeMap;
|
|
import org.w3c.dom.Node;
|
|
import org.w3c.dom.Notation;
|
|
import org.w3c.dom.ProcessingInstruction;
|
|
import org.w3c.dom.Text;
|
|
import org.w3c.dom.UserDataHandler;
|
|
import org.w3c.dom.traversal.DocumentTraversal;
|
|
import org.w3c.dom.traversal.NodeFilter;
|
|
import org.w3c.dom.traversal.NodeIterator;
|
|
import org.w3c.dom.traversal.TreeWalker;
|
|
import org.w3c.dom.xpath.XPathEvaluator;
|
|
import org.w3c.dom.xpath.XPathException;
|
|
import org.w3c.dom.xpath.XPathExpression;
|
|
import org.w3c.dom.xpath.XPathNSResolver;
|
|
|
|
/**
|
|
* <p> "Document" and "DocumentTraversal" implementation.
|
|
*
|
|
* <p> Note that when this checks names for legality, it uses an
|
|
* approximation of the XML rules, not the real ones. Specifically,
|
|
* it uses Unicode rules, with sufficient tweaks to pass a majority
|
|
* of basic XML conformance tests. (The huge XML character tables are
|
|
* hairy to implement.)
|
|
*
|
|
* @author David Brownell
|
|
* @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
|
|
*/
|
|
public class DomDocument
|
|
extends DomNode
|
|
implements Document, DocumentTraversal, XPathEvaluator
|
|
{
|
|
|
|
private final DOMImplementation implementation;
|
|
private boolean checkingCharacters = true;
|
|
boolean checkingWellformedness = true;
|
|
private boolean defaultAttributes = true;
|
|
|
|
boolean building; // if true, skip mutation events in the tree
|
|
|
|
DomDocumentConfiguration config;
|
|
|
|
String inputEncoding;
|
|
String encoding;
|
|
String version = "1.0";
|
|
boolean standalone;
|
|
String systemId;
|
|
|
|
/**
|
|
* Constructs a Document node, associating it with an instance
|
|
* of the DomImpl class.
|
|
*
|
|
* <p> Note that this constructor disables character checking.
|
|
* It is normally used when connecting a DOM to an XML parser,
|
|
* and duplicating such checks is undesirable. When used for
|
|
* purposes other than connecting to a parser, you should
|
|
* re-enable that checking.
|
|
*
|
|
* @see #setCheckingCharacters
|
|
*/
|
|
public DomDocument()
|
|
{
|
|
this(new DomImpl());
|
|
}
|
|
|
|
/**
|
|
* Constructs a Document node, associating it with the specified
|
|
* implementation. This should only be used in conjunction with
|
|
* a specialized implementation; it will normally be called by
|
|
* that implementation.
|
|
*
|
|
* @see DomImpl
|
|
* @see #setCheckingCharacters
|
|
*/
|
|
protected DomDocument(DOMImplementation impl)
|
|
{
|
|
super(DOCUMENT_NODE, null);
|
|
implementation = impl;
|
|
}
|
|
|
|
/**
|
|
* Sets the <code>building</code> flag.
|
|
* Mutation events in the document are not reported.
|
|
*/
|
|
public void setBuilding(boolean flag)
|
|
{
|
|
building = flag;
|
|
}
|
|
|
|
/**
|
|
* Sets whether to check for document well-formedness.
|
|
* If true, an exception will be raised if a second doctype or root
|
|
* element node is added to the document.
|
|
*/
|
|
public void setCheckWellformedness(boolean flag)
|
|
{
|
|
checkingWellformedness = flag;
|
|
}
|
|
|
|
/**
|
|
* Sets whether to check for document characters.
|
|
*/
|
|
public void setCheckingCharacters(boolean flag)
|
|
{
|
|
checkingCharacters = flag;
|
|
}
|
|
|
|
/**
|
|
* Sets whether to default attributes for new elements.
|
|
*/
|
|
public void setDefaultAttributes(boolean flag)
|
|
{
|
|
defaultAttributes = flag;
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Returns the constant "#document".
|
|
*/
|
|
final public String getNodeName()
|
|
{
|
|
return "#document";
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Returns the document's root element, or null.
|
|
*/
|
|
final public Element getDocumentElement()
|
|
{
|
|
for (DomNode ctx = first; ctx != null; ctx = ctx.next)
|
|
{
|
|
if (ctx.nodeType == ELEMENT_NODE)
|
|
{
|
|
return (Element) ctx;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Returns the document's DocumentType, or null.
|
|
*/
|
|
final public DocumentType getDoctype()
|
|
{
|
|
for (DomNode ctx = first; ctx != null; ctx = ctx.next)
|
|
{
|
|
if (ctx.nodeType == DOCUMENT_TYPE_NODE)
|
|
{
|
|
return (DocumentType) ctx;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Returns the document's DOMImplementation.
|
|
*/
|
|
final public DOMImplementation getImplementation()
|
|
{
|
|
return implementation;
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1 (relocated in DOM L2)</b>
|
|
* Returns the element with the specified "ID" attribute, or null.
|
|
*
|
|
* <p>Returns null unless {@link Consumer} was used to populate internal
|
|
* DTD declaration information, using package-private APIs. If that
|
|
* internal DTD information is available, the document may be searched for
|
|
* the element with that ID.
|
|
*/
|
|
public Element getElementById(String id)
|
|
{
|
|
if (id == null || id.length() == 0)
|
|
{
|
|
return null;
|
|
}
|
|
DomDoctype doctype = (DomDoctype) getDoctype();
|
|
if (doctype != null && !doctype.hasIds())
|
|
{
|
|
doctype = null;
|
|
}
|
|
|
|
// yes, this is linear in size of document.
|
|
// it'd be easy enough to maintain a hashtable.
|
|
Node current = getDocumentElement();
|
|
Node temp;
|
|
|
|
if (current == null)
|
|
{
|
|
return null;
|
|
}
|
|
while (current != this)
|
|
{
|
|
// done?
|
|
if (current.getNodeType() == ELEMENT_NODE)
|
|
{
|
|
DomElement element = (DomElement) current;
|
|
if (element.userIdAttrs != null)
|
|
{
|
|
for (Iterator i = element.userIdAttrs.iterator();
|
|
i.hasNext(); )
|
|
{
|
|
Node idAttr = (Node) i.next();
|
|
if (id.equals(idAttr.getNodeValue()))
|
|
{
|
|
return element;
|
|
}
|
|
}
|
|
}
|
|
if (doctype != null)
|
|
{
|
|
DTDElementTypeInfo info =
|
|
doctype.getElementTypeInfo(current.getNodeName());
|
|
if (info != null &&
|
|
id.equals(element.getAttribute(info.idAttrName)))
|
|
{
|
|
return element;
|
|
}
|
|
}
|
|
// xml:id
|
|
String xmlId = element.getAttribute("xml:id");
|
|
if (xmlId == null)
|
|
{
|
|
xmlId = element.getAttributeNS(XMLConstants.XML_NS_URI,
|
|
"id");
|
|
}
|
|
if (id.equals(xmlId))
|
|
{
|
|
return element;
|
|
}
|
|
}
|
|
|
|
// descend?
|
|
if (current.hasChildNodes())
|
|
{
|
|
current = current.getFirstChild();
|
|
continue;
|
|
}
|
|
|
|
// lateral?
|
|
temp = current.getNextSibling();
|
|
if (temp != null)
|
|
{
|
|
current = temp;
|
|
continue;
|
|
}
|
|
|
|
// back up ...
|
|
do
|
|
{
|
|
temp = current.getParentNode();
|
|
if (temp == null)
|
|
{
|
|
return null;
|
|
}
|
|
current = temp;
|
|
temp = current.getNextSibling();
|
|
}
|
|
while (temp == null);
|
|
current = temp;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
private void checkNewChild(Node newChild)
|
|
{
|
|
if (newChild.getNodeType() == ELEMENT_NODE
|
|
&& getDocumentElement() != null)
|
|
{
|
|
throw new DomDOMException(DOMException.HIERARCHY_REQUEST_ERR,
|
|
"document element already present: " +
|
|
getDocumentElement(), newChild, 0);
|
|
}
|
|
if (newChild.getNodeType() == DOCUMENT_TYPE_NODE
|
|
&& getDoctype() != null)
|
|
{
|
|
throw new DomDOMException(DOMException.HIERARCHY_REQUEST_ERR,
|
|
"document type already present: " +
|
|
getDoctype(), newChild, 0);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Appends the specified node to this node's list of children,
|
|
* enforcing the constraints that there be only one root element
|
|
* and one document type child.
|
|
*/
|
|
public Node appendChild(Node newChild)
|
|
{
|
|
if (checkingWellformedness)
|
|
{
|
|
checkNewChild(newChild);
|
|
}
|
|
return super.appendChild(newChild);
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Inserts the specified node in this node's list of children,
|
|
* enforcing the constraints that there be only one root element
|
|
* and one document type child.
|
|
*/
|
|
public Node insertBefore(Node newChild, Node refChild)
|
|
{
|
|
if (checkingWellformedness)
|
|
{
|
|
checkNewChild(newChild);
|
|
}
|
|
return super.insertBefore(newChild, refChild);
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Replaces the specified node in this node's list of children,
|
|
* enforcing the constraints that there be only one root element
|
|
* and one document type child.
|
|
*/
|
|
public Node replaceChild(Node newChild, Node refChild)
|
|
{
|
|
if (checkingWellformedness &&
|
|
((newChild.getNodeType() == ELEMENT_NODE &&
|
|
refChild.getNodeType() != ELEMENT_NODE) ||
|
|
(newChild.getNodeType() == DOCUMENT_TYPE_NODE &&
|
|
refChild.getNodeType() != DOCUMENT_TYPE_NODE)))
|
|
{
|
|
checkNewChild(newChild);
|
|
}
|
|
return super.replaceChild(newChild, refChild);
|
|
}
|
|
|
|
// NOTE: DOM can't really tell when the name of an entity,
|
|
// notation, or PI must follow the namespace rules (excluding
|
|
// colons) instead of the XML rules (which allow them without
|
|
// much restriction). That's an API issue. verifyXmlName
|
|
// aims to enforce the XML rules, not the namespace rules.
|
|
|
|
/**
|
|
* Throws a DOM exception if the specified name is not a legal XML 1.0
|
|
* Name.
|
|
* @deprecated This method is deprecated and may be removed in future
|
|
* versions of GNU JAXP
|
|
*/
|
|
public static void verifyXmlName(String name)
|
|
{
|
|
// XXX why is this public?
|
|
checkName(name, false);
|
|
}
|
|
|
|
static void checkName(String name, boolean xml11)
|
|
{
|
|
if (name == null)
|
|
{
|
|
throw new DomDOMException(DOMException.NAMESPACE_ERR, name, null, 0);
|
|
}
|
|
int len = name.length();
|
|
if (len == 0)
|
|
{
|
|
throw new DomDOMException(DOMException.NAMESPACE_ERR, name, null, 0);
|
|
}
|
|
|
|
// dog: rewritten to use the rules for XML 1.0 and 1.1
|
|
|
|
// Name start character
|
|
char c = name.charAt(0);
|
|
if (xml11)
|
|
{
|
|
// XML 1.1
|
|
if ((c < 0x0041 || c > 0x005a) &&
|
|
(c < 0x0061 || c > 0x007a) &&
|
|
c != ':' && c != '_' &&
|
|
(c < 0x00c0 || c > 0x00d6) &&
|
|
(c < 0x00d8 || c > 0x00f6) &&
|
|
(c < 0x00f8 || c > 0x02ff) &&
|
|
(c < 0x0370 || c > 0x037d) &&
|
|
(c < 0x037f || c > 0x1fff) &&
|
|
(c < 0x200c || c > 0x200d) &&
|
|
(c < 0x2070 || c > 0x218f) &&
|
|
(c < 0x2c00 || c > 0x2fef) &&
|
|
(c < 0x3001 || c > 0xd7ff) &&
|
|
(c < 0xf900 || c > 0xfdcf) &&
|
|
(c < 0xfdf0 || c > 0xfffd) &&
|
|
(c < 0x10000 || c > 0xeffff))
|
|
{
|
|
throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR,
|
|
name, null, c);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// XML 1.0
|
|
int type = Character.getType(c);
|
|
switch (type)
|
|
{
|
|
case Character.LOWERCASE_LETTER: // Ll
|
|
case Character.UPPERCASE_LETTER: // Lu
|
|
case Character.OTHER_LETTER: // Lo
|
|
case Character.TITLECASE_LETTER: // Lt
|
|
case Character.LETTER_NUMBER: // Nl
|
|
if ((c > 0xf900 && c < 0xfffe) ||
|
|
(c >= 0x20dd && c <= 0x20e0))
|
|
{
|
|
// Compatibility area and Unicode 2.0 exclusions
|
|
throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR,
|
|
name, null, c);
|
|
}
|
|
break;
|
|
default:
|
|
if (c != ':' && c != '_' && (c < 0x02bb || c > 0x02c1) &&
|
|
c != 0x0559 && c != 0x06e5 && c != 0x06e6)
|
|
{
|
|
throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR,
|
|
name, null, c);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Subsequent characters
|
|
for (int i = 1; i < len; i++)
|
|
{
|
|
c = name.charAt(i);
|
|
if (xml11)
|
|
{
|
|
// XML 1.1
|
|
if ((c < 0x0041 || c > 0x005a) &&
|
|
(c < 0x0061 || c > 0x007a) &&
|
|
(c < 0x0030 || c > 0x0039) &&
|
|
c != ':' && c != '_' && c != '-' && c != '.' &&
|
|
(c < 0x00c0 || c > 0x00d6) &&
|
|
(c < 0x00d8 || c > 0x00f6) &&
|
|
(c < 0x00f8 || c > 0x02ff) &&
|
|
(c < 0x0370 || c > 0x037d) &&
|
|
(c < 0x037f || c > 0x1fff) &&
|
|
(c < 0x200c || c > 0x200d) &&
|
|
(c < 0x2070 || c > 0x218f) &&
|
|
(c < 0x2c00 || c > 0x2fef) &&
|
|
(c < 0x3001 || c > 0xd7ff) &&
|
|
(c < 0xf900 || c > 0xfdcf) &&
|
|
(c < 0xfdf0 || c > 0xfffd) &&
|
|
(c < 0x10000 || c > 0xeffff) &&
|
|
c != 0x00b7 &&
|
|
(c < 0x0300 || c > 0x036f) &&
|
|
(c < 0x203f || c > 0x2040))
|
|
{
|
|
throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR, name,
|
|
null, c);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// XML 1.0
|
|
int type = Character.getType(c);
|
|
switch (type)
|
|
{
|
|
case Character.LOWERCASE_LETTER: // Ll
|
|
case Character.UPPERCASE_LETTER: // Lu
|
|
case Character.DECIMAL_DIGIT_NUMBER: // Nd
|
|
case Character.OTHER_LETTER: // Lo
|
|
case Character.TITLECASE_LETTER: // Lt
|
|
case Character.LETTER_NUMBER: // Nl
|
|
case Character.COMBINING_SPACING_MARK: // Mc
|
|
case Character.ENCLOSING_MARK: // Me
|
|
case Character.NON_SPACING_MARK: // Mn
|
|
case Character.MODIFIER_LETTER: // Lm
|
|
if ((c > 0xf900 && c < 0xfffe) ||
|
|
(c >= 0x20dd && c <= 0x20e0))
|
|
{
|
|
// Compatibility area and Unicode 2.0 exclusions
|
|
throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR,
|
|
name, null, c);
|
|
}
|
|
break;
|
|
default:
|
|
if (c != '-' && c != '.' && c != ':' && c != '_' &&
|
|
c != 0x0387 && (c < 0x02bb || c > 0x02c1) &&
|
|
c != 0x0559 && c != 0x06e5 && c != 0x06e6 && c != 0x00b7)
|
|
{
|
|
throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR,
|
|
name, null, c);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// FIXME characters with a font or compatibility decomposition (i.e.
|
|
// those with a "compatibility formatting tag" in field 5 of the
|
|
// database -- marked by field 5 beginning with a "<") are not allowed.
|
|
}
|
|
|
|
// package private
|
|
static void checkNCName(String name, boolean xml11)
|
|
{
|
|
checkName(name, xml11);
|
|
int len = name.length();
|
|
int index = name.indexOf(':');
|
|
if (index != -1)
|
|
{
|
|
if (index == 0 || index == (len - 1) || name.lastIndexOf(':') != index)
|
|
{
|
|
throw new DomDOMException(DOMException.NAMESPACE_ERR, name, null, 0);
|
|
}
|
|
}
|
|
}
|
|
|
|
// package private
|
|
static void checkChar(String value, boolean xml11)
|
|
{
|
|
char[] chars = value.toCharArray();
|
|
checkChar(chars, 0, chars.length, xml11);
|
|
}
|
|
|
|
static void checkChar(char[] buf, int off, int len, boolean xml11)
|
|
{
|
|
for (int i = 0; i < len; i++)
|
|
{
|
|
char c = buf[i];
|
|
|
|
// assume surrogate pairing checks out OK, for simplicity
|
|
if ((c >= 0x0020 && c <= 0xd7ff) ||
|
|
(c == 0x000a || c == 0x000d || c == 0x0009) ||
|
|
(c >= 0xe000 && c <= 0xfffd) ||
|
|
(c >= 0x10000 && c <= 0x10ffff))
|
|
{
|
|
continue;
|
|
}
|
|
if (xml11)
|
|
{
|
|
if ((c >= 0x0001 && c <= 0x001f) ||
|
|
(c >= 0x007f && c <= 0x0084) ||
|
|
(c >= 0x0086 && c <= 0x009f))
|
|
{
|
|
continue;
|
|
}
|
|
}
|
|
throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR,
|
|
new String(buf, off, len), null, c);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Returns a newly created element with the specified name.
|
|
* The node name of the created element will be equal to {@code name}.
|
|
* The namespace, prefix and local name will all be {@code null}.
|
|
*/
|
|
public Element createElement(String name)
|
|
{
|
|
Element element;
|
|
|
|
if (checkingCharacters)
|
|
{
|
|
checkName(name, "1.1".equals(version));
|
|
}
|
|
if (name.startsWith("xml:"))
|
|
{
|
|
element = createElementNS(null, name);
|
|
}
|
|
else
|
|
{
|
|
DomElement domElement = new DomElement(this, null, name, null, null);
|
|
element = domElement;
|
|
}
|
|
if (defaultAttributes)
|
|
setDefaultAttributes(element, name);
|
|
return element;
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L2</b>
|
|
* Returns a newly created element with the specified name
|
|
* and namespace information.
|
|
*/
|
|
public Element createElementNS(String namespaceURI, String name)
|
|
{
|
|
if (checkingCharacters)
|
|
{
|
|
checkNCName(name, "1.1".equals(version));
|
|
}
|
|
|
|
if ("".equals(namespaceURI))
|
|
{
|
|
namespaceURI = null;
|
|
}
|
|
if (name.startsWith("xml:"))
|
|
{
|
|
if (namespaceURI != null
|
|
&& !XMLConstants.XML_NS_URI.equals(namespaceURI))
|
|
{
|
|
throw new DomDOMException(DOMException.NAMESPACE_ERR,
|
|
"xml namespace is always " +
|
|
XMLConstants.XML_NS_URI, this, 0);
|
|
}
|
|
namespaceURI = XMLConstants.XML_NS_URI;
|
|
}
|
|
else if (XMLConstants.XMLNS_ATTRIBUTE.equals(name) ||
|
|
name.startsWith("xmlns:"))
|
|
{
|
|
throw new DomDOMException(DOMException.NAMESPACE_ERR,
|
|
"xmlns is reserved", this, 0);
|
|
}
|
|
else if (namespaceURI == null && name.indexOf(':') != -1)
|
|
{
|
|
throw new DomDOMException(DOMException.NAMESPACE_ERR,
|
|
"prefixed name '" + name +
|
|
"' needs a URI", this, 0);
|
|
}
|
|
|
|
Element element = new DomElement(this, namespaceURI, name);
|
|
if (defaultAttributes)
|
|
setDefaultAttributes(element, name);
|
|
return element;
|
|
}
|
|
|
|
private void setDefaultAttributes(Element element, String name)
|
|
{
|
|
DomDoctype doctype = (DomDoctype) getDoctype();
|
|
if (doctype == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
// default any attributes that need it
|
|
DTDElementTypeInfo info = doctype.getElementTypeInfo(name);
|
|
if (info != null)
|
|
{
|
|
for (Iterator i = info.attributes(); i != null && i.hasNext(); )
|
|
{
|
|
DTDAttributeTypeInfo attr = (DTDAttributeTypeInfo) i.next();
|
|
String value = attr.value;
|
|
if ("#IMPLIED".equals(attr.mode) && value == null)
|
|
continue;
|
|
DomAttr node = (DomAttr) createAttribute(attr.name);
|
|
|
|
if (value == null)
|
|
{
|
|
value = "";
|
|
}
|
|
node.setValue(value);
|
|
node.setSpecified(false);
|
|
element.setAttributeNode(node);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Returns a newly created document fragment.
|
|
*/
|
|
public DocumentFragment createDocumentFragment()
|
|
{
|
|
return new DomDocumentFragment(this);
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Returns a newly created text node with the specified value.
|
|
*/
|
|
public Text createTextNode(String value)
|
|
{
|
|
if (checkingCharacters)
|
|
{
|
|
checkChar(value, "1.1".equals(version));
|
|
}
|
|
return new DomText(this, value);
|
|
}
|
|
|
|
/**
|
|
* Returns a newly created text node with the specified value.
|
|
*/
|
|
public Text createTextNode(char[] buf, int off, int len)
|
|
{
|
|
if (checkingCharacters)
|
|
{
|
|
checkChar(buf, off, len, "1.1".equals(version));
|
|
}
|
|
return new DomText(this, buf, off, len);
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Returns a newly created comment node with the specified value.
|
|
*/
|
|
public Comment createComment(String value)
|
|
{
|
|
if (checkingCharacters)
|
|
{
|
|
checkChar(value, "1.1".equals(version));
|
|
}
|
|
return new DomComment(this, value);
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Returns a newly created CDATA section node with the specified value.
|
|
*/
|
|
public CDATASection createCDATASection(String value)
|
|
{
|
|
if (checkingCharacters)
|
|
{
|
|
checkChar(value, "1.1".equals(version));
|
|
}
|
|
return new DomCDATASection(this, value);
|
|
}
|
|
|
|
/**
|
|
* Returns a newly created CDATA section node with the specified value.
|
|
*/
|
|
public CDATASection createCDATASection(char[] buf, int off, int len)
|
|
{
|
|
if (checkingCharacters)
|
|
{
|
|
checkChar(buf, off, len, "1.1".equals(version));
|
|
}
|
|
return new DomCDATASection(this, buf, off, len);
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Returns a newly created processing instruction.
|
|
*/
|
|
public ProcessingInstruction createProcessingInstruction(String target,
|
|
String data)
|
|
{
|
|
if (checkingCharacters)
|
|
{
|
|
boolean xml11 = "1.1".equals(version);
|
|
checkName(target, xml11);
|
|
if ("xml".equalsIgnoreCase(target))
|
|
{
|
|
throw new DomDOMException(DOMException.SYNTAX_ERR,
|
|
"illegal PI target name",
|
|
this, 0);
|
|
}
|
|
checkChar(data, xml11);
|
|
}
|
|
return new DomProcessingInstruction(this, target, data);
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Returns a newly created attribute with the specified name.
|
|
*/
|
|
public Attr createAttribute(String name)
|
|
{
|
|
if (checkingCharacters)
|
|
{
|
|
checkName(name, "1.1".equals(version));
|
|
}
|
|
if (name.startsWith("xml:"))
|
|
{
|
|
return createAttributeNS(XMLConstants.XML_NS_URI, name);
|
|
}
|
|
else if (XMLConstants.XMLNS_ATTRIBUTE.equals(name) ||
|
|
name.startsWith("xmlns:"))
|
|
{
|
|
return createAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, name);
|
|
}
|
|
else
|
|
{
|
|
DomAttr ret = new DomAttr(this, null, name, null, null);
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L2</b>
|
|
* Returns a newly created attribute with the specified name
|
|
* and namespace information.
|
|
*/
|
|
public Attr createAttributeNS(String namespaceURI, String name)
|
|
{
|
|
if (checkingCharacters)
|
|
{
|
|
checkNCName(name, "1.1".equals(version));
|
|
}
|
|
|
|
if ("".equals(namespaceURI))
|
|
{
|
|
namespaceURI = null;
|
|
}
|
|
if (name.startsWith ("xml:"))
|
|
{
|
|
if (namespaceURI == null)
|
|
{
|
|
namespaceURI = XMLConstants.XML_NS_URI;
|
|
}
|
|
else if (!XMLConstants.XML_NS_URI.equals(namespaceURI))
|
|
{
|
|
throw new DomDOMException(DOMException.NAMESPACE_ERR,
|
|
"xml namespace is always " +
|
|
XMLConstants.XML_NS_URI,
|
|
this, 0);
|
|
}
|
|
}
|
|
else if (XMLConstants.XMLNS_ATTRIBUTE.equals(name) ||
|
|
name.startsWith("xmlns:"))
|
|
{
|
|
if (namespaceURI == null)
|
|
{
|
|
namespaceURI = XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
|
|
}
|
|
else if (!XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI))
|
|
{
|
|
throw new DomDOMException(DOMException.NAMESPACE_ERR,
|
|
"xmlns namespace must be " +
|
|
XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
|
|
this, 0);
|
|
}
|
|
}
|
|
else if (namespaceURI == null && name.indexOf(':') != -1)
|
|
{
|
|
throw new DomDOMException(DOMException.NAMESPACE_ERR,
|
|
"prefixed name needs a URI: " + name, this, 0);
|
|
}
|
|
return new DomAttr(this, namespaceURI, name);
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L1</b>
|
|
* Returns a newly created reference to the specified entity.
|
|
* The caller should populate this with the appropriate children
|
|
* and then mark it as readonly.
|
|
*
|
|
* @see DomNode#makeReadonly
|
|
*/
|
|
public EntityReference createEntityReference(String name)
|
|
{
|
|
DomEntityReference ret = new DomEntityReference(this, name);
|
|
DocumentType doctype = getDoctype();
|
|
if (doctype != null)
|
|
{
|
|
DomEntity ent = (DomEntity) doctype.getEntities().getNamedItem(name);
|
|
if (ent != null)
|
|
{
|
|
for (DomNode ctx = ent.first; ctx != null; ctx = ctx.next)
|
|
{
|
|
ret.appendChild(ctx.cloneNode(true));
|
|
}
|
|
}
|
|
}
|
|
ret.makeReadonly();
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L2</b>
|
|
* Makes a copy of the specified node, with all nodes "owned" by
|
|
* this document and with children optionally copied. This type
|
|
* of standard utility has become, well, a standard utility.
|
|
*
|
|
* <p> Note that EntityReference nodes created through this method (either
|
|
* directly, or recursively) never have children, and that there is no
|
|
* portable way to associate them with such children.
|
|
*
|
|
* <p> Note also that there is no requirement that the specified node
|
|
* be associated with a different document. This differs from the
|
|
* <em>cloneNode</em> operation in that the node itself is not given
|
|
* an opportunity to participate, so that any information managed
|
|
* by node subclasses will be lost.
|
|
*/
|
|
public Node importNode(Node src, boolean deep)
|
|
{
|
|
Node dst = null;
|
|
switch (src.getNodeType())
|
|
{
|
|
case TEXT_NODE:
|
|
dst = createTextNode(src.getNodeValue());
|
|
break;
|
|
case CDATA_SECTION_NODE:
|
|
dst = createCDATASection(src.getNodeValue());
|
|
break;
|
|
case COMMENT_NODE:
|
|
dst = createComment(src.getNodeValue());
|
|
break;
|
|
case PROCESSING_INSTRUCTION_NODE:
|
|
dst = createProcessingInstruction(src.getNodeName(),
|
|
src.getNodeValue());
|
|
break;
|
|
case NOTATION_NODE:
|
|
// NOTE: There's no standard way to create
|
|
// these, or add them to a doctype. Useless.
|
|
Notation notation = (Notation) src;
|
|
dst = new DomNotation(this, notation.getNodeName(),
|
|
notation.getPublicId(),
|
|
notation.getSystemId());
|
|
break;
|
|
case ENTITY_NODE:
|
|
// NOTE: There's no standard way to create
|
|
// these, or add them to a doctype. Useless.
|
|
Entity entity = (Entity) src;
|
|
dst = new DomEntity(this, entity.getNodeName(),
|
|
entity.getPublicId(),
|
|
entity.getSystemId(),
|
|
entity.getNotationName());
|
|
if (deep)
|
|
{
|
|
for (Node ctx = src.getFirstChild(); ctx != null;
|
|
ctx = ctx.getNextSibling())
|
|
{
|
|
dst.appendChild(importNode(ctx, deep));
|
|
}
|
|
}
|
|
break;
|
|
case ENTITY_REFERENCE_NODE:
|
|
dst = createEntityReference(src.getNodeName());
|
|
break;
|
|
case DOCUMENT_FRAGMENT_NODE:
|
|
dst = new DomDocumentFragment(this);
|
|
if (deep)
|
|
{
|
|
for (Node ctx = src.getFirstChild(); ctx != null;
|
|
ctx = ctx.getNextSibling())
|
|
{
|
|
dst.appendChild(importNode(ctx, deep));
|
|
}
|
|
}
|
|
break;
|
|
case ATTRIBUTE_NODE:
|
|
String attr_nsuri = src.getNamespaceURI();
|
|
if (attr_nsuri != null)
|
|
{
|
|
dst = createAttributeNS(attr_nsuri, src.getNodeName());
|
|
}
|
|
else
|
|
{
|
|
dst = createAttribute(src.getNodeName());
|
|
}
|
|
// this is _always_ done regardless of "deep" setting
|
|
for (Node ctx = src.getFirstChild(); ctx != null;
|
|
ctx = ctx.getNextSibling())
|
|
{
|
|
dst.appendChild(importNode(ctx, false));
|
|
}
|
|
break;
|
|
case ELEMENT_NODE:
|
|
String elem_nsuri = src.getNamespaceURI();
|
|
if (elem_nsuri != null)
|
|
{
|
|
dst = createElementNS(elem_nsuri, src.getNodeName());
|
|
}
|
|
else
|
|
{
|
|
dst = createElement(src.getNodeName());
|
|
}
|
|
NamedNodeMap srcAttrs = src.getAttributes();
|
|
NamedNodeMap dstAttrs = dst.getAttributes();
|
|
int len = srcAttrs.getLength();
|
|
for (int i = 0; i < len; i++)
|
|
{
|
|
Attr a = (Attr) srcAttrs.item(i);
|
|
Attr dflt;
|
|
|
|
// maybe update defaulted attributes
|
|
dflt = (Attr) dstAttrs.getNamedItem(a.getNodeName());
|
|
if (dflt != null)
|
|
{
|
|
String newval = a.getNodeValue();
|
|
if (!dflt.getNodeValue().equals(newval)
|
|
|| a.getSpecified () == true)
|
|
{
|
|
dflt.setNodeValue (newval);
|
|
}
|
|
continue;
|
|
}
|
|
|
|
dstAttrs.setNamedItem((Attr) importNode(a, false));
|
|
}
|
|
if (deep)
|
|
{
|
|
for (Node ctx = src.getFirstChild(); ctx != null;
|
|
ctx = ctx.getNextSibling())
|
|
{
|
|
dst.appendChild(importNode(ctx, true));
|
|
}
|
|
}
|
|
break;
|
|
// can't import document or doctype nodes
|
|
case DOCUMENT_NODE:
|
|
case DOCUMENT_TYPE_NODE:
|
|
// FALLTHROUGH
|
|
// can't import unrecognized or nonstandard nodes
|
|
default:
|
|
throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR, null, src, 0);
|
|
}
|
|
|
|
// FIXME cleanup a bit -- for deep copies, copy those
|
|
// children in one place, here (code sharing is healthy)
|
|
|
|
if (src instanceof DomNode)
|
|
{
|
|
((DomNode) src).notifyUserDataHandlers(UserDataHandler.NODE_IMPORTED,
|
|
src, dst);
|
|
}
|
|
return dst;
|
|
}
|
|
|
|
/**
|
|
* <b>DOM L2 (Traversal)</b>
|
|
* Returns a newly created node iterator. Don't forget to detach
|
|
* this iterator when you're done using it!
|
|
*
|
|
* @see DomIterator
|
|
*/
|
|
public NodeIterator createNodeIterator(Node root,
|
|
int whatToShow,
|
|
NodeFilter filter,
|
|
boolean expandEntities)
|
|
{
|
|
return new DomNodeIterator(root, whatToShow, filter, expandEntities,
|
|
false);
|
|
}
|
|
|
|
public TreeWalker createTreeWalker(Node root,
|
|
int whatToShow,
|
|
NodeFilter filter,
|
|
boolean expandEntities)
|
|
{
|
|
return new DomNodeIterator(root, whatToShow, filter, expandEntities,
|
|
true);
|
|
}
|
|
|
|
// DOM Level 3 methods
|
|
|
|
/**
|
|
* DOM L3
|
|
*/
|
|
public String getInputEncoding()
|
|
{
|
|
return inputEncoding;
|
|
}
|
|
|
|
public void setInputEncoding(String inputEncoding)
|
|
{
|
|
this.inputEncoding = inputEncoding;
|
|
}
|
|
|
|
/**
|
|
* DOM L3
|
|
*/
|
|
public String getXmlEncoding()
|
|
{
|
|
return encoding;
|
|
}
|
|
|
|
public void setXmlEncoding(String encoding)
|
|
{
|
|
this.encoding = encoding;
|
|
}
|
|
|
|
public boolean getXmlStandalone()
|
|
{
|
|
return standalone;
|
|
}
|
|
|
|
public void setXmlStandalone(boolean xmlStandalone)
|
|
{
|
|
standalone = xmlStandalone;
|
|
}
|
|
|
|
public String getXmlVersion()
|
|
{
|
|
return version;
|
|
}
|
|
|
|
public void setXmlVersion(String xmlVersion)
|
|
{
|
|
if (xmlVersion == null)
|
|
{
|
|
xmlVersion = "1.0";
|
|
}
|
|
if ("1.0".equals(xmlVersion) ||
|
|
"1.1".equals(xmlVersion))
|
|
{
|
|
version = xmlVersion;
|
|
}
|
|
else
|
|
{
|
|
throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR);
|
|
}
|
|
}
|
|
|
|
public boolean getStrictErrorChecking()
|
|
{
|
|
return checkingCharacters;
|
|
}
|
|
|
|
public void setStrictErrorChecking(boolean strictErrorChecking)
|
|
{
|
|
checkingCharacters = strictErrorChecking;
|
|
}
|
|
|
|
public String lookupPrefix(String namespaceURI)
|
|
{
|
|
Node root = getDocumentElement();
|
|
return (root == null) ? null : root.lookupPrefix(namespaceURI);
|
|
}
|
|
|
|
public boolean isDefaultNamespace(String namespaceURI)
|
|
{
|
|
Node root = getDocumentElement();
|
|
return (root == null) ? false : root.isDefaultNamespace(namespaceURI);
|
|
}
|
|
|
|
public String lookupNamespaceURI(String prefix)
|
|
{
|
|
Node root = getDocumentElement();
|
|
return (root == null) ? null : root.lookupNamespaceURI(prefix);
|
|
}
|
|
|
|
public String getBaseURI()
|
|
{
|
|
return getDocumentURI();
|
|
/*
|
|
Node root = getDocumentElement();
|
|
if (root != null)
|
|
{
|
|
NamedNodeMap attrs = root.getAttributes();
|
|
Node xmlBase = attrs.getNamedItemNS(XMLConstants.XML_NS_URI, "base");
|
|
if (xmlBase != null)
|
|
{
|
|
return xmlBase.getNodeValue();
|
|
}
|
|
}
|
|
return systemId;
|
|
*/
|
|
}
|
|
|
|
public String getDocumentURI()
|
|
{
|
|
return systemId;
|
|
}
|
|
|
|
public void setDocumentURI(String documentURI)
|
|
{
|
|
systemId = documentURI;
|
|
}
|
|
|
|
public Node adoptNode(Node source)
|
|
{
|
|
int sourceNodeType = source.getNodeType();
|
|
switch (sourceNodeType)
|
|
{
|
|
case DOCUMENT_NODE:
|
|
case DOCUMENT_TYPE_NODE:
|
|
throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR);
|
|
case ENTITY_NODE:
|
|
case NOTATION_NODE:
|
|
throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
|
|
}
|
|
if (source instanceof DomNode)
|
|
{
|
|
// GNU native
|
|
DomNode src = (DomNode) source;
|
|
DomNode dst = src;
|
|
if (dst.parent != null)
|
|
{
|
|
dst = (DomNode) dst.cloneNode(true);
|
|
}
|
|
dst.setOwner(this);
|
|
src.notifyUserDataHandlers(UserDataHandler.NODE_ADOPTED, src, dst);
|
|
return dst;
|
|
}
|
|
else
|
|
{
|
|
// Some other implementation
|
|
Node dst = null;
|
|
switch (sourceNodeType)
|
|
{
|
|
case Node.ATTRIBUTE_NODE:
|
|
{
|
|
Attr src = (Attr) source;
|
|
String nodeName = src.getNodeName();
|
|
String localName = src.getLocalName();
|
|
String namespaceUri = src.getNamespaceURI();
|
|
dst = (localName == null) ?
|
|
createAttribute(nodeName) :
|
|
createAttributeNS(namespaceUri, nodeName);
|
|
adoptChildren(src, dst);
|
|
break;
|
|
}
|
|
case Node.CDATA_SECTION_NODE:
|
|
{
|
|
CDATASection src = (CDATASection) source;
|
|
dst = createCDATASection(src.getData());
|
|
break;
|
|
}
|
|
case Node.COMMENT_NODE:
|
|
{
|
|
Comment src = (Comment) source;
|
|
dst = createComment(src.getData());
|
|
break;
|
|
}
|
|
case Node.DOCUMENT_FRAGMENT_NODE:
|
|
{
|
|
DocumentFragment src = (DocumentFragment) source;
|
|
dst = createDocumentFragment();
|
|
adoptChildren(src, dst);
|
|
break;
|
|
}
|
|
case Node.ELEMENT_NODE:
|
|
{
|
|
Element src = (Element) source;
|
|
String nodeName = src.getNodeName();
|
|
String localName = src.getLocalName();
|
|
String namespaceUri = src.getNamespaceURI();
|
|
dst = (localName == null) ?
|
|
createElement(nodeName) :
|
|
createElementNS(namespaceUri, nodeName);
|
|
adoptAttributes(src, dst);
|
|
adoptChildren(src, dst);
|
|
break;
|
|
}
|
|
case Node.ENTITY_REFERENCE_NODE:
|
|
{
|
|
EntityReference src = (EntityReference) source;
|
|
dst = createEntityReference(src.getNodeName());
|
|
adoptChildren(src, dst);
|
|
break;
|
|
}
|
|
case Node.PROCESSING_INSTRUCTION_NODE:
|
|
{
|
|
ProcessingInstruction src = (ProcessingInstruction) source;
|
|
dst = createProcessingInstruction(src.getTarget(),
|
|
src.getData());
|
|
break;
|
|
}
|
|
case Node.TEXT_NODE:
|
|
{
|
|
Text src = (Text) source;
|
|
dst = createTextNode(src.getData());
|
|
break;
|
|
}
|
|
}
|
|
return dst;
|
|
}
|
|
}
|
|
|
|
void adoptChildren(Node src, Node dst)
|
|
{
|
|
Node node = src.getFirstChild();
|
|
while (node != null)
|
|
{
|
|
Node next = node.getNextSibling();
|
|
dst.appendChild(adoptNode(node));
|
|
node = next;
|
|
}
|
|
}
|
|
|
|
void adoptAttributes(Node src, Node dst)
|
|
{
|
|
NamedNodeMap srcAttrs = src.getAttributes();
|
|
NamedNodeMap dstAttrs = dst.getAttributes();
|
|
int len = srcAttrs.getLength();
|
|
for (int i = 0; i < len; i++)
|
|
{
|
|
Node node = srcAttrs.item(i);
|
|
String localName = node.getLocalName();
|
|
if (localName == null)
|
|
{
|
|
dstAttrs.setNamedItem(adoptNode(node));
|
|
}
|
|
else
|
|
{
|
|
dstAttrs.setNamedItemNS(adoptNode(node));
|
|
}
|
|
}
|
|
}
|
|
|
|
public DOMConfiguration getDomConfig()
|
|
{
|
|
if (config == null)
|
|
{
|
|
config = new DomDocumentConfiguration();
|
|
}
|
|
return config;
|
|
}
|
|
|
|
public boolean isEqualNode(Node arg)
|
|
{
|
|
if (!super.isEqualNode(arg))
|
|
return false;
|
|
Document d = (Document) arg;
|
|
String dversion = d.getXmlVersion();
|
|
if (dversion == null || !dversion.equals(version))
|
|
return false;
|
|
boolean dstandalone = d.getXmlStandalone();
|
|
if (dstandalone != standalone)
|
|
return false;
|
|
String dencoding = d.getXmlEncoding();
|
|
if (dencoding == null || dencoding.equalsIgnoreCase("UTF-8"))
|
|
{
|
|
if (encoding != null && !encoding.equalsIgnoreCase("UTF-8"))
|
|
return false;
|
|
}
|
|
else
|
|
{
|
|
if (!dencoding.equals(encoding))
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
public void normalizeDocument()
|
|
{
|
|
boolean save = building;
|
|
building = true;
|
|
normalizeNode(this);
|
|
building = save;
|
|
}
|
|
|
|
void normalizeNode(DomNode node)
|
|
{
|
|
node.normalize();
|
|
if (config != null)
|
|
{
|
|
switch (node.nodeType)
|
|
{
|
|
case CDATA_SECTION_NODE:
|
|
if (!config.cdataSections)
|
|
{
|
|
// replace CDATA section with text node
|
|
Text text = createTextNode(node.getNodeValue());
|
|
node.parent.insertBefore(text, node);
|
|
node.parent.removeChild(node);
|
|
// merge adjacent text nodes
|
|
String data = text.getWholeText();
|
|
node = (DomNode) text.replaceWholeText(data);
|
|
}
|
|
else if (config.splitCdataSections)
|
|
{
|
|
String value = node.getNodeValue();
|
|
int i = value.indexOf("]]>");
|
|
while (i != -1)
|
|
{
|
|
Node node2 = createCDATASection(value.substring(0, i));
|
|
node.parent.insertBefore(node2, node);
|
|
value = value.substring(i + 3);
|
|
node.setNodeValue(value);
|
|
i = value.indexOf("]]>");
|
|
}
|
|
}
|
|
break;
|
|
case COMMENT_NODE:
|
|
if (!config.comments)
|
|
{
|
|
node.parent.removeChild(node);
|
|
}
|
|
break;
|
|
case TEXT_NODE:
|
|
if (!config.elementContentWhitespace &&
|
|
((Text) node).isElementContentWhitespace())
|
|
{
|
|
node.parent.removeChild(node);
|
|
}
|
|
break;
|
|
case ENTITY_REFERENCE_NODE:
|
|
if (!config.entities)
|
|
{
|
|
for (DomNode ctx = node.first; ctx != null; )
|
|
{
|
|
DomNode ctxNext = ctx.next;
|
|
node.parent.insertBefore(ctx, node);
|
|
ctx = ctxNext;
|
|
}
|
|
node.parent.removeChild(node);
|
|
}
|
|
break;
|
|
case ELEMENT_NODE:
|
|
if (!config.namespaceDeclarations)
|
|
{
|
|
DomNamedNodeMap attrs =
|
|
(DomNamedNodeMap) node.getAttributes();
|
|
boolean aro = attrs.readonly;
|
|
attrs.readonly = false; // Ensure we can delete if necessary
|
|
int len = attrs.getLength();
|
|
for (int i = 0; i < len; i++)
|
|
{
|
|
Node attr = attrs.item(i);
|
|
String namespace = attr.getNamespaceURI();
|
|
if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespace))
|
|
{
|
|
attrs.removeNamedItemNS(namespace,
|
|
attr.getLocalName());
|
|
i--;
|
|
len--;
|
|
}
|
|
}
|
|
attrs.readonly = aro;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
for (DomNode ctx = node.first; ctx != null; )
|
|
{
|
|
DomNode ctxNext = ctx.next;
|
|
normalizeNode(ctx);
|
|
ctx = ctxNext;
|
|
}
|
|
}
|
|
|
|
public Node renameNode(Node n, String namespaceURI, String qualifiedName)
|
|
throws DOMException
|
|
{
|
|
if (n instanceof DomNsNode)
|
|
{
|
|
DomNsNode src = (DomNsNode) n;
|
|
if (src == null)
|
|
{
|
|
throw new DomDOMException(DOMException.NOT_FOUND_ERR);
|
|
}
|
|
if (src.owner != this)
|
|
{
|
|
throw new DomDOMException(DOMException.WRONG_DOCUMENT_ERR,
|
|
null, src, 0);
|
|
}
|
|
boolean xml11 = "1.1".equals(version);
|
|
checkName(qualifiedName, xml11);
|
|
int ci = qualifiedName.indexOf(':');
|
|
if ("".equals(namespaceURI))
|
|
{
|
|
namespaceURI = null;
|
|
}
|
|
if (namespaceURI != null)
|
|
{
|
|
checkNCName(qualifiedName, xml11);
|
|
String prefix = (ci == -1) ? "" :
|
|
qualifiedName.substring(0, ci);
|
|
if (XMLConstants.XML_NS_PREFIX.equals(prefix) &&
|
|
!XMLConstants.XML_NS_URI.equals(namespaceURI))
|
|
{
|
|
throw new DomDOMException(DOMException.NAMESPACE_ERR,
|
|
"xml namespace must be " +
|
|
XMLConstants.XML_NS_URI, src, 0);
|
|
}
|
|
else if (src.nodeType == ATTRIBUTE_NODE &&
|
|
(XMLConstants.XMLNS_ATTRIBUTE.equals(prefix) ||
|
|
XMLConstants.XMLNS_ATTRIBUTE.equals(qualifiedName)) &&
|
|
!XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI))
|
|
{
|
|
throw new DomDOMException(DOMException.NAMESPACE_ERR,
|
|
"xmlns namespace must be " +
|
|
XMLConstants.XMLNS_ATTRIBUTE_NS_URI, src, 0);
|
|
}
|
|
if (XMLConstants.XML_NS_URI.equals(namespaceURI) &&
|
|
!XMLConstants.XML_NS_PREFIX.equals(prefix))
|
|
{
|
|
throw new DomDOMException(DOMException.NAMESPACE_ERR,
|
|
"xml namespace must be " +
|
|
XMLConstants.XML_NS_URI, src, 0);
|
|
}
|
|
else if (src.nodeType == ATTRIBUTE_NODE &&
|
|
XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI) &&
|
|
!(XMLConstants.XMLNS_ATTRIBUTE.equals(prefix) ||
|
|
XMLConstants.XMLNS_ATTRIBUTE.equals(qualifiedName)))
|
|
{
|
|
throw new DomDOMException(DOMException.NAMESPACE_ERR,
|
|
"xmlns namespace must be " +
|
|
XMLConstants.XMLNS_ATTRIBUTE_NS_URI, src, 0);
|
|
}
|
|
|
|
}
|
|
src.setNodeName(qualifiedName);
|
|
src.setNamespaceURI(namespaceURI);
|
|
src.notifyUserDataHandlers(UserDataHandler.NODE_RENAMED, src, src);
|
|
// TODO MutationNameEvents
|
|
// DOMElementNameChanged or DOMAttributeNameChanged
|
|
return src;
|
|
}
|
|
throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR, null, n, 0);
|
|
}
|
|
|
|
// -- XPathEvaluator --
|
|
|
|
public XPathExpression createExpression(String expression,
|
|
XPathNSResolver resolver)
|
|
throws XPathException, DOMException
|
|
{
|
|
return new DomXPathExpression(this, expression, resolver);
|
|
}
|
|
|
|
public XPathNSResolver createNSResolver(Node nodeResolver)
|
|
{
|
|
return new DomXPathNSResolver(nodeResolver);
|
|
}
|
|
|
|
public Object evaluate(String expression,
|
|
Node contextNode,
|
|
XPathNSResolver resolver,
|
|
short type,
|
|
Object result)
|
|
throws XPathException, DOMException
|
|
{
|
|
XPathExpression xpe =
|
|
new DomXPathExpression(this, expression, resolver);
|
|
return xpe.evaluate(contextNode, type, result);
|
|
}
|
|
|
|
}
|
|
|