cd6d4007aa
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
823 lines
27 KiB
Java
823 lines
27 KiB
Java
/* Properties.java -- a set of persistent properties
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 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 java.util;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.io.BufferedReader;
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.io.InputStreamReader;
|
|
import java.io.OutputStream;
|
|
import java.io.OutputStreamWriter;
|
|
import java.io.PrintStream;
|
|
import java.io.PrintWriter;
|
|
import java.io.Reader;
|
|
|
|
import javax.xml.stream.XMLInputFactory;
|
|
import javax.xml.stream.XMLStreamConstants;
|
|
import javax.xml.stream.XMLStreamException;
|
|
import javax.xml.stream.XMLStreamReader;
|
|
|
|
import org.w3c.dom.Document;
|
|
import org.w3c.dom.DocumentType;
|
|
import org.w3c.dom.DOMImplementation;
|
|
import org.w3c.dom.Element;
|
|
import org.w3c.dom.bootstrap.DOMImplementationRegistry;
|
|
import org.w3c.dom.ls.DOMImplementationLS;
|
|
import org.w3c.dom.ls.LSOutput;
|
|
import org.w3c.dom.ls.LSSerializer;
|
|
|
|
/**
|
|
* A set of persistent properties, which can be saved or loaded from a stream.
|
|
* A property list may also contain defaults, searched if the main list
|
|
* does not contain a property for a given key.
|
|
*
|
|
* An example of a properties file for the german language is given
|
|
* here. This extends the example given in ListResourceBundle.
|
|
* Create a file MyResource_de.properties with the following contents
|
|
* and put it in the CLASSPATH. (The character
|
|
* <code>\</code><code>u00e4</code> is the german umlaut)
|
|
*
|
|
*
|
|
<pre>s1=3
|
|
s2=MeineDisk
|
|
s3=3. M\<code></code>u00e4rz 96
|
|
s4=Die Diskette ''{1}'' enth\<code></code>u00e4lt {0} in {2}.
|
|
s5=0
|
|
s6=keine Dateien
|
|
s7=1
|
|
s8=eine Datei
|
|
s9=2
|
|
s10={0,number} Dateien
|
|
s11=Das Formatieren schlug fehl mit folgender Exception: {0}
|
|
s12=FEHLER
|
|
s13=Ergebnis
|
|
s14=Dialog
|
|
s15=Auswahlkriterium
|
|
s16=1,3</pre>
|
|
*
|
|
* <p>Although this is a sub class of a hash table, you should never
|
|
* insert anything other than strings to this property, or several
|
|
* methods, that need string keys and values, will fail. To ensure
|
|
* this, you should use the <code>get/setProperty</code> method instead
|
|
* of <code>get/put</code>.
|
|
*
|
|
* Properties are saved in ISO 8859-1 encoding, using Unicode escapes with
|
|
* a single <code>u</code> for any character which cannot be represented.
|
|
*
|
|
* @author Jochen Hoenicke
|
|
* @author Eric Blake (ebb9@email.byu.edu)
|
|
* @see PropertyResourceBundle
|
|
* @status updated to 1.4
|
|
*/
|
|
public class Properties extends Hashtable<Object, Object>
|
|
{
|
|
// WARNING: Properties is a CORE class in the bootstrap cycle. See the
|
|
// comments in vm/reference/java/lang/Runtime for implications of this fact.
|
|
|
|
/**
|
|
* The property list that contains default values for any keys not
|
|
* in this property list.
|
|
*
|
|
* @serial the default properties
|
|
*/
|
|
protected Properties defaults;
|
|
|
|
/**
|
|
* Compatible with JDK 1.0+.
|
|
*/
|
|
private static final long serialVersionUID = 4112578634029874840L;
|
|
|
|
/**
|
|
* Creates a new empty property list with no default values.
|
|
*/
|
|
public Properties()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Create a new empty property list with the specified default values.
|
|
*
|
|
* @param defaults a Properties object containing the default values
|
|
*/
|
|
public Properties(Properties defaults)
|
|
{
|
|
this.defaults = defaults;
|
|
}
|
|
|
|
/**
|
|
* Adds the given key/value pair to this properties. This calls
|
|
* the hashtable method put.
|
|
*
|
|
* @param key the key for this property
|
|
* @param value the value for this property
|
|
* @return The old value for the given key
|
|
* @see #getProperty(String)
|
|
* @since 1.2
|
|
*/
|
|
public Object setProperty(String key, String value)
|
|
{
|
|
return put(key, value);
|
|
}
|
|
|
|
/**
|
|
* Reads a property list from a character stream. The stream should
|
|
* have the following format: <br>
|
|
*
|
|
* An empty line or a line starting with <code>#</code> or
|
|
* <code>!</code> is ignored. An backslash (<code>\</code>) at the
|
|
* end of the line makes the line continueing on the next line
|
|
* (but make sure there is no whitespace after the backslash).
|
|
* Otherwise, each line describes a key/value pair. <br>
|
|
*
|
|
* The chars up to the first whitespace, = or : are the key. You
|
|
* can include this caracters in the key, if you precede them with
|
|
* a backslash (<code>\</code>). The key is followed by optional
|
|
* whitespaces, optionally one <code>=</code> or <code>:</code>,
|
|
* and optionally some more whitespaces. The rest of the line is
|
|
* the resource belonging to the key. <br>
|
|
*
|
|
* Escape sequences <code>\t, \n, \r, \\, \", \', \!, \#, \ </code>(a
|
|
* space), and unicode characters with the
|
|
* <code>\\u</code><em>xxxx</em> notation are detected, and
|
|
* converted to the corresponding single character. <br>
|
|
*
|
|
*
|
|
<pre># This is a comment
|
|
key = value
|
|
k\:5 \ a string starting with space and ending with newline\n
|
|
# This is a multiline specification; note that the value contains
|
|
# no white space.
|
|
weekdays: Sunday,Monday,Tuesday,Wednesday,\\
|
|
Thursday,Friday,Saturday
|
|
# The safest way to include a space at the end of a value:
|
|
label = Name:\\u0020</pre>
|
|
*
|
|
* @param inReader the input {@link java.io.Reader}.
|
|
* @throws IOException if an error occurred when reading the input
|
|
* @throws NullPointerException if in is null
|
|
* @since 1.6
|
|
*/
|
|
public void load(Reader inReader) throws IOException
|
|
{
|
|
BufferedReader reader = new BufferedReader(inReader);
|
|
String line;
|
|
|
|
while ((line = reader.readLine()) != null)
|
|
{
|
|
char c = 0;
|
|
int pos = 0;
|
|
// Leading whitespaces must be deleted first.
|
|
while (pos < line.length()
|
|
&& Character.isWhitespace(c = line.charAt(pos)))
|
|
pos++;
|
|
|
|
// If empty line or begins with a comment character, skip this line.
|
|
if ((line.length() - pos) == 0
|
|
|| line.charAt(pos) == '#' || line.charAt(pos) == '!')
|
|
continue;
|
|
|
|
// The characters up to the next Whitespace, ':', or '='
|
|
// describe the key. But look for escape sequences.
|
|
// Try to short-circuit when there is no escape char.
|
|
int start = pos;
|
|
boolean needsEscape = line.indexOf('\\', pos) != -1;
|
|
CPStringBuilder key = needsEscape ? new CPStringBuilder() : null;
|
|
while (pos < line.length()
|
|
&& ! Character.isWhitespace(c = line.charAt(pos++))
|
|
&& c != '=' && c != ':')
|
|
{
|
|
if (needsEscape && c == '\\')
|
|
{
|
|
if (pos == line.length())
|
|
{
|
|
// The line continues on the next line. If there
|
|
// is no next line, just treat it as a key with an
|
|
// empty value.
|
|
line = reader.readLine();
|
|
if (line == null)
|
|
line = "";
|
|
pos = 0;
|
|
while (pos < line.length()
|
|
&& Character.isWhitespace(c = line.charAt(pos)))
|
|
pos++;
|
|
}
|
|
else
|
|
{
|
|
c = line.charAt(pos++);
|
|
switch (c)
|
|
{
|
|
case 'n':
|
|
key.append('\n');
|
|
break;
|
|
case 't':
|
|
key.append('\t');
|
|
break;
|
|
case 'r':
|
|
key.append('\r');
|
|
break;
|
|
case 'u':
|
|
if (pos + 4 <= line.length())
|
|
{
|
|
char uni = (char) Integer.parseInt
|
|
(line.substring(pos, pos + 4), 16);
|
|
key.append(uni);
|
|
pos += 4;
|
|
} // else throw exception?
|
|
break;
|
|
default:
|
|
key.append(c);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
else if (needsEscape)
|
|
key.append(c);
|
|
}
|
|
|
|
boolean isDelim = (c == ':' || c == '=');
|
|
|
|
String keyString;
|
|
if (needsEscape)
|
|
keyString = key.toString();
|
|
else if (isDelim || Character.isWhitespace(c))
|
|
keyString = line.substring(start, pos - 1);
|
|
else
|
|
keyString = line.substring(start, pos);
|
|
|
|
while (pos < line.length()
|
|
&& Character.isWhitespace(c = line.charAt(pos)))
|
|
pos++;
|
|
|
|
if (! isDelim && (c == ':' || c == '='))
|
|
{
|
|
pos++;
|
|
while (pos < line.length()
|
|
&& Character.isWhitespace(c = line.charAt(pos)))
|
|
pos++;
|
|
}
|
|
|
|
// Short-circuit if no escape chars found.
|
|
if (!needsEscape)
|
|
{
|
|
put(keyString, line.substring(pos));
|
|
continue;
|
|
}
|
|
|
|
// Escape char found so iterate through the rest of the line.
|
|
StringBuilder element = new StringBuilder(line.length() - pos);
|
|
while (pos < line.length())
|
|
{
|
|
c = line.charAt(pos++);
|
|
if (c == '\\')
|
|
{
|
|
if (pos == line.length())
|
|
{
|
|
// The line continues on the next line.
|
|
line = reader.readLine();
|
|
|
|
// We might have seen a backslash at the end of
|
|
// the file. The JDK ignores the backslash in
|
|
// this case, so we follow for compatibility.
|
|
if (line == null)
|
|
break;
|
|
|
|
pos = 0;
|
|
while (pos < line.length()
|
|
&& Character.isWhitespace(c = line.charAt(pos)))
|
|
pos++;
|
|
element.ensureCapacity(line.length() - pos +
|
|
element.length());
|
|
}
|
|
else
|
|
{
|
|
c = line.charAt(pos++);
|
|
switch (c)
|
|
{
|
|
case 'n':
|
|
element.append('\n');
|
|
break;
|
|
case 't':
|
|
element.append('\t');
|
|
break;
|
|
case 'r':
|
|
element.append('\r');
|
|
break;
|
|
case 'u':
|
|
if (pos + 4 <= line.length())
|
|
{
|
|
char uni = (char) Integer.parseInt
|
|
(line.substring(pos, pos + 4), 16);
|
|
element.append(uni);
|
|
pos += 4;
|
|
} // else throw exception?
|
|
break;
|
|
default:
|
|
element.append(c);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
element.append(c);
|
|
}
|
|
put(keyString, element.toString());
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Reads a property list from the supplied input stream.
|
|
* This method has the same functionality as {@link #load(Reader)}
|
|
* but the character encoding is assumed to be ISO-8859-1.
|
|
* Unicode characters not within the Latin1 set supplied by
|
|
* ISO-8859-1 should be escaped using '\\uXXXX' where XXXX
|
|
* is the UTF-16 code unit in hexadecimal.
|
|
*
|
|
* @param inStream the byte stream to read the property list from.
|
|
* @throws IOException if an I/O error occurs.
|
|
* @see #load(Reader)
|
|
* @since 1.2
|
|
*/
|
|
public void load(InputStream inStream) throws IOException
|
|
{
|
|
load(new InputStreamReader(inStream, "ISO-8859-1"));
|
|
}
|
|
|
|
/**
|
|
* Calls <code>store(OutputStream out, String header)</code> and
|
|
* ignores the IOException that may be thrown.
|
|
*
|
|
* @param out the stream to write to
|
|
* @param header a description of the property list
|
|
* @throws ClassCastException if this property contains any key or
|
|
* value that are not strings
|
|
* @deprecated use {@link #store(OutputStream, String)} instead
|
|
*/
|
|
@Deprecated
|
|
public void save(OutputStream out, String header)
|
|
{
|
|
try
|
|
{
|
|
store(out, header);
|
|
}
|
|
catch (IOException ex)
|
|
{
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Writes the key/value pairs to the given output stream, in a format
|
|
* suitable for <code>load</code>.<br>
|
|
*
|
|
* If header is not null, this method writes a comment containing
|
|
* the header as first line to the stream. The next line (or first
|
|
* line if header is null) contains a comment with the current date.
|
|
* Afterwards the key/value pairs are written to the stream in the
|
|
* following format.<br>
|
|
*
|
|
* Each line has the form <code>key = value</code>. Newlines,
|
|
* Returns and tabs are written as <code>\n,\t,\r</code> resp.
|
|
* The characters <code>\, !, #, =</code> and <code>:</code> are
|
|
* preceeded by a backslash. Spaces are preceded with a backslash,
|
|
* if and only if they are at the beginning of the key. Characters
|
|
* that are not in the ascii range 33 to 127 are written in the
|
|
* <code>\</code><code>u</code>xxxx Form.<br>
|
|
*
|
|
* Following the listing, the output stream is flushed but left open.
|
|
*
|
|
* @param out the output stream
|
|
* @param header the header written in the first line, may be null
|
|
* @throws ClassCastException if this property contains any key or
|
|
* value that isn't a string
|
|
* @throws IOException if writing to the stream fails
|
|
* @throws NullPointerException if out is null
|
|
* @since 1.2
|
|
*/
|
|
public void store(OutputStream out, String header) throws IOException
|
|
{
|
|
// The spec says that the file must be encoded using ISO-8859-1.
|
|
PrintWriter writer
|
|
= new PrintWriter(new OutputStreamWriter(out, "ISO-8859-1"));
|
|
if (header != null)
|
|
writer.println("#" + header);
|
|
writer.println ("#" + Calendar.getInstance ().getTime ());
|
|
|
|
Iterator iter = entrySet ().iterator ();
|
|
int i = size ();
|
|
CPStringBuilder s = new CPStringBuilder (); // Reuse the same buffer.
|
|
while (--i >= 0)
|
|
{
|
|
Map.Entry entry = (Map.Entry) iter.next ();
|
|
formatForOutput ((String) entry.getKey (), s, true);
|
|
s.append ('=');
|
|
formatForOutput ((String) entry.getValue (), s, false);
|
|
writer.println (s);
|
|
}
|
|
|
|
writer.flush ();
|
|
}
|
|
|
|
/**
|
|
* Gets the property with the specified key in this property list.
|
|
* If the key is not found, the default property list is searched.
|
|
* If the property is not found in the default, null is returned.
|
|
*
|
|
* @param key The key for this property
|
|
* @return the value for the given key, or null if not found
|
|
* @throws ClassCastException if this property contains any key or
|
|
* value that isn't a string
|
|
* @see #defaults
|
|
* @see #setProperty(String, String)
|
|
* @see #getProperty(String, String)
|
|
*/
|
|
public String getProperty(String key)
|
|
{
|
|
Properties prop = this;
|
|
// Eliminate tail recursion.
|
|
do
|
|
{
|
|
String value = (String) prop.get(key);
|
|
if (value != null)
|
|
return value;
|
|
prop = prop.defaults;
|
|
}
|
|
while (prop != null);
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Gets the property with the specified key in this property list. If
|
|
* the key is not found, the default property list is searched. If the
|
|
* property is not found in the default, the specified defaultValue is
|
|
* returned.
|
|
*
|
|
* @param key The key for this property
|
|
* @param defaultValue A default value
|
|
* @return The value for the given key
|
|
* @throws ClassCastException if this property contains any key or
|
|
* value that isn't a string
|
|
* @see #defaults
|
|
* @see #setProperty(String, String)
|
|
*/
|
|
public String getProperty(String key, String defaultValue)
|
|
{
|
|
String prop = getProperty(key);
|
|
if (prop == null)
|
|
prop = defaultValue;
|
|
return prop;
|
|
}
|
|
|
|
/**
|
|
* Returns an enumeration of all keys in this property list, including
|
|
* the keys in the default property list.
|
|
*
|
|
* @return an Enumeration of all defined keys
|
|
*/
|
|
public Enumeration<?> propertyNames()
|
|
{
|
|
// We make a new Set that holds all the keys, then return an enumeration
|
|
// for that. This prevents modifications from ruining the enumeration,
|
|
// as well as ignoring duplicates.
|
|
Properties prop = this;
|
|
Set s = new HashSet();
|
|
// Eliminate tail recursion.
|
|
do
|
|
{
|
|
s.addAll(prop.keySet());
|
|
prop = prop.defaults;
|
|
}
|
|
while (prop != null);
|
|
return Collections.enumeration(s);
|
|
}
|
|
|
|
/**
|
|
* Prints the key/value pairs to the given print stream. This is
|
|
* mainly useful for debugging purposes.
|
|
*
|
|
* @param out the print stream, where the key/value pairs are written to
|
|
* @throws ClassCastException if this property contains a key or a
|
|
* value that isn't a string
|
|
* @see #list(PrintWriter)
|
|
*/
|
|
public void list(PrintStream out)
|
|
{
|
|
PrintWriter writer = new PrintWriter (out);
|
|
list (writer);
|
|
}
|
|
|
|
/**
|
|
* Prints the key/value pairs to the given print writer. This is
|
|
* mainly useful for debugging purposes.
|
|
*
|
|
* @param out the print writer where the key/value pairs are written to
|
|
* @throws ClassCastException if this property contains a key or a
|
|
* value that isn't a string
|
|
* @see #list(PrintStream)
|
|
* @since 1.1
|
|
*/
|
|
public void list(PrintWriter out)
|
|
{
|
|
out.println ("-- listing properties --");
|
|
|
|
Iterator iter = entrySet ().iterator ();
|
|
int i = size ();
|
|
while (--i >= 0)
|
|
{
|
|
Map.Entry entry = (Map.Entry) iter.next ();
|
|
out.print ((String) entry.getKey () + "=");
|
|
|
|
// JDK 1.3/1.4 restrict the printed value, but not the key,
|
|
// to 40 characters, including the truncating ellipsis.
|
|
String s = (String ) entry.getValue ();
|
|
if (s != null && s.length () > 40)
|
|
out.println (s.substring (0, 37) + "...");
|
|
else
|
|
out.println (s);
|
|
}
|
|
out.flush ();
|
|
}
|
|
|
|
/**
|
|
* Formats a key or value for output in a properties file.
|
|
* See store for a description of the format.
|
|
*
|
|
* @param str the string to format
|
|
* @param buffer the buffer to add it to
|
|
* @param key true if all ' ' must be escaped for the key, false if only
|
|
* leading spaces must be escaped for the value
|
|
* @see #store(OutputStream, String)
|
|
*/
|
|
private void formatForOutput(String str, CPStringBuilder buffer, boolean key)
|
|
{
|
|
if (key)
|
|
{
|
|
buffer.setLength(0);
|
|
buffer.ensureCapacity(str.length());
|
|
}
|
|
else
|
|
buffer.ensureCapacity(buffer.length() + str.length());
|
|
boolean head = true;
|
|
int size = str.length();
|
|
for (int i = 0; i < size; i++)
|
|
{
|
|
char c = str.charAt(i);
|
|
switch (c)
|
|
{
|
|
case '\n':
|
|
buffer.append("\\n");
|
|
break;
|
|
case '\r':
|
|
buffer.append("\\r");
|
|
break;
|
|
case '\t':
|
|
buffer.append("\\t");
|
|
break;
|
|
case ' ':
|
|
buffer.append(head ? "\\ " : " ");
|
|
break;
|
|
case '\\':
|
|
case '!':
|
|
case '#':
|
|
case '=':
|
|
case ':':
|
|
buffer.append('\\').append(c);
|
|
break;
|
|
default:
|
|
if (c < ' ' || c > '~')
|
|
{
|
|
String hex = Integer.toHexString(c);
|
|
buffer.append("\\u0000".substring(0, 6 - hex.length()));
|
|
buffer.append(hex);
|
|
}
|
|
else
|
|
buffer.append(c);
|
|
}
|
|
if (c != ' ')
|
|
head = key;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Encodes the properties as an XML file using the UTF-8 encoding.
|
|
* The format of the XML file matches the DTD
|
|
* <a href="http://java.sun.com/dtd/properties.dtd">
|
|
* http://java.sun.com/dtd/properties.dtd</a>.
|
|
* </p>
|
|
* <p>
|
|
* Invoking this method provides the same behaviour as invoking
|
|
* <code>storeToXML(os, comment, "UTF-8")</code>.
|
|
* </p>
|
|
*
|
|
* @param os the stream to output to.
|
|
* @param comment a comment to include at the top of the XML file, or
|
|
* <code>null</code> if one is not required.
|
|
* @throws IOException if the serialization fails.
|
|
* @throws NullPointerException if <code>os</code> is null.
|
|
* @since 1.5
|
|
*/
|
|
public void storeToXML(OutputStream os, String comment)
|
|
throws IOException
|
|
{
|
|
storeToXML(os, comment, "UTF-8");
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Encodes the properties as an XML file using the supplied encoding.
|
|
* The format of the XML file matches the DTD
|
|
* <a href="http://java.sun.com/dtd/properties.dtd">
|
|
* http://java.sun.com/dtd/properties.dtd</a>.
|
|
* </p>
|
|
*
|
|
* @param os the stream to output to.
|
|
* @param comment a comment to include at the top of the XML file, or
|
|
* <code>null</code> if one is not required.
|
|
* @param encoding the encoding to use for the XML output.
|
|
* @throws IOException if the serialization fails.
|
|
* @throws NullPointerException if <code>os</code> or <code>encoding</code>
|
|
* is null.
|
|
* @since 1.5
|
|
*/
|
|
public void storeToXML(OutputStream os, String comment, String encoding)
|
|
throws IOException
|
|
{
|
|
if (os == null)
|
|
throw new NullPointerException("Null output stream supplied.");
|
|
if (encoding == null)
|
|
throw new NullPointerException("Null encoding supplied.");
|
|
try
|
|
{
|
|
DOMImplementationRegistry registry =
|
|
DOMImplementationRegistry.newInstance();
|
|
DOMImplementation domImpl = registry.getDOMImplementation("LS 3.0");
|
|
DocumentType doctype =
|
|
domImpl.createDocumentType("properties", null,
|
|
"http://java.sun.com/dtd/properties.dtd");
|
|
Document doc = domImpl.createDocument(null, "properties", doctype);
|
|
Element root = doc.getDocumentElement();
|
|
if (comment != null)
|
|
{
|
|
Element commentElement = doc.createElement("comment");
|
|
commentElement.appendChild(doc.createTextNode(comment));
|
|
root.appendChild(commentElement);
|
|
}
|
|
Iterator iterator = entrySet().iterator();
|
|
while (iterator.hasNext())
|
|
{
|
|
Map.Entry entry = (Map.Entry) iterator.next();
|
|
Element entryElement = doc.createElement("entry");
|
|
entryElement.setAttribute("key", (String) entry.getKey());
|
|
entryElement.appendChild(doc.createTextNode((String)
|
|
entry.getValue()));
|
|
root.appendChild(entryElement);
|
|
}
|
|
DOMImplementationLS loadAndSave = (DOMImplementationLS) domImpl;
|
|
LSSerializer serializer = loadAndSave.createLSSerializer();
|
|
LSOutput output = loadAndSave.createLSOutput();
|
|
output.setByteStream(os);
|
|
output.setEncoding(encoding);
|
|
serializer.write(doc, output);
|
|
}
|
|
catch (ClassNotFoundException e)
|
|
{
|
|
throw (IOException)
|
|
new IOException("The XML classes could not be found.").initCause(e);
|
|
}
|
|
catch (InstantiationException e)
|
|
{
|
|
throw (IOException)
|
|
new IOException("The XML classes could not be instantiated.")
|
|
.initCause(e);
|
|
}
|
|
catch (IllegalAccessException e)
|
|
{
|
|
throw (IOException)
|
|
new IOException("The XML classes could not be accessed.")
|
|
.initCause(e);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Decodes the contents of the supplied <code>InputStream</code> as
|
|
* an XML file, which represents a set of properties. The format of
|
|
* the XML file must match the DTD
|
|
* <a href="http://java.sun.com/dtd/properties.dtd">
|
|
* http://java.sun.com/dtd/properties.dtd</a>.
|
|
* </p>
|
|
*
|
|
* @param in the input stream from which to receive the XML data.
|
|
* @throws IOException if an I/O error occurs in reading the input data.
|
|
* @throws InvalidPropertiesFormatException if the input data does not
|
|
* constitute an XML properties
|
|
* file.
|
|
* @throws NullPointerException if <code>in</code> is null.
|
|
* @since 1.5
|
|
*/
|
|
public void loadFromXML(InputStream in)
|
|
throws IOException, InvalidPropertiesFormatException
|
|
{
|
|
if (in == null)
|
|
throw new NullPointerException("Null input stream supplied.");
|
|
try
|
|
{
|
|
XMLInputFactory factory = XMLInputFactory.newInstance();
|
|
// Don't resolve external entity references
|
|
factory.setProperty("javax.xml.stream.isSupportingExternalEntities",
|
|
Boolean.FALSE);
|
|
XMLStreamReader reader = factory.createXMLStreamReader(in);
|
|
String name, key = null;
|
|
CPStringBuilder buf = null;
|
|
while (reader.hasNext())
|
|
{
|
|
switch (reader.next())
|
|
{
|
|
case XMLStreamConstants.START_ELEMENT:
|
|
name = reader.getLocalName();
|
|
if (buf == null && "entry".equals(name))
|
|
{
|
|
key = reader.getAttributeValue(null, "key");
|
|
if (key == null)
|
|
{
|
|
String msg = "missing 'key' attribute";
|
|
throw new InvalidPropertiesFormatException(msg);
|
|
}
|
|
buf = new CPStringBuilder();
|
|
}
|
|
else if (!"properties".equals(name) && !"comment".equals(name))
|
|
{
|
|
String msg = "unexpected element name '" + name + "'";
|
|
throw new InvalidPropertiesFormatException(msg);
|
|
}
|
|
break;
|
|
case XMLStreamConstants.END_ELEMENT:
|
|
name = reader.getLocalName();
|
|
if (buf != null && "entry".equals(name))
|
|
{
|
|
put(key, buf.toString());
|
|
buf = null;
|
|
}
|
|
else if (!"properties".equals(name) && !"comment".equals(name))
|
|
{
|
|
String msg = "unexpected element name '" + name + "'";
|
|
throw new InvalidPropertiesFormatException(msg);
|
|
}
|
|
break;
|
|
case XMLStreamConstants.CHARACTERS:
|
|
case XMLStreamConstants.SPACE:
|
|
case XMLStreamConstants.CDATA:
|
|
if (buf != null)
|
|
buf.append(reader.getText());
|
|
break;
|
|
}
|
|
}
|
|
reader.close();
|
|
}
|
|
catch (XMLStreamException e)
|
|
{
|
|
throw (InvalidPropertiesFormatException)
|
|
new InvalidPropertiesFormatException("Error in parsing XML.").
|
|
initCause(e);
|
|
}
|
|
}
|
|
|
|
} // class Properties
|