
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
649 lines
23 KiB
Java
649 lines
23 KiB
Java
/* TabularDataSupport.java -- Tables of composite data structures.
|
|
Copyright (C) 2006, 2007 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 javax.management.openmbean;
|
|
|
|
import java.io.Serializable;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Collection;
|
|
import java.util.HashMap;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
|
|
/**
|
|
* Provides an implementation of the {@link TabularData}
|
|
* interface using a {@link java.util.HashMap}.
|
|
*
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
* @since 1.5
|
|
*/
|
|
public class TabularDataSupport
|
|
implements TabularData, Serializable, Cloneable, Map<Object,Object>
|
|
{
|
|
|
|
/**
|
|
* Compatible with JDK 1.5
|
|
*/
|
|
private static final long serialVersionUID = 5720150593236309827L;
|
|
|
|
/**
|
|
* Mapping of rows to column values.
|
|
*
|
|
* @serial the map of rows to column values.
|
|
*/
|
|
private HashMap<Object,Object> dataMap;
|
|
|
|
/**
|
|
* The tabular type which represents this tabular data instance.
|
|
*
|
|
* @serial the type information for this instance.
|
|
*/
|
|
private TabularType tabularType;
|
|
|
|
/**
|
|
* Constructs a new empty {@link TabularDataSupport} with the
|
|
* specified type. The type may not be null. This constructor
|
|
* simply calls the other, with the default initial capacity of
|
|
* <code>101</code> and default load factor of <code>0.75</code>.
|
|
*
|
|
* @param type the tabular type of this tabular data instance.
|
|
* @throws IllegalArgumentException if <code>type</code> is
|
|
* <code>null</code>.
|
|
*/
|
|
public TabularDataSupport(TabularType type)
|
|
{
|
|
this(type, 101, 0.75f);
|
|
}
|
|
|
|
/**
|
|
* Constructs a new empty {@link TabularDataSupport} with the
|
|
* specified type and the supplied initial capacity and load factor
|
|
* being used for the underlying {@link java.util.HashMap}. The
|
|
* type may not be null and the initial capacity and load factor
|
|
* must be positive.
|
|
*
|
|
* @param type the tabular type of this tabular data instance.
|
|
* @param cap the initial capacity of the underlying map.
|
|
* @param lf the load factor of the underlying map.
|
|
* @throws IllegalArgumentException if <code>type</code> is
|
|
* <code>null</code>, or
|
|
* <code>cap</code> or
|
|
* <code>lf</code> are
|
|
* negative.
|
|
*/
|
|
public TabularDataSupport(TabularType type, int cap, float lf)
|
|
{
|
|
if (type == null)
|
|
throw new IllegalArgumentException("The type may not be null.");
|
|
tabularType = type;
|
|
dataMap = new HashMap<Object,Object>(cap, lf);
|
|
}
|
|
|
|
/**
|
|
* Calculates the index the specified {@link CompositeData} value
|
|
* would have, if it was to be added to this {@link TabularData}
|
|
* instance. This method includes a check that the type of the
|
|
* given value is the same as the row type of this instance, but not
|
|
* a check for existing instances of the given value. The value
|
|
* must also not be <code>null</code>. Possible indices are
|
|
* selected by the {@link TabularType#getIndexNames()} method of
|
|
* this instance's tabular type. The returned indices are the
|
|
* values of the fields in the supplied {@link CompositeData}
|
|
* instance that match the names given in the {@link TabularType}.
|
|
*
|
|
* @param val the {@link CompositeData} value whose index should
|
|
* be calculated.
|
|
* @return the index the value would take on, if it were to be added.
|
|
* @throws NullPointerException if the value is <code>null</code>.
|
|
* @throws InvalidOpenTypeException if the value does not match the
|
|
* row type of this instance.
|
|
*/
|
|
public Object[] calculateIndex(CompositeData val)
|
|
{
|
|
if (!(val.getCompositeType().equals(tabularType.getRowType())))
|
|
throw new InvalidOpenTypeException("The type of the given value " +
|
|
"does not match the row type " +
|
|
"of this instance.");
|
|
List<String> indexNames = tabularType.getIndexNames();
|
|
List<String> matchingIndicies = new ArrayList<String>(indexNames.size());
|
|
for (String name : indexNames)
|
|
matchingIndicies.add(val.get(name).toString());
|
|
return matchingIndicies.toArray();
|
|
}
|
|
|
|
/**
|
|
* Removes all {@link CompositeData} values from the table.
|
|
*/
|
|
public void clear()
|
|
{
|
|
dataMap.clear();
|
|
}
|
|
|
|
/**
|
|
* Returns a shallow clone of the information, as obtained by the
|
|
* {@link Object} implementation of {@link Object#clone()}. The map
|
|
* is also cloned, but it still references the same objects.
|
|
*
|
|
* @return a shallow clone of this {@link TabularDataSupport}.
|
|
*/
|
|
@SuppressWarnings("unchecked")
|
|
public Object clone()
|
|
{
|
|
TabularDataSupport clone = null;
|
|
try
|
|
{
|
|
clone = (TabularDataSupport) super.clone();
|
|
clone.setMap((HashMap<Object,Object>) dataMap.clone());
|
|
}
|
|
catch (CloneNotSupportedException e)
|
|
{
|
|
/* This won't happen as we implement Cloneable */
|
|
}
|
|
return clone;
|
|
}
|
|
|
|
/**
|
|
* Returns true iff this instance of the {@link TabularData} class
|
|
* contains a {@link CompositeData} value at the specified index.
|
|
* The method returns <code>false</code> if the given key can
|
|
* not be cast to an {@link java.lang.Object} array; otherwise
|
|
* it returns the result of {@link #containsKey(java.lang.Object[])}.
|
|
*
|
|
*
|
|
* @param key the key to test for.
|
|
* @return true if the key maps to a {@link CompositeData} value.
|
|
*/
|
|
public boolean containsKey(Object key)
|
|
{
|
|
if (key instanceof Object[])
|
|
return containsKey((Object[]) key);
|
|
else
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Returns true iff this instance of the {@link TabularData} class
|
|
* contains a {@link CompositeData} value at the specified index.
|
|
* In any other circumstance, including if the given key
|
|
* is <code>null</code> or of the incorrect type, according to
|
|
* the {@link TabularType} of this instance, this method returns
|
|
* false.
|
|
*
|
|
* @param key the key to test for.
|
|
* @return true if the key maps to a {@link CompositeData} value.
|
|
*/
|
|
public boolean containsKey(Object[] key)
|
|
{
|
|
if (key == null)
|
|
return false;
|
|
if (!(isKeyValid(key)))
|
|
return false;
|
|
return dataMap.containsKey(key);
|
|
}
|
|
|
|
/**
|
|
* Returns true iff this instance of the {@link TabularData} class
|
|
* contains the specified {@link CompositeData} value. If the given
|
|
* value is not an instance of {@link CompositeData}, this method
|
|
* simply returns false.
|
|
*
|
|
* @param val the value to test for.
|
|
* @return true if the value exists.
|
|
*/
|
|
public boolean containsValue(Object val)
|
|
{
|
|
if (val instanceof CompositeData)
|
|
return containsValue((CompositeData) val);
|
|
else
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Returns true iff this instance of the {@link TabularData} class
|
|
* contains the specified {@link CompositeData} value.
|
|
* In any other circumstance, including if the given value
|
|
* is <code>null</code> or of the incorrect type, according to
|
|
* the {@link TabularType} of this instance, this method returns
|
|
* false.
|
|
*
|
|
* @param val the value to test for.
|
|
* @return true if the value exists.
|
|
*/
|
|
public boolean containsValue(CompositeData val)
|
|
{
|
|
if (val == null)
|
|
return false;
|
|
if (!(val.getCompositeType().equals(tabularType.getRowType())))
|
|
return false;
|
|
return dataMap.containsValue(val);
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Returns a set view of the mappings in this Map. Each element in the
|
|
* set is a 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 remove the underlying mapping from the map:
|
|
* <code>Iterator.remove</code>, <code>Set.remove</code>,
|
|
* <code>removeAll</code>, <code>retainAll</code>, and <code>clear</code>.
|
|
* Element addition, via <code>add</code> or <code>addAll</code>, is
|
|
* not supported via this set.
|
|
* </p>
|
|
* <p>
|
|
* <strong>Note</strong>: using the
|
|
* {@link java.util.Map.Entry#setValue(Object) will cause corruption of
|
|
* the index to row mappings.
|
|
* </p>
|
|
*
|
|
* @return the set view of all mapping entries
|
|
* @see java.util.Map.Entry
|
|
*/
|
|
public Set<Map.Entry<Object,Object>> entrySet()
|
|
{
|
|
return dataMap.entrySet();
|
|
}
|
|
|
|
/**
|
|
* Compares the specified object with this object for equality.
|
|
* The object is judged equivalent if it is non-null, and also
|
|
* an instance of {@link TabularData} with the same row type,
|
|
* and {@link CompositeData} values. The two compared instances may
|
|
* be equivalent even if they represent different implementations
|
|
* of {@link TabularData}.
|
|
*
|
|
* @param obj the object to compare for equality.
|
|
* @return true if <code>obj</code> is equal to <code>this</code>.
|
|
*/
|
|
public boolean equals(Object obj)
|
|
{
|
|
if (!(obj instanceof TabularData))
|
|
return false;
|
|
TabularData data = (TabularData) obj;
|
|
return tabularType.equals(data.getTabularType()) &&
|
|
dataMap.values().equals(data.values());
|
|
}
|
|
|
|
/**
|
|
* Retrieves the value for the specified key by simply
|
|
* calling <code>get((Object[]) key)</code>.
|
|
*
|
|
* @param key the key whose value should be returned.
|
|
* @return the matching {@link CompositeData} value, or
|
|
* <code>null</code> if one does not exist.
|
|
* @throws NullPointerException if the key is <code>null</code>.
|
|
* @throws ClassCastException if the key is not an instance
|
|
* of <code>Object[]</code>.
|
|
* @throws InvalidKeyException if the key does not match
|
|
* the {@link TabularType} of this
|
|
* instance.
|
|
*/
|
|
public Object get(Object key)
|
|
{
|
|
return get((Object[]) key);
|
|
}
|
|
|
|
/**
|
|
* Retrieves the {@link CompositeData} value for the specified
|
|
* key, or <code>null</code> if no such mapping exists.
|
|
*
|
|
* @param key the key whose value should be returned.
|
|
* @return the matching {@link CompositeData} value, or
|
|
* <code>null</code> if one does not exist.
|
|
* @throws NullPointerException if the key is <code>null</code>.
|
|
* @throws InvalidKeyException if the key does not match
|
|
* the {@link TabularType} of this
|
|
* instance.
|
|
*/
|
|
public CompositeData get(Object[] key)
|
|
{
|
|
if (!(isKeyValid(key)))
|
|
throw new InvalidKeyException("The key does not match the " +
|
|
"tabular type of this instance.");
|
|
return (CompositeData) dataMap.get(key);
|
|
}
|
|
|
|
/**
|
|
* Returns the tabular type which corresponds to this instance
|
|
* of {@link TabularData}.
|
|
*
|
|
* @return the tabular type for this instance.
|
|
*/
|
|
public TabularType getTabularType()
|
|
{
|
|
return tabularType;
|
|
}
|
|
|
|
/**
|
|
* Returns the hash code of the composite data type. This is
|
|
* computed as the sum of the hash codes of each value, together
|
|
* with the hash code of the tabular type. These are the same
|
|
* elements of the type that are compared as part of the {@link
|
|
* #equals(java.lang.Object)} method, thus ensuring that the
|
|
* hashcode is compatible with the equality test.
|
|
*
|
|
* @return the hash code of this instance.
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
return tabularType.hashCode() + dataMap.values().hashCode();
|
|
}
|
|
|
|
/**
|
|
* Returns true if this {@link TabularData} instance
|
|
* contains no {@link CompositeData} values.
|
|
*
|
|
* @return true if the instance is devoid of rows.
|
|
*/
|
|
public boolean isEmpty()
|
|
{
|
|
return dataMap.isEmpty();
|
|
}
|
|
|
|
/**
|
|
* Returns true if the given key is valid for the
|
|
* @link{TabularType} of this instance.
|
|
*
|
|
* @return true if the key is valid.
|
|
* @throws NullPointerException if <code>key</code>
|
|
* is null.
|
|
*/
|
|
private boolean isKeyValid(Object[] key)
|
|
{
|
|
Iterator<String> it = tabularType.getIndexNames().iterator();
|
|
CompositeType rowType = tabularType.getRowType();
|
|
for (int a = 0; it.hasNext(); ++a)
|
|
{
|
|
OpenType<?> type = rowType.getType(it.next());
|
|
if (!(type.isValue(key[a])))
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Returns a set view of the keys in this Map. 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 remove the underlying mapping from
|
|
* the map: <code>Iterator.remove</code>, <code>Set.remove</code>,
|
|
* <code>removeAll</code>, <code>retainAll</code>, and <code>clear</code>.
|
|
* Element addition, via <code>add</code> or <code>addAll</code>, is
|
|
* not supported via this set.
|
|
*
|
|
* @return the set view of all keys
|
|
*/
|
|
public Set<Object> keySet()
|
|
{
|
|
return dataMap.keySet();
|
|
}
|
|
|
|
/**
|
|
* Adds the specified {@link CompositeData} value to the
|
|
* table. The value must be non-null, of the same type
|
|
* as the row type of this instance, and must not have
|
|
* the same index as an existing value. The index is
|
|
* calculated using the index names of the
|
|
* {@link TabularType} for this instance.
|
|
*
|
|
* @param val the {@link CompositeData} value to add.
|
|
* @throws NullPointerException if <code>val</code> is
|
|
* <code>null</code>.
|
|
* @throws InvalidOpenTypeException if the type of the
|
|
* given value does not
|
|
* match the row type.
|
|
* @throws KeyAlreadyExistsException if the value has the
|
|
* same calculated index
|
|
* as an existing value.
|
|
*/
|
|
public void put(CompositeData val)
|
|
{
|
|
Object[] key = calculateIndex(val);
|
|
if (dataMap.containsKey(key))
|
|
throw new KeyAlreadyExistsException("A value with this index " +
|
|
"already exists.");
|
|
dataMap.put(key, val);
|
|
}
|
|
|
|
/**
|
|
* Adds the specified {@link CompositeData} value to the
|
|
* table, ignoring the supplied key, by simply calling
|
|
* <code>put((CompositeData) val)</code>.
|
|
*
|
|
* @param key ignored.
|
|
* @param val the {@link CompositeData} value to add.
|
|
* @return the {@link CompositeData} value.
|
|
* @throws NullPointerException if <code>val</code> is
|
|
* <code>null</code>.
|
|
* @throws InvalidOpenTypeException if the type of the
|
|
* given value does not
|
|
* match the row type.
|
|
* @throws KeyAlreadyExistsException if the value has the
|
|
* same calculated index
|
|
* as an existing value.
|
|
*/
|
|
public Object put(Object key, Object val)
|
|
{
|
|
put((CompositeData) val);
|
|
return val;
|
|
}
|
|
|
|
/**
|
|
* Adds each of the specified {@link CompositeData} values
|
|
* to the table. Each element of the array must meet the
|
|
* conditions given for the {@link #put(CompositeData)}
|
|
* method. In addition, the index of each value in the
|
|
* array must be distinct from the index of the other
|
|
* values in the array, as well as from the existing values
|
|
* in the table. The operation should be atomic; if one
|
|
* value can not be added, then none of the values should
|
|
* be. If the array is <code>null</code> or empty, the
|
|
* method simply returns.
|
|
*
|
|
* @param vals the {@link CompositeData} values to add.
|
|
* @throws NullPointerException if a value from the array is
|
|
* <code>null</code>.
|
|
* @throws InvalidOpenTypeException if the type of a
|
|
* given value does not
|
|
* match the row type.
|
|
* @throws KeyAlreadyExistsException if a value has the
|
|
* same calculated index
|
|
* as an existing value or
|
|
* of one of the other
|
|
* specified values.
|
|
*/
|
|
public void putAll(CompositeData[] vals)
|
|
{
|
|
if (vals == null || vals.length == 0)
|
|
return;
|
|
Map<Object,Object> mapToAdd = new HashMap<Object,Object>(vals.length);
|
|
for (int a = 0; a < vals.length; ++a)
|
|
{
|
|
Object[] key = calculateIndex(vals[a]);
|
|
if (dataMap.containsKey(key))
|
|
throw new KeyAlreadyExistsException("Element " + a + ": A " +
|
|
"value with this index " +
|
|
"already exists.");
|
|
mapToAdd.put(key, vals[a]);
|
|
}
|
|
dataMap.putAll(mapToAdd);
|
|
}
|
|
|
|
/**
|
|
* Converts each value from the specified map to a member of an
|
|
* array of {@link CompositeData} values and adds them using {@link
|
|
* #put(CompositeData[])}, if possible. As in {@link
|
|
* #put(Object,Object)}, the keys are simply ignored. This method
|
|
* is useful for adding the {@link CompositeData} values from a
|
|
* different {@link TabularData} instance, which uses the same
|
|
* {@link TabularType} but a different selection of index names, to
|
|
* this one. If the map is <code>null</code> or empty, the method
|
|
* simply returns.
|
|
*
|
|
* @param m the map to add. Only the values are used and must
|
|
* all be instances of {@link CompositeData}.
|
|
* @throws NullPointerException if a value from the map is
|
|
* <code>null</code>.
|
|
* @throws ClassCastException if a value from the map is not
|
|
* an instance of {@link CompositeData}.
|
|
* @throws InvalidOpenTypeException if the type of the
|
|
* given value does not
|
|
* match the row type.
|
|
* @throws KeyAlreadyExistsException if the value has the
|
|
* same calculated index
|
|
* as an existing value or
|
|
* of one of the other
|
|
* specified values.
|
|
*/
|
|
public void putAll(Map<?,?> m)
|
|
{
|
|
if (m == null || m.size() == 0)
|
|
return;
|
|
Collection<?> vals = m.values();
|
|
CompositeData[] data = new CompositeData[vals.size()];
|
|
Iterator<?> it = vals.iterator();
|
|
for (int a = 0; it.hasNext(); ++a)
|
|
{
|
|
data[a] = (CompositeData) it.next();
|
|
}
|
|
putAll(data);
|
|
}
|
|
|
|
/**
|
|
* Removes the value for the specified key by simply
|
|
* calling <code>remove((Object[]) key)</code>.
|
|
*
|
|
* @param key the key whose value should be removed.
|
|
* @return the removed value, or <code>null</code> if
|
|
* there is no value for the given key.
|
|
* @throws NullPointerException if the key is <code>null</code>.
|
|
* @throws ClassCastException if the key is not an instance
|
|
* of <code>Object[]</code>.
|
|
* @throws InvalidOpenTypeException if the key does not match
|
|
* the {@link TabularType} of this
|
|
* instance.
|
|
*/
|
|
public Object remove(Object key)
|
|
{
|
|
return remove((Object[]) key);
|
|
}
|
|
|
|
/**
|
|
* Removes the {@link CompositeData} value located at the
|
|
* specified index. <code>null</code> is returned if the
|
|
* value does not exist. Otherwise, the removed value is
|
|
* returned.
|
|
*
|
|
* @param key the key of the value to remove.
|
|
* @return the removed value, or <code>null</code> if
|
|
* there is no value for the given key.
|
|
* @throws NullPointerException if the key is <code>null</code>.
|
|
* @throws InvalidOpenTypeException if the key does not match
|
|
* the {@link TabularType} of this
|
|
* instance.
|
|
*/
|
|
public CompositeData remove(Object[] key)
|
|
{
|
|
if (!(isKeyValid(key)))
|
|
throw new InvalidKeyException("The key does not match the " +
|
|
"tabular type of this instance.");
|
|
return (CompositeData) dataMap.remove(key);
|
|
}
|
|
|
|
/**
|
|
* Private method to set the internal {@link java.util.Map}
|
|
* instance (used in cloning).
|
|
*
|
|
* @param map the new map used.
|
|
*/
|
|
private void setMap(HashMap<Object,Object> map)
|
|
{
|
|
dataMap = map;
|
|
}
|
|
|
|
/**
|
|
* Returns the number of {@link CompositeData} values or rows
|
|
* in the table.
|
|
*
|
|
* @return the number of rows in the table.
|
|
*/
|
|
public int size()
|
|
{
|
|
return dataMap.size();
|
|
}
|
|
|
|
/**
|
|
* Returns a textual representation of this instance. This
|
|
* is constructed using the class name
|
|
* (<code>javax.management.openmbean.TabularDataSupport</code>)
|
|
* and the result of calling <code>toString()</code> on the
|
|
* tabular type and underlying hash map instance.
|
|
*
|
|
* @return a {@link java.lang.String} representation of the
|
|
* object.
|
|
*/
|
|
public String toString()
|
|
{
|
|
return getClass().getName()
|
|
+ "[tabularType=" + tabularType
|
|
+ ",dataMap=" + dataMap
|
|
+ "]";
|
|
}
|
|
|
|
/**
|
|
* Returns a collection (or bag) view of the values in this Map. The
|
|
* collection 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 collection supports removal, these methods
|
|
* remove the underlying mapping from the map: <code>Iterator.remove</code>,
|
|
* <code>Collection.remove</code>, <code>removeAll</code>,
|
|
* <code>retainAll</code>, and <code>clear</code>. Element addition, via
|
|
* <code>add</code> or <code>addAll</code>, is not supported via this
|
|
* collection.
|
|
*
|
|
* @return the collection view of all values
|
|
*/
|
|
public Collection<Object> values()
|
|
{
|
|
return dataMap.values();
|
|
}
|
|
|
|
}
|
|
|