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
542 lines
18 KiB
Java
542 lines
18 KiB
Java
/* URLStreamHandler.java -- Abstract superclass for all protocol handlers
|
|
Copyright (C) 1998, 1999, 2002, 2003, 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 java.net;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.io.File;
|
|
import java.io.IOException;
|
|
|
|
|
|
/*
|
|
* Written using on-line Java Platform 1.2 API Specification, as well
|
|
* as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
|
|
* Status: Believed complete and correct.
|
|
*/
|
|
|
|
/**
|
|
* This class is the superclass of all URL protocol handlers. The URL
|
|
* class loads the appropriate protocol handler to establish a connection
|
|
* to a (possibly) remote service (eg, "http", "ftp") and to do protocol
|
|
* specific parsing of URL's. Refer to the URL class documentation for
|
|
* details on how that class locates and loads protocol handlers.
|
|
* <p>
|
|
* A protocol handler implementation should override the openConnection()
|
|
* method, and optionally override the parseURL() and toExternalForm()
|
|
* methods if necessary. (The default implementations will parse/write all
|
|
* URL's in the same form as http URL's). A protocol specific subclass
|
|
* of URLConnection will most likely need to be created as well.
|
|
* <p>
|
|
* Note that the instance methods in this class are called as if they
|
|
* were static methods. That is, a URL object to act on is passed with
|
|
* every call rather than the caller assuming the URL is stored in an
|
|
* instance variable of the "this" object.
|
|
* <p>
|
|
* The methods in this class are protected and accessible only to subclasses.
|
|
* URLStreamConnection objects are intended for use by the URL class only,
|
|
* not by other classes (unless those classes are implementing protocols).
|
|
*
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
* @author Warren Levy (warrenl@cygnus.com)
|
|
*
|
|
* @see URL
|
|
*/
|
|
public abstract class URLStreamHandler
|
|
{
|
|
/**
|
|
* Creates a URLStreamHander
|
|
*/
|
|
public URLStreamHandler()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Returns a URLConnection for the passed in URL. Note that this should
|
|
* not actually create the connection to the (possibly) remote host, but
|
|
* rather simply return a URLConnection object. The connect() method of
|
|
* URL connection is used to establish the actual connection, possibly
|
|
* after the caller sets up various connection options.
|
|
*
|
|
* @param url The URL to get a connection object for
|
|
*
|
|
* @return A URLConnection object for the given URL
|
|
*
|
|
* @exception IOException If an error occurs
|
|
*/
|
|
protected abstract URLConnection openConnection(URL url)
|
|
throws IOException;
|
|
|
|
/**
|
|
* This method parses the string passed in as a URL and set's the
|
|
* instance data fields in the URL object passed in to the various values
|
|
* parsed out of the string. The start parameter is the position to start
|
|
* scanning the string. This is usually the position after the ":" which
|
|
* terminates the protocol name. The end parameter is the position to
|
|
* stop scanning. This will be either the end of the String, or the
|
|
* position of the "#" character, which separates the "file" portion of
|
|
* the URL from the "anchor" portion.
|
|
* <p>
|
|
* This method assumes URL's are formatted like http protocol URL's, so
|
|
* subclasses that implement protocols with URL's the follow a different
|
|
* syntax should override this method. The lone exception is that if
|
|
* the protocol name set in the URL is "file", this method will accept
|
|
* an empty hostname (i.e., "file:///"), which is legal for that protocol
|
|
*
|
|
* @param url The URL object in which to store the results
|
|
* @param spec The String-ized URL to parse
|
|
* @param start The position in the string to start scanning from
|
|
* @param end The position in the string to stop scanning
|
|
*/
|
|
protected void parseURL(URL url, String spec, int start, int end)
|
|
{
|
|
String host = url.getHost();
|
|
int port = url.getPort();
|
|
String file = url.getFile();
|
|
String ref = url.getRef();
|
|
String userInfo = url.getUserInfo();
|
|
String authority = url.getAuthority();
|
|
String query = null;
|
|
|
|
// On Windows we need to change \ to / for file URLs
|
|
char separator = File.separatorChar;
|
|
if (url.getProtocol().equals("file") && separator != '/')
|
|
{
|
|
file = file.replace(separator, '/');
|
|
spec = spec.replace(separator, '/');
|
|
}
|
|
|
|
if (spec.regionMatches(start, "//", 0, 2))
|
|
{
|
|
String genuineHost;
|
|
int hostEnd;
|
|
int colon;
|
|
int at_host;
|
|
|
|
start += 2;
|
|
int slash = spec.indexOf('/', start);
|
|
if (slash >= 0)
|
|
hostEnd = slash;
|
|
else
|
|
hostEnd = end;
|
|
|
|
authority = host = spec.substring(start, hostEnd);
|
|
|
|
// We first need a genuine host name (with userinfo).
|
|
// So we check for '@': if it's present check the port in the
|
|
// section after '@' in the other case check it in the full string.
|
|
// P.S.: We don't care having '@' at the beginning of the string.
|
|
if ((at_host = host.indexOf('@')) >= 0)
|
|
{
|
|
genuineHost = host.substring(at_host);
|
|
userInfo = host.substring(0, at_host);
|
|
}
|
|
else
|
|
genuineHost = host;
|
|
|
|
// Look for optional port number. It is valid for the non-port
|
|
// part of the host name to be null (e.g. a URL "http://:80").
|
|
// TBD: JDK 1.2 in this case sets host to null rather than "";
|
|
// this is undocumented and likely an unintended side effect in 1.2
|
|
// so we'll be simple here and stick with "". Note that
|
|
// "http://" or "http:///" produce a "" host in JDK 1.2.
|
|
if ((colon = genuineHost.indexOf(':')) >= 0)
|
|
{
|
|
try
|
|
{
|
|
port = Integer.parseInt(genuineHost.substring(colon + 1));
|
|
}
|
|
catch (NumberFormatException e)
|
|
{
|
|
// Ignore invalid port values; port is already set to u's
|
|
// port.
|
|
}
|
|
|
|
// Now we must cut the port number in the original string.
|
|
if (at_host >= 0)
|
|
host = host.substring(0, at_host + colon);
|
|
else
|
|
host = host.substring(0, colon);
|
|
}
|
|
file = null;
|
|
start = hostEnd;
|
|
}
|
|
else if (host == null)
|
|
host = "";
|
|
|
|
if (file == null || file.length() == 0
|
|
|| (start < end && spec.charAt(start) == '/'))
|
|
{
|
|
// No file context available; just spec for file.
|
|
// Or this is an absolute path name; ignore any file context.
|
|
file = spec.substring(start, end);
|
|
ref = null;
|
|
}
|
|
else if (start < end)
|
|
{
|
|
// Context is available, but only override it if there is a new file.
|
|
int lastSlash = file.lastIndexOf('/');
|
|
if (lastSlash < 0)
|
|
file = spec.substring(start, end);
|
|
else
|
|
file = (file.substring(0, lastSlash)
|
|
+ '/' + spec.substring(start, end));
|
|
|
|
// For URLs constructed relative to a context, we
|
|
// need to canonicalise the file path.
|
|
file = canonicalizeFilename(file);
|
|
|
|
ref = null;
|
|
}
|
|
|
|
if (ref == null)
|
|
{
|
|
// Normally there should be no '#' in the file part,
|
|
// but we are nice.
|
|
int hash = file.indexOf('#');
|
|
if (hash != -1)
|
|
{
|
|
ref = file.substring(hash + 1, file.length());
|
|
file = file.substring(0, hash);
|
|
}
|
|
}
|
|
|
|
// We care about the query tag only if there is no reference at all.
|
|
if (ref == null)
|
|
{
|
|
int queryTag = file.indexOf('?');
|
|
if (queryTag != -1)
|
|
{
|
|
query = file.substring(queryTag + 1);
|
|
file = file.substring(0, queryTag);
|
|
}
|
|
}
|
|
|
|
// XXX - Classpath used to call PlatformHelper.toCanonicalForm() on
|
|
// the file part. It seems like overhead, but supposedly there is some
|
|
// benefit in windows based systems (it also lowercased the string).
|
|
setURL(url, url.getProtocol(), host, port, authority, userInfo, file, query, ref);
|
|
}
|
|
|
|
/*
|
|
* Canonicalize a filename.
|
|
*/
|
|
private static String canonicalizeFilename(String file)
|
|
{
|
|
// XXX - GNU Classpath has an implementation that might be more appropriate
|
|
// for Windows based systems (gnu.java.io.PlatformHelper.toCanonicalForm)
|
|
int index;
|
|
|
|
// Replace "/./" with "/". This probably isn't very efficient in
|
|
// the general case, but it's probably not bad most of the time.
|
|
while ((index = file.indexOf("/./")) >= 0)
|
|
file = file.substring(0, index) + file.substring(index + 2);
|
|
|
|
// Process "/../" correctly. This probably isn't very efficient in
|
|
// the general case, but it's probably not bad most of the time.
|
|
while ((index = file.indexOf("/../")) >= 0)
|
|
{
|
|
// Strip of the previous directory - if it exists.
|
|
int previous = file.lastIndexOf('/', index - 1);
|
|
if (previous >= 0)
|
|
file = file.substring(0, previous) + file.substring(index + 3);
|
|
else
|
|
break;
|
|
}
|
|
return file;
|
|
}
|
|
|
|
/**
|
|
* Compares two URLs, excluding the fragment component
|
|
*
|
|
* @param url1 The first url
|
|
* @param url2 The second url to compare with the first
|
|
*
|
|
* @return True if both URLs point to the same file, false otherwise.
|
|
*
|
|
* @specnote Now protected
|
|
*/
|
|
protected boolean sameFile(URL url1, URL url2)
|
|
{
|
|
if (url1 == url2)
|
|
return true;
|
|
|
|
// This comparison is very conservative. It assumes that any
|
|
// field can be null.
|
|
if (url1 == null || url2 == null)
|
|
return false;
|
|
int p1 = url1.getPort();
|
|
if (p1 == -1)
|
|
p1 = url1.ph.getDefaultPort();
|
|
int p2 = url2.getPort();
|
|
if (p2 == -1)
|
|
p2 = url2.ph.getDefaultPort();
|
|
if (p1 != p2)
|
|
return false;
|
|
String s1;
|
|
String s2;
|
|
s1 = url1.getProtocol();
|
|
s2 = url2.getProtocol();
|
|
if (s1 != s2 && (s1 == null || ! s1.equals(s2)))
|
|
return false;
|
|
s1 = url1.getHost();
|
|
s2 = url2.getHost();
|
|
if (s1 != s2 && (s1 == null || ! s1.equals(s2)))
|
|
return false;
|
|
s1 = canonicalizeFilename(url1.getFile());
|
|
s2 = canonicalizeFilename(url2.getFile());
|
|
if (s1 != s2 && (s1 == null || ! s1.equals(s2)))
|
|
return false;
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* This methods sets the instance variables representing the various fields
|
|
* of the URL to the values passed in.
|
|
*
|
|
* @param u The URL to modify
|
|
* @param protocol The protocol to set
|
|
* @param host The host name to et
|
|
* @param port The port number to set
|
|
* @param file The filename to set
|
|
* @param ref The reference
|
|
*
|
|
* @exception SecurityException If the protocol handler of the URL is
|
|
* different from this one
|
|
*
|
|
* @deprecated 1.2 Please use
|
|
* #setURL(URL,String,String,int,String,String,String,String);
|
|
*/
|
|
protected void setURL(URL u, String protocol, String host, int port,
|
|
String file, String ref)
|
|
{
|
|
u.set(protocol, host, port, file, ref);
|
|
}
|
|
|
|
/**
|
|
* Sets the fields of the URL argument to the indicated values
|
|
*
|
|
* @param u The URL to modify
|
|
* @param protocol The protocol to set
|
|
* @param host The host name to set
|
|
* @param port The port number to set
|
|
* @param authority The authority to set
|
|
* @param userInfo The user information to set
|
|
* @param path The path/filename to set
|
|
* @param query The query part to set
|
|
* @param ref The reference
|
|
*
|
|
* @exception SecurityException If the protocol handler of the URL is
|
|
* different from this one
|
|
*/
|
|
protected void setURL(URL u, String protocol, String host, int port,
|
|
String authority, String userInfo, String path,
|
|
String query, String ref)
|
|
{
|
|
u.set(protocol, host, port, authority, userInfo, path, query, ref);
|
|
}
|
|
|
|
/**
|
|
* This is the default method for computing whether two URLs are
|
|
* equivalent. This method assumes that neither URL is null.
|
|
*
|
|
* @param url1 An URL object
|
|
* @param url2 Another URL object
|
|
*
|
|
* @return True if both given URLs are equal, false otherwise.
|
|
*/
|
|
protected boolean equals(URL url1, URL url2)
|
|
{
|
|
// This comparison is very conservative. It assumes that any
|
|
// field can be null.
|
|
int port1 = url1.getPort();
|
|
if (port1 == -1)
|
|
port1 = url1.getDefaultPort();
|
|
int port2 = url2.getPort();
|
|
if (port2 == -1)
|
|
port2 = url2.getDefaultPort();
|
|
// Note that we don't bother checking the 'authority'; it is
|
|
// redundant.
|
|
return (port1 == port2
|
|
&& ((url1.getProtocol() == null && url2.getProtocol() == null)
|
|
|| (url1.getProtocol() != null
|
|
&& url1.getProtocol().equals(url2.getProtocol())))
|
|
&& ((url1.getUserInfo() == null && url2.getUserInfo() == null)
|
|
|| (url1.getUserInfo() != null
|
|
&& url1.getUserInfo().equals(url2.getUserInfo())))
|
|
&& ((url1.getHost() == null && url2.getHost() == null)
|
|
|| (url1.getHost() != null && url1.getHost().equals(url2.getHost())))
|
|
&& ((url1.getPath() == null && url2.getPath() == null)
|
|
|| (url1.getPath() != null && url1.getPath().equals(url2.getPath())))
|
|
&& ((url1.getQuery() == null && url2.getQuery() == null)
|
|
|| (url1.getQuery() != null
|
|
&& url1.getQuery().equals(url2.getQuery())))
|
|
&& ((url1.getRef() == null && url2.getRef() == null)
|
|
|| (url1.getRef() != null && url1.getRef().equals(url2.getRef()))));
|
|
}
|
|
|
|
/**
|
|
* Compares the host components of two URLs.
|
|
*
|
|
* @param url1 The first URL.
|
|
* @param url2 The second URL.
|
|
*
|
|
* @return True if both URLs contain the same host.
|
|
*/
|
|
protected boolean hostsEqual(URL url1, URL url2)
|
|
{
|
|
InetAddress addr1 = getHostAddress(url1);
|
|
InetAddress addr2 = getHostAddress(url2);
|
|
|
|
if (addr1 != null && addr2 != null)
|
|
return addr1.equals(addr2);
|
|
|
|
String host1 = url1.getHost();
|
|
String host2 = url2.getHost();
|
|
|
|
if (host1 != null && host2 != null)
|
|
return host1.equalsIgnoreCase(host2);
|
|
|
|
return host1 == null && host2 == null;
|
|
}
|
|
|
|
/**
|
|
* Get the IP address of our host. An empty host field or a DNS failure will
|
|
* result in a null return.
|
|
*
|
|
* @param url The URL to return the host address for.
|
|
*
|
|
* @return The address of the hostname in url.
|
|
*/
|
|
protected InetAddress getHostAddress(URL url)
|
|
{
|
|
String hostname = url.getHost();
|
|
|
|
if (hostname.equals(""))
|
|
return null;
|
|
|
|
try
|
|
{
|
|
return InetAddress.getByName(hostname);
|
|
}
|
|
catch (UnknownHostException e)
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the default port for a URL parsed by this handler. This method is
|
|
* meant to be overidden by handlers with default port numbers.
|
|
*
|
|
* @return The default port number.
|
|
*/
|
|
protected int getDefaultPort()
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* Provides the default hash calculation. May be overidden by handlers for
|
|
* other protocols that have different requirements for hashCode calculation.
|
|
*
|
|
* @param url The URL to calc the hashcode for.
|
|
*
|
|
* @return The hashcode for the given URL.
|
|
*/
|
|
protected int hashCode(URL url)
|
|
{
|
|
return url.getProtocol().hashCode()
|
|
+ ((url.getHost() == null) ? 0 : url.getHost().hashCode())
|
|
+ url.getFile().hashCode() + url.getPort();
|
|
}
|
|
|
|
/**
|
|
* This method converts a URL object into a String. This method creates
|
|
* Strings in the mold of http URL's, so protocol handlers which use URL's
|
|
* that have a different syntax should override this method
|
|
*
|
|
* @param url The URL object to convert
|
|
*
|
|
* @return A string representation of the url
|
|
*/
|
|
protected String toExternalForm(URL url)
|
|
{
|
|
String protocol;
|
|
String file;
|
|
String ref;
|
|
String authority;
|
|
|
|
protocol = url.getProtocol();
|
|
authority = url.getAuthority();
|
|
if (authority == null)
|
|
authority = "";
|
|
|
|
file = url.getFile();
|
|
ref = url.getRef();
|
|
|
|
// Guess a reasonable size for the string buffer so we have to resize
|
|
// at most once.
|
|
int size = protocol.length() + authority.length() + file.length() + 24;
|
|
CPStringBuilder sb = new CPStringBuilder(size);
|
|
|
|
if (protocol.length() > 0)
|
|
{
|
|
sb.append(protocol);
|
|
sb.append(":");
|
|
}
|
|
|
|
// If we have superfluous leading slashes (that means, at least 2)
|
|
// we always add the authority component ("//" + host) to
|
|
// avoid ambiguity. Otherwise we would generate an URL like
|
|
// proto://home/foo
|
|
// where we meant:
|
|
// host: <empty> - file: //home/foo
|
|
// but URL spec says it is:
|
|
// host: home - file: /foo
|
|
if (authority.length() != 0 || file.startsWith("//") )
|
|
sb.append("//").append(authority).append(file);
|
|
else
|
|
sb.append(file);
|
|
|
|
if (ref != null)
|
|
sb.append('#').append(ref);
|
|
|
|
return sb.toString();
|
|
}
|
|
}
|