
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
819 lines
25 KiB
Java
819 lines
25 KiB
Java
/* AbstractMap.java -- Abstract implementation of most of Map
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2002, 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.Serializable;
|
|
|
|
/**
|
|
* An abstract implementation of Map to make it easier to create your own
|
|
* implementations. In order to create an unmodifiable Map, subclass
|
|
* AbstractMap and implement the <code>entrySet</code> (usually via an
|
|
* AbstractSet). To make it modifiable, also implement <code>put</code>,
|
|
* and have <code>entrySet().iterator()</code> support <code>remove</code>.
|
|
* <p>
|
|
*
|
|
* It is recommended that classes which extend this support at least the
|
|
* no-argument constructor, and a constructor which accepts another Map.
|
|
* Further methods in this class may be overridden if you have a more
|
|
* efficient implementation.
|
|
*
|
|
* @author Original author unknown
|
|
* @author Bryce McKinlay
|
|
* @author Eric Blake (ebb9@email.byu.edu)
|
|
* @see Map
|
|
* @see Collection
|
|
* @see HashMap
|
|
* @see LinkedHashMap
|
|
* @see TreeMap
|
|
* @see WeakHashMap
|
|
* @see IdentityHashMap
|
|
* @since 1.2
|
|
* @status updated to 1.4
|
|
*/
|
|
public abstract class AbstractMap<K, V> implements Map<K, V>
|
|
{
|
|
/**
|
|
* A class containing an immutable key and value. The
|
|
* implementation of {@link Entry#setValue(V)} for this class
|
|
* simply throws an {@link UnsupportedOperationException},
|
|
* thus preventing changes being made. This is useful when
|
|
* a static thread-safe view of a map is required.
|
|
*
|
|
* @since 1.6
|
|
*/
|
|
public static class SimpleImmutableEntry<K, V>
|
|
implements Entry<K, V>, Serializable
|
|
{
|
|
/**
|
|
* Compatible with JDK 1.6
|
|
*/
|
|
private static final long serialVersionUID = 7138329143949025153L;
|
|
|
|
K key;
|
|
V value;
|
|
|
|
public SimpleImmutableEntry(K key, V value)
|
|
{
|
|
this.key = key;
|
|
this.value = value;
|
|
}
|
|
|
|
public SimpleImmutableEntry(Entry<? extends K, ? extends V> entry)
|
|
{
|
|
this(entry.getKey(), entry.getValue());
|
|
}
|
|
|
|
public K getKey()
|
|
{
|
|
return key;
|
|
}
|
|
|
|
public V getValue()
|
|
{
|
|
return value;
|
|
}
|
|
|
|
public V setValue(V value)
|
|
{
|
|
throw new UnsupportedOperationException("setValue not supported on immutable entry");
|
|
}
|
|
}
|
|
|
|
/** An "enum" of iterator types. */
|
|
// Package visible for use by subclasses.
|
|
static final int KEYS = 0,
|
|
VALUES = 1,
|
|
ENTRIES = 2;
|
|
|
|
/**
|
|
* The cache for {@link #keySet()}.
|
|
*/
|
|
// Package visible for use by subclasses.
|
|
Set<K> keys;
|
|
|
|
/**
|
|
* The cache for {@link #values()}.
|
|
*/
|
|
// Package visible for use by subclasses.
|
|
Collection<V> values;
|
|
|
|
/**
|
|
* The main constructor, for use by subclasses.
|
|
*/
|
|
protected AbstractMap()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Returns a set view of the mappings in this Map. Each element in the
|
|
* set must be an implementation of Map.Entry. The set is backed by
|
|
* the map, so that changes in one show up in the other. Modifications
|
|
* made while an iterator is in progress cause undefined behavior. If
|
|
* the set supports removal, these methods must be valid:
|
|
* <code>Iterator.remove</code>, <code>Set.remove</code>,
|
|
* <code>removeAll</code>, <code>retainAll</code>, and <code>clear</code>.
|
|
* Element addition is not supported via this set.
|
|
*
|
|
* @return the entry set
|
|
* @see Map.Entry
|
|
*/
|
|
public abstract Set<Map.Entry<K, V>> entrySet();
|
|
|
|
/**
|
|
* Remove all entries from this Map (optional operation). This default
|
|
* implementation calls entrySet().clear(). NOTE: If the entry set does
|
|
* not permit clearing, then this will fail, too. Subclasses often
|
|
* override this for efficiency. Your implementation of entrySet() should
|
|
* not call <code>AbstractMap.clear</code> unless you want an infinite loop.
|
|
*
|
|
* @throws UnsupportedOperationException if <code>entrySet().clear()</code>
|
|
* does not support clearing.
|
|
* @see Set#clear()
|
|
*/
|
|
public void clear()
|
|
{
|
|
entrySet().clear();
|
|
}
|
|
|
|
/**
|
|
* Create a shallow copy of this Map, no keys or values are copied. The
|
|
* default implementation simply calls <code>super.clone()</code>.
|
|
*
|
|
* @return the shallow clone
|
|
* @throws CloneNotSupportedException if a subclass is not Cloneable
|
|
* @see Cloneable
|
|
* @see Object#clone()
|
|
*/
|
|
protected Object clone() throws CloneNotSupportedException
|
|
{
|
|
AbstractMap<K, V> copy = (AbstractMap<K, V>) super.clone();
|
|
// Clear out the caches; they are stale.
|
|
copy.keys = null;
|
|
copy.values = null;
|
|
return copy;
|
|
}
|
|
|
|
/**
|
|
* Returns true if this contains a mapping for the given key. This
|
|
* implementation does a linear search, O(n), over the
|
|
* <code>entrySet()</code>, returning <code>true</code> if a match
|
|
* is found, <code>false</code> if the iteration ends. Many subclasses
|
|
* can implement this more efficiently.
|
|
*
|
|
* @param key the key to search for
|
|
* @return true if the map contains the key
|
|
* @throws NullPointerException if key is <code>null</code> but the map
|
|
* does not permit null keys
|
|
* @see #containsValue(Object)
|
|
*/
|
|
public boolean containsKey(Object key)
|
|
{
|
|
Iterator<Map.Entry<K, V>> entries = entrySet().iterator();
|
|
int pos = size();
|
|
while (--pos >= 0)
|
|
if (equals(key, entries.next().getKey()))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Returns true if this contains at least one mapping with the given value.
|
|
* This implementation does a linear search, O(n), over the
|
|
* <code>entrySet()</code>, returning <code>true</code> if a match
|
|
* is found, <code>false</code> if the iteration ends. A match is
|
|
* defined as a value, v, where <code>(value == null ? v == null :
|
|
* value.equals(v))</code>. Subclasses are unlikely to implement
|
|
* this more efficiently.
|
|
*
|
|
* @param value the value to search for
|
|
* @return true if the map contains the value
|
|
* @see #containsKey(Object)
|
|
*/
|
|
public boolean containsValue(Object value)
|
|
{
|
|
Iterator<Map.Entry<K, V>> entries = entrySet().iterator();
|
|
int pos = size();
|
|
while (--pos >= 0)
|
|
if (equals(value, entries.next().getValue()))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Compares the specified object with this map for equality. Returns
|
|
* <code>true</code> if the other object is a Map with the same mappings,
|
|
* that is,<br>
|
|
* <code>o instanceof Map && entrySet().equals(((Map) o).entrySet();</code>
|
|
*
|
|
* @param o the object to be compared
|
|
* @return true if the object equals this map
|
|
* @see Set#equals(Object)
|
|
*/
|
|
public boolean equals(Object o)
|
|
{
|
|
return (o == this
|
|
|| (o instanceof Map
|
|
&& entrySet().equals(((Map<K, V>) o).entrySet())));
|
|
}
|
|
|
|
/**
|
|
* Returns the value mapped by the given key. Returns <code>null</code> if
|
|
* there is no mapping. However, in Maps that accept null values, you
|
|
* must rely on <code>containsKey</code> to determine if a mapping exists.
|
|
* This iteration takes linear time, searching entrySet().iterator() of
|
|
* the key. Many implementations override this method.
|
|
*
|
|
* @param key the key to look up
|
|
* @return the value associated with the key, or null if key not in map
|
|
* @throws NullPointerException if this map does not accept null keys
|
|
* @see #containsKey(Object)
|
|
*/
|
|
public V get(Object key)
|
|
{
|
|
Iterator<Map.Entry<K, V>> entries = entrySet().iterator();
|
|
int pos = size();
|
|
while (--pos >= 0)
|
|
{
|
|
Map.Entry<K, V> entry = entries.next();
|
|
if (equals(key, entry.getKey()))
|
|
return entry.getValue();
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns the hash code for this map. As defined in Map, this is the sum
|
|
* of all hashcodes for each Map.Entry object in entrySet, or basically
|
|
* entrySet().hashCode().
|
|
*
|
|
* @return the hash code
|
|
* @see Map.Entry#hashCode()
|
|
* @see Set#hashCode()
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
return entrySet().hashCode();
|
|
}
|
|
|
|
/**
|
|
* Returns true if the map contains no mappings. This is implemented by
|
|
* <code>size() == 0</code>.
|
|
*
|
|
* @return true if the map is empty
|
|
* @see #size()
|
|
*/
|
|
public boolean isEmpty()
|
|
{
|
|
return size() == 0;
|
|
}
|
|
|
|
/**
|
|
* Returns a set view of this map's keys. The set is backed by the map,
|
|
* so changes in one show up in the other. Modifications while an iteration
|
|
* is in progress produce undefined behavior. The set supports removal
|
|
* if entrySet() does, but does not support element addition.
|
|
* <p>
|
|
*
|
|
* This implementation creates an AbstractSet, where the iterator wraps
|
|
* the entrySet iterator, size defers to the Map's size, and contains
|
|
* defers to the Map's containsKey. The set is created on first use, and
|
|
* returned on subsequent uses, although since no synchronization occurs,
|
|
* there is a slight possibility of creating two sets.
|
|
*
|
|
* @return a Set view of the keys
|
|
* @see Set#iterator()
|
|
* @see #size()
|
|
* @see #containsKey(Object)
|
|
* @see #values()
|
|
*/
|
|
public Set<K> keySet()
|
|
{
|
|
if (keys == null)
|
|
keys = new AbstractSet<K>()
|
|
{
|
|
/**
|
|
* Retrieves the number of keys in the backing map.
|
|
*
|
|
* @return The number of keys.
|
|
*/
|
|
public int size()
|
|
{
|
|
return AbstractMap.this.size();
|
|
}
|
|
|
|
/**
|
|
* Returns true if the backing map contains the
|
|
* supplied key.
|
|
*
|
|
* @param key The key to search for.
|
|
* @return True if the key was found, false otherwise.
|
|
*/
|
|
public boolean contains(Object key)
|
|
{
|
|
return containsKey(key);
|
|
}
|
|
|
|
/**
|
|
* Returns an iterator which iterates over the keys
|
|
* in the backing map, using a wrapper around the
|
|
* iterator returned by <code>entrySet()</code>.
|
|
*
|
|
* @return An iterator over the keys.
|
|
*/
|
|
public Iterator<K> iterator()
|
|
{
|
|
return new Iterator<K>()
|
|
{
|
|
/**
|
|
* The iterator returned by <code>entrySet()</code>.
|
|
*/
|
|
private final Iterator<Map.Entry<K, V>> map_iterator
|
|
= entrySet().iterator();
|
|
|
|
/**
|
|
* Returns true if a call to <code>next()</code> will
|
|
* return another key.
|
|
*
|
|
* @return True if the iterator has not yet reached
|
|
* the last key.
|
|
*/
|
|
public boolean hasNext()
|
|
{
|
|
return map_iterator.hasNext();
|
|
}
|
|
|
|
/**
|
|
* Returns the key from the next entry retrieved
|
|
* by the underlying <code>entrySet()</code> iterator.
|
|
*
|
|
* @return The next key.
|
|
*/
|
|
public K next()
|
|
{
|
|
return map_iterator.next().getKey();
|
|
}
|
|
|
|
/**
|
|
* Removes the map entry which has a key equal
|
|
* to that returned by the last call to
|
|
* <code>next()</code>.
|
|
*
|
|
* @throws UnsupportedOperationException if the
|
|
* map doesn't support removal.
|
|
*/
|
|
public void remove()
|
|
{
|
|
map_iterator.remove();
|
|
}
|
|
};
|
|
}
|
|
};
|
|
return keys;
|
|
}
|
|
|
|
/**
|
|
* Associates the given key to the given value (optional operation). If the
|
|
* map already contains the key, its value is replaced. This implementation
|
|
* simply throws an UnsupportedOperationException. Be aware that in a map
|
|
* that permits <code>null</code> values, a null return does not always
|
|
* imply that the mapping was created.
|
|
*
|
|
* @param key the key to map
|
|
* @param value the value to be mapped
|
|
* @return the previous value of the key, or null if there was no mapping
|
|
* @throws UnsupportedOperationException if the operation is not supported
|
|
* @throws ClassCastException if the key or value is of the wrong type
|
|
* @throws IllegalArgumentException if something about this key or value
|
|
* prevents it from existing in this map
|
|
* @throws NullPointerException if the map forbids null keys or values
|
|
* @see #containsKey(Object)
|
|
*/
|
|
public V put(K key, V value)
|
|
{
|
|
throw new UnsupportedOperationException();
|
|
}
|
|
|
|
/**
|
|
* Copies all entries of the given map to this one (optional operation). If
|
|
* the map already contains a key, its value is replaced. This implementation
|
|
* simply iterates over the map's entrySet(), calling <code>put</code>,
|
|
* so it is not supported if puts are not.
|
|
*
|
|
* @param m the mapping to load into this map
|
|
* @throws UnsupportedOperationException if the operation is not supported
|
|
* by this map.
|
|
* @throws ClassCastException if a key or value is of the wrong type for
|
|
* adding to this map.
|
|
* @throws IllegalArgumentException if something about a key or value
|
|
* prevents it from existing in this map.
|
|
* @throws NullPointerException if the map forbids null keys or values.
|
|
* @throws NullPointerException if <code>m</code> is null.
|
|
* @see #put(Object, Object)
|
|
*/
|
|
public void putAll(Map<? extends K, ? extends V> m)
|
|
{
|
|
// FIXME: bogus circumlocution.
|
|
Iterator entries2 = m.entrySet().iterator();
|
|
Iterator<Map.Entry<? extends K, ? extends V>> entries
|
|
= (Iterator<Map.Entry<? extends K, ? extends V>>) entries2;
|
|
int pos = m.size();
|
|
while (--pos >= 0)
|
|
{
|
|
Map.Entry<? extends K, ? extends V> entry = entries.next();
|
|
put(entry.getKey(), entry.getValue());
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Removes the mapping for this key if present (optional operation). This
|
|
* implementation iterates over the entrySet searching for a matching
|
|
* key, at which point it calls the iterator's <code>remove</code> method.
|
|
* It returns the result of <code>getValue()</code> on the entry, if found,
|
|
* or null if no entry is found. Note that maps which permit null values
|
|
* may also return null if the key was removed. If the entrySet does not
|
|
* support removal, this will also fail. This is O(n), so many
|
|
* implementations override it for efficiency.
|
|
*
|
|
* @param key the key to remove
|
|
* @return the value the key mapped to, or null if not present.
|
|
* Null may also be returned if null values are allowed
|
|
* in the map and the value of this mapping is null.
|
|
* @throws UnsupportedOperationException if deletion is unsupported
|
|
* @see Iterator#remove()
|
|
*/
|
|
public V remove(Object key)
|
|
{
|
|
Iterator<Map.Entry<K, V>> entries = entrySet().iterator();
|
|
int pos = size();
|
|
while (--pos >= 0)
|
|
{
|
|
Map.Entry<K, V> entry = entries.next();
|
|
if (equals(key, entry.getKey()))
|
|
{
|
|
// Must get the value before we remove it from iterator.
|
|
V r = entry.getValue();
|
|
entries.remove();
|
|
return r;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns the number of key-value mappings in the map. If there are more
|
|
* than Integer.MAX_VALUE mappings, return Integer.MAX_VALUE. This is
|
|
* implemented as <code>entrySet().size()</code>.
|
|
*
|
|
* @return the number of mappings
|
|
* @see Set#size()
|
|
*/
|
|
public int size()
|
|
{
|
|
return entrySet().size();
|
|
}
|
|
|
|
/**
|
|
* Returns a String representation of this map. This is a listing of the
|
|
* map entries (which are specified in Map.Entry as being
|
|
* <code>getKey() + "=" + getValue()</code>), separated by a comma and
|
|
* space (", "), and surrounded by braces ('{' and '}'). This implementation
|
|
* uses a StringBuffer and iterates over the entrySet to build the String.
|
|
* Note that this can fail with an exception if underlying keys or
|
|
* values complete abruptly in toString().
|
|
*
|
|
* @return a String representation
|
|
* @see Map.Entry#toString()
|
|
*/
|
|
public String toString()
|
|
{
|
|
Iterator<Map.Entry<K, V>> entries = entrySet().iterator();
|
|
CPStringBuilder r = new CPStringBuilder("{");
|
|
for (int pos = size(); pos > 0; pos--)
|
|
{
|
|
Map.Entry<K, V> entry = entries.next();
|
|
r.append(entry.getKey());
|
|
r.append('=');
|
|
r.append(entry.getValue());
|
|
if (pos > 1)
|
|
r.append(", ");
|
|
}
|
|
r.append("}");
|
|
return r.toString();
|
|
}
|
|
|
|
/**
|
|
* Returns a collection or bag view of this map's values. The collection
|
|
* is backed by the map, so changes in one show up in the other.
|
|
* Modifications while an iteration is in progress produce undefined
|
|
* behavior. The collection supports removal if entrySet() does, but
|
|
* does not support element addition.
|
|
* <p>
|
|
*
|
|
* This implementation creates an AbstractCollection, where the iterator
|
|
* wraps the entrySet iterator, size defers to the Map's size, and contains
|
|
* defers to the Map's containsValue. The collection is created on first
|
|
* use, and returned on subsequent uses, although since no synchronization
|
|
* occurs, there is a slight possibility of creating two collections.
|
|
*
|
|
* @return a Collection view of the values
|
|
* @see Collection#iterator()
|
|
* @see #size()
|
|
* @see #containsValue(Object)
|
|
* @see #keySet()
|
|
*/
|
|
public Collection<V> values()
|
|
{
|
|
if (values == null)
|
|
values = new AbstractCollection<V>()
|
|
{
|
|
/**
|
|
* Returns the number of values stored in
|
|
* the backing map.
|
|
*
|
|
* @return The number of values.
|
|
*/
|
|
public int size()
|
|
{
|
|
return AbstractMap.this.size();
|
|
}
|
|
|
|
/**
|
|
* Returns true if the backing map contains
|
|
* the supplied value.
|
|
*
|
|
* @param value The value to search for.
|
|
* @return True if the value was found, false otherwise.
|
|
*/
|
|
public boolean contains(Object value)
|
|
{
|
|
return containsValue(value);
|
|
}
|
|
|
|
/**
|
|
* Returns an iterator which iterates over the
|
|
* values in the backing map, by using a wrapper
|
|
* around the iterator returned by <code>entrySet()</code>.
|
|
*
|
|
* @return An iterator over the values.
|
|
*/
|
|
public Iterator<V> iterator()
|
|
{
|
|
return new Iterator<V>()
|
|
{
|
|
/**
|
|
* The iterator returned by <code>entrySet()</code>.
|
|
*/
|
|
private final Iterator<Map.Entry<K, V>> map_iterator
|
|
= entrySet().iterator();
|
|
|
|
/**
|
|
* Returns true if a call to <code>next()</call> will
|
|
* return another value.
|
|
*
|
|
* @return True if the iterator has not yet reached
|
|
* the last value.
|
|
*/
|
|
public boolean hasNext()
|
|
{
|
|
return map_iterator.hasNext();
|
|
}
|
|
|
|
/**
|
|
* Returns the value from the next entry retrieved
|
|
* by the underlying <code>entrySet()</code> iterator.
|
|
*
|
|
* @return The next value.
|
|
*/
|
|
public V next()
|
|
{
|
|
return map_iterator.next().getValue();
|
|
}
|
|
|
|
/**
|
|
* Removes the map entry which has a key equal
|
|
* to that returned by the last call to
|
|
* <code>next()</code>.
|
|
*
|
|
* @throws UnsupportedOperationException if the
|
|
* map doesn't support removal.
|
|
*/
|
|
public void remove()
|
|
{
|
|
map_iterator.remove();
|
|
}
|
|
};
|
|
}
|
|
};
|
|
return values;
|
|
}
|
|
|
|
/**
|
|
* Compare two objects according to Collection semantics.
|
|
*
|
|
* @param o1 the first object
|
|
* @param o2 the second object
|
|
* @return o1 == o2 || (o1 != null && o1.equals(o2))
|
|
*/
|
|
// Package visible for use throughout java.util.
|
|
// It may be inlined since it is final.
|
|
static final boolean equals(Object o1, Object o2)
|
|
{
|
|
return o1 == o2 || (o1 != null && o1.equals(o2));
|
|
}
|
|
|
|
/**
|
|
* Hash an object according to Collection semantics.
|
|
*
|
|
* @param o the object to hash
|
|
* @return o1 == null ? 0 : o1.hashCode()
|
|
*/
|
|
// Package visible for use throughout java.util.
|
|
// It may be inlined since it is final.
|
|
static final int hashCode(Object o)
|
|
{
|
|
return o == null ? 0 : o.hashCode();
|
|
}
|
|
|
|
/**
|
|
* A class which implements Map.Entry. It is shared by HashMap, TreeMap,
|
|
* Hashtable, and Collections. It is not specified by the JDK, but makes
|
|
* life much easier.
|
|
*
|
|
* @author Jon Zeppieri
|
|
* @author Eric Blake (ebb9@email.byu.edu)
|
|
*
|
|
* @since 1.6
|
|
*/
|
|
public static class SimpleEntry<K, V> implements Entry<K, V>, Serializable
|
|
{
|
|
|
|
/**
|
|
* Compatible with JDK 1.6
|
|
*/
|
|
private static final long serialVersionUID = -8499721149061103585L;
|
|
|
|
/**
|
|
* The key. Package visible for direct manipulation.
|
|
*/
|
|
K key;
|
|
|
|
/**
|
|
* The value. Package visible for direct manipulation.
|
|
*/
|
|
V value;
|
|
|
|
/**
|
|
* Basic constructor initializes the fields.
|
|
* @param newKey the key
|
|
* @param newValue the value
|
|
*/
|
|
public SimpleEntry(K newKey, V newValue)
|
|
{
|
|
key = newKey;
|
|
value = newValue;
|
|
}
|
|
|
|
public SimpleEntry(Entry<? extends K, ? extends V> entry)
|
|
{
|
|
this(entry.getKey(), entry.getValue());
|
|
}
|
|
|
|
/**
|
|
* Compares the specified object with this entry. Returns true only if
|
|
* the object is a mapping of identical key and value. In other words,
|
|
* this must be:<br>
|
|
* <pre>(o instanceof Map.Entry)
|
|
* && (getKey() == null ? ((HashMap) o).getKey() == null
|
|
* : getKey().equals(((HashMap) o).getKey()))
|
|
* && (getValue() == null ? ((HashMap) o).getValue() == null
|
|
* : getValue().equals(((HashMap) o).getValue()))</pre>
|
|
*
|
|
* @param o the object to compare
|
|
* @return <code>true</code> if it is equal
|
|
*/
|
|
public boolean equals(Object o)
|
|
{
|
|
if (! (o instanceof Map.Entry))
|
|
return false;
|
|
// Optimize for our own entries.
|
|
if (o instanceof SimpleEntry)
|
|
{
|
|
SimpleEntry e = (SimpleEntry) o;
|
|
return (AbstractMap.equals(key, e.key)
|
|
&& AbstractMap.equals(value, e.value));
|
|
}
|
|
Map.Entry e = (Map.Entry) o;
|
|
return (AbstractMap.equals(key, e.getKey())
|
|
&& AbstractMap.equals(value, e.getValue()));
|
|
}
|
|
|
|
/**
|
|
* Get the key corresponding to this entry.
|
|
*
|
|
* @return the key
|
|
*/
|
|
public K getKey()
|
|
{
|
|
return key;
|
|
}
|
|
|
|
/**
|
|
* Get the value corresponding to this entry. If you already called
|
|
* Iterator.remove(), the behavior undefined, but in this case it works.
|
|
*
|
|
* @return the value
|
|
*/
|
|
public V getValue()
|
|
{
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* Returns the hash code of the entry. This is defined as the exclusive-or
|
|
* of the hashcodes of the key and value (using 0 for null). In other
|
|
* words, this must be:<br>
|
|
* <pre>(getKey() == null ? 0 : getKey().hashCode())
|
|
* ^ (getValue() == null ? 0 : getValue().hashCode())</pre>
|
|
*
|
|
* @return the hash code
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
return (AbstractMap.hashCode(key) ^ AbstractMap.hashCode(value));
|
|
}
|
|
|
|
/**
|
|
* Replaces the value with the specified object. This writes through
|
|
* to the map, unless you have already called Iterator.remove(). It
|
|
* may be overridden to restrict a null value.
|
|
*
|
|
* @param newVal the new value to store
|
|
* @return the old value
|
|
* @throws NullPointerException if the map forbids null values.
|
|
* @throws UnsupportedOperationException if the map doesn't support
|
|
* <code>put()</code>.
|
|
* @throws ClassCastException if the value is of a type unsupported
|
|
* by the map.
|
|
* @throws IllegalArgumentException if something else about this
|
|
* value prevents it being stored in the map.
|
|
*/
|
|
public V setValue(V newVal)
|
|
{
|
|
V r = value;
|
|
value = newVal;
|
|
return r;
|
|
}
|
|
|
|
/**
|
|
* This provides a string representation of the entry. It is of the form
|
|
* "key=value", where string concatenation is used on key and value.
|
|
*
|
|
* @return the string representation
|
|
*/
|
|
public String toString()
|
|
{
|
|
return key + "=" + value;
|
|
}
|
|
} // class SimpleEntry
|
|
|
|
|
|
}
|