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
551 lines
18 KiB
Java
551 lines
18 KiB
Java
/* Translator.java -- Performs MXBean data type translation.
|
|
Copyright (C) 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 gnu.javax.management;
|
|
|
|
import java.lang.reflect.Array;
|
|
import java.lang.reflect.Method;
|
|
import java.lang.reflect.Modifier;
|
|
import java.lang.reflect.ParameterizedType;
|
|
import java.lang.reflect.Proxy;
|
|
import java.lang.reflect.Type;
|
|
|
|
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;
|
|
import java.util.SortedMap;
|
|
import java.util.SortedSet;
|
|
|
|
import javax.management.JMX;
|
|
import javax.management.MBeanServerInvocationHandler;
|
|
|
|
import javax.management.openmbean.ArrayType;
|
|
import javax.management.openmbean.CompositeData;
|
|
import javax.management.openmbean.CompositeDataSupport;
|
|
import javax.management.openmbean.CompositeType;
|
|
import javax.management.openmbean.OpenDataException;
|
|
import javax.management.openmbean.OpenMBeanParameterInfo;
|
|
import javax.management.openmbean.OpenMBeanParameterInfoSupport;
|
|
import javax.management.openmbean.OpenType;
|
|
import javax.management.openmbean.SimpleType;
|
|
import javax.management.openmbean.TabularData;
|
|
import javax.management.openmbean.TabularDataSupport;
|
|
import javax.management.openmbean.TabularType;
|
|
|
|
/**
|
|
* Translates Java data types to their equivalent
|
|
* open data type, and vice versa, according to the
|
|
* {@link javax.management.MXBean} rules.
|
|
*
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
*/
|
|
public final class Translator
|
|
{
|
|
|
|
/**
|
|
* Translates the input Java data types to the equivalent
|
|
* open data types.
|
|
*
|
|
* @param jtypes the Java types supplied as parameters.
|
|
* @param method the method that was called.
|
|
* @return the equivalent open types required by the {@link MXBean}.
|
|
* @throws Throwable if an exception is thrown in performing the
|
|
* conversion.
|
|
*/
|
|
public static final Object[] fromJava(Object[] jtypes, Method method)
|
|
throws Throwable
|
|
{
|
|
Type[] gtypes = method.getGenericParameterTypes();
|
|
Object[] otypes = new Object[jtypes.length];
|
|
for (int a = 0; a < jtypes.length; ++a)
|
|
otypes[a] = fromJava(jtypes[a], gtypes[a]);
|
|
return otypes;
|
|
}
|
|
|
|
/**
|
|
* Translates the input Java data type to the equivalent
|
|
* open data type.
|
|
*
|
|
* @param jtype the Java type supplied as a parameter.
|
|
* @param type the type of the parameter.
|
|
* @return the equivalent open type required by the {@link MXBean}.
|
|
* @throws Throwable if an exception is thrown in performing the
|
|
* conversion.
|
|
*/
|
|
public static final Object fromJava(Object jtype, Type type)
|
|
throws Throwable
|
|
{
|
|
if (jtype == null)
|
|
return null;
|
|
Class<?> jclass = jtype.getClass();
|
|
if (OpenType.ALLOWED_CLASSNAMES_LIST.contains(jclass.getName()))
|
|
return jtype;
|
|
if (jclass.isArray())
|
|
{
|
|
Class<?> ctype = jclass.getComponentType();
|
|
if (ctype.isPrimitive())
|
|
return jtype;
|
|
if (OpenType.ALLOWED_CLASSNAMES_LIST.contains(ctype.getName()))
|
|
return jtype;
|
|
Object[] elems = (Object[]) jtype;
|
|
Object[] celems = new Object[elems.length];
|
|
for (int a = 0; a < elems.length; ++a)
|
|
celems[a] = fromJava(elems[a], elems[a].getClass());
|
|
return makeArraySpecific(celems);
|
|
}
|
|
String tName = getTypeName(type);
|
|
if (jtype instanceof List || jtype instanceof Set ||
|
|
jtype instanceof SortedSet)
|
|
{
|
|
if (jtype instanceof SortedSet)
|
|
{
|
|
ParameterizedType ptype = (ParameterizedType) type;
|
|
Class<?> elemClass = (Class<?>) ptype.getActualTypeArguments()[0];
|
|
if (!Comparable.class.isAssignableFrom(elemClass))
|
|
throw new IllegalArgumentException(jtype + " has a " +
|
|
"non-comparable element " +
|
|
"type, " + elemClass);
|
|
if (((SortedSet<?>) jtype).comparator() != null)
|
|
throw new IllegalArgumentException(jtype + " does not " +
|
|
"use natural ordering.");
|
|
}
|
|
Collection<?> elems = (Collection<?>) jtype;
|
|
int numElems = elems.size();
|
|
Object[] celems = new Object[numElems];
|
|
Iterator<?> i = elems.iterator();
|
|
for (int a = 0; a < numElems; ++a)
|
|
{
|
|
Object elem = i.next();
|
|
celems[a] = fromJava(elem, elem.getClass());
|
|
}
|
|
return makeArraySpecific(celems);
|
|
}
|
|
if (jtype instanceof Enum)
|
|
return ((Enum<?>) jtype).name();
|
|
if (jtype instanceof Map || jtype instanceof SortedMap)
|
|
{
|
|
int lparam = tName.indexOf("<");
|
|
int comma = tName.indexOf(",", lparam);
|
|
int rparam = tName.indexOf(">", comma);
|
|
String key = tName.substring(lparam + 1, comma).trim();
|
|
String value = tName.substring(comma + 1, rparam).trim();
|
|
String typeName = null;
|
|
if (jtype instanceof Map)
|
|
typeName = "java.util.Map" + tName.substring(lparam);
|
|
else
|
|
{
|
|
Class<?> keyClass = Class.forName(key);
|
|
if (!Comparable.class.isAssignableFrom(keyClass))
|
|
throw new IllegalArgumentException(jtype + " has a " +
|
|
"non-comparable element " +
|
|
"type, " + keyClass);
|
|
if (((SortedMap<?,?>) jtype).comparator() != null)
|
|
throw new IllegalArgumentException(jtype + " does not " +
|
|
"use natural ordering.");
|
|
typeName = "java.util.SortedMap" + tName.substring(lparam);
|
|
}
|
|
OpenType<?> k = translate(key).getOpenType();
|
|
OpenType<?> v = translate(value).getOpenType();
|
|
CompositeType rowType = new CompositeType(typeName, typeName,
|
|
new String[] { "key", "value" },
|
|
new String[] { "Map key", "Map value"},
|
|
new OpenType[] {k,v});
|
|
TabularType tabType = new TabularType(typeName, typeName, rowType,
|
|
new String[]{"key"});
|
|
TabularData data = new TabularDataSupport(tabType);
|
|
for (Map.Entry<?,?> entry : ((Map<?,?>) jtype).entrySet())
|
|
{
|
|
try
|
|
{
|
|
data.put(new CompositeDataSupport(rowType,
|
|
new String[] {
|
|
"key",
|
|
"value"
|
|
},
|
|
new Object[] {
|
|
entry.getKey(),
|
|
entry.getValue()
|
|
}));
|
|
}
|
|
catch (OpenDataException e)
|
|
{
|
|
throw (InternalError) (new InternalError("A problem occurred " +
|
|
"converting the map " +
|
|
"to a composite data " +
|
|
"structure.").initCause(e));
|
|
}
|
|
}
|
|
return data;
|
|
}
|
|
if (JMX.isMXBeanInterface(jclass))
|
|
{
|
|
try
|
|
{
|
|
MBeanServerInvocationHandler ih = (MBeanServerInvocationHandler)
|
|
Proxy.getInvocationHandler(jtype);
|
|
return ih.getObjectName();
|
|
}
|
|
catch (IllegalArgumentException e)
|
|
{
|
|
throw new IllegalArgumentException("For a MXBean to be translated " +
|
|
"to an open type, it must be a " +
|
|
"proxy.", e);
|
|
}
|
|
catch (ClassCastException e)
|
|
{
|
|
throw new IllegalArgumentException("For a MXBean to be translated " +
|
|
"to an open type, it must have a " +
|
|
"MBeanServerInvocationHandler.", e);
|
|
}
|
|
}
|
|
/* FIXME: Handle other types */
|
|
throw new IllegalArgumentException("The type, " + jtype +
|
|
", is not convertible.");
|
|
}
|
|
|
|
/**
|
|
* Translates the returned open data type to the value
|
|
* required by the interface.
|
|
*
|
|
* @param otype the open type returned by the method call.
|
|
* @param method the method that was called.
|
|
* @return the equivalent return type required by the interface.
|
|
* @throws Throwable if an exception is thrown in performing the
|
|
* conversion.
|
|
*/
|
|
public static final Object toJava(Object otype, Method method)
|
|
throws Throwable
|
|
{
|
|
Class<?> returnType = method.getReturnType();
|
|
if (returnType.isEnum())
|
|
{
|
|
String ename = (String) otype;
|
|
Enum<?>[] constants = (Enum[]) returnType.getEnumConstants();
|
|
for (Enum<?> c : constants)
|
|
if (c.name().equals(ename))
|
|
return c;
|
|
}
|
|
if (List.class.isAssignableFrom(returnType))
|
|
{
|
|
Object[] elems = (Object[]) otype;
|
|
List<Object> l = new ArrayList<Object>(elems.length);
|
|
for (Object elem : elems)
|
|
l.add(elem);
|
|
return l;
|
|
}
|
|
if (Map.class.isAssignableFrom(returnType))
|
|
{
|
|
TabularData data = (TabularData) otype;
|
|
Map<Object,Object> m = new HashMap<Object,Object>(data.size());
|
|
for (Object val : data.values())
|
|
{
|
|
CompositeData vals = (CompositeData) val;
|
|
m.put(vals.get("key"), vals.get("value"));
|
|
}
|
|
return m;
|
|
}
|
|
try
|
|
{
|
|
Method m = returnType.getMethod("from",
|
|
new Class[]
|
|
{ CompositeData.class });
|
|
return m.invoke(null, (CompositeData) otype);
|
|
}
|
|
catch (NoSuchMethodException e)
|
|
{
|
|
/* Ignored; we expect this if this
|
|
isn't a from(CompositeData) class */
|
|
}
|
|
return otype;
|
|
}
|
|
|
|
/**
|
|
* Creates a new array which has the specific type
|
|
* used by the elements of the original {@link Object}
|
|
* array supplied.
|
|
*
|
|
* @param arr a series of elements in an {@link Object}
|
|
* array.
|
|
* @return the same elements in a new array of the specific
|
|
* type.
|
|
*/
|
|
private static final Object[] makeArraySpecific(Object[] arr)
|
|
{
|
|
Object[] rcelems = (Object[]) Array.newInstance(arr[0].getClass(),
|
|
arr.length);
|
|
System.arraycopy(arr, 0, rcelems, 0, arr.length);
|
|
return rcelems;
|
|
}
|
|
|
|
/**
|
|
* Translates the name of a type into an equivalent
|
|
* {@link javax.management.openmbean.OpenMBeanParameterInfo}
|
|
* that describes it.
|
|
*
|
|
* @param type the type to describe.
|
|
* @return an instance of
|
|
* {@link javax.management.openmbean.OpenMBeanParameterInfo},
|
|
* describing the translated type and limits of the given type.
|
|
* @throws OpenDataException if a type is not open.
|
|
*/
|
|
public static final OpenMBeanParameterInfo translate(String type)
|
|
throws OpenDataException
|
|
{
|
|
if (type.equals("boolean") || type.equals(Boolean.class.getName()))
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
SimpleType.BOOLEAN,
|
|
null,
|
|
new Boolean[] {
|
|
Boolean.TRUE,
|
|
Boolean.FALSE
|
|
});
|
|
if (type.equals("byte") || type.equals(Byte.class.getName()))
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
SimpleType.BYTE,
|
|
null,
|
|
Byte.valueOf(Byte.MIN_VALUE),
|
|
Byte.valueOf(Byte.MAX_VALUE));
|
|
if (type.equals("char") || type.equals(Character.class.getName()))
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
SimpleType.CHARACTER,
|
|
null,
|
|
Character.valueOf(Character.MIN_VALUE),
|
|
Character.valueOf(Character.MAX_VALUE));
|
|
if (type.equals("double") || type.equals(Double.class.getName()))
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
SimpleType.DOUBLE,
|
|
null,
|
|
Double.valueOf(Double.MIN_VALUE),
|
|
Double.valueOf(Double.MAX_VALUE));
|
|
if (type.equals("float") || type.equals(Float.class.getName()))
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
SimpleType.FLOAT,
|
|
null,
|
|
Float.valueOf(Float.MIN_VALUE),
|
|
Float.valueOf(Float.MAX_VALUE));
|
|
if (type.equals("int") || type.equals(Integer.class.getName()))
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
SimpleType.INTEGER,
|
|
null,
|
|
Integer.valueOf(Integer.MIN_VALUE),
|
|
Integer.valueOf(Integer.MAX_VALUE));
|
|
if (type.equals("long") || type.equals(Long.class.getName()))
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
SimpleType.LONG,
|
|
null,
|
|
Long.valueOf(Long.MIN_VALUE),
|
|
Long.valueOf(Long.MAX_VALUE));
|
|
if (type.equals("short") || type.equals(Short.class.getName()))
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
SimpleType.SHORT,
|
|
null,
|
|
Short.valueOf(Short.MIN_VALUE),
|
|
Short.valueOf(Short.MAX_VALUE));
|
|
if (type.equals(String.class.getName()))
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
SimpleType.STRING);
|
|
if (type.equals("void"))
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
SimpleType.VOID);
|
|
if (type.startsWith("java.util.Map"))
|
|
{
|
|
int lparam = type.indexOf("<");
|
|
int comma = type.indexOf(",", lparam);
|
|
int rparam = type.indexOf(">", comma);
|
|
String key = type.substring(lparam + 1, comma).trim();
|
|
OpenType<?> k = translate(key).getOpenType();
|
|
OpenType<?> v = translate(type.substring(comma + 1, rparam).trim()).getOpenType();
|
|
CompositeType ctype = new CompositeType(Map.class.getName(), Map.class.getName(),
|
|
new String[] { "key", "value" },
|
|
new String[] { "Map key", "Map value"},
|
|
new OpenType[] { k, v});
|
|
TabularType ttype = new TabularType(key, key, ctype,
|
|
new String[] { "key" });
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
ttype);
|
|
}
|
|
if (type.startsWith("java.util.List"))
|
|
{
|
|
int lparam = type.indexOf("<");
|
|
int rparam = type.indexOf(">");
|
|
OpenType<?> e = translate(type.substring(lparam + 1, rparam).trim()).getOpenType();
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
new ArrayType<OpenType<?>>(1, e)
|
|
);
|
|
}
|
|
Class<?> c;
|
|
try
|
|
{
|
|
c = Class.forName(type);
|
|
}
|
|
catch (ClassNotFoundException e)
|
|
{
|
|
throw (InternalError)
|
|
(new InternalError("The class for a type used in a management bean " +
|
|
"could not be loaded.").initCause(e));
|
|
}
|
|
if (c.isEnum())
|
|
{
|
|
Object[] values = c.getEnumConstants();
|
|
String[] names = new String[values.length];
|
|
for (int a = 0; a < values.length; ++a)
|
|
names[a] = values[a].toString();
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
SimpleType.STRING,
|
|
null, names);
|
|
}
|
|
if (c.isArray())
|
|
{
|
|
int depth;
|
|
for (depth = 0; c.getName().charAt(depth) == '['; ++depth)
|
|
;
|
|
OpenType<?> ot = getTypeFromClass(c.getComponentType());
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
new ArrayType<OpenType<?>>(depth, ot)
|
|
);
|
|
}
|
|
Method[] methods = c.getDeclaredMethods();
|
|
List<String> names = new ArrayList<String>();
|
|
List<OpenType<?>> types = new ArrayList<OpenType<?>>();
|
|
for (int a = 0; a < methods.length; ++a)
|
|
{
|
|
String name = methods[a].getName();
|
|
if (Modifier.isPublic(methods[a].getModifiers()))
|
|
{
|
|
if (name.startsWith("get"))
|
|
{
|
|
names.add(name.substring(3));
|
|
types.add(getTypeFromClass(methods[a].getReturnType()));
|
|
}
|
|
else if (name.startsWith("is"))
|
|
{
|
|
names.add(name.substring(2));
|
|
types.add(getTypeFromClass(methods[a].getReturnType()));
|
|
}
|
|
}
|
|
}
|
|
if (names.isEmpty())
|
|
throw new OpenDataException("The type used does not have an open type translation.");
|
|
String[] fields = names.toArray(new String[names.size()]);
|
|
CompositeType ctype = new CompositeType(c.getName(), c.getName(),
|
|
fields, fields,
|
|
types.toArray(new OpenType[types.size()]));
|
|
return new OpenMBeanParameterInfoSupport("TransParam",
|
|
"Translated parameter",
|
|
ctype);
|
|
}
|
|
|
|
/**
|
|
* Obtains the {@link javax.management.openmbean.OpenType}
|
|
* for a particular class.
|
|
*
|
|
* @param c the class to obtain the type for.
|
|
* @return the appropriate instance.
|
|
* @throws OpenDataException if the type is not open.
|
|
*/
|
|
private static final OpenType<?> getTypeFromClass(Class<?> c)
|
|
throws OpenDataException
|
|
{
|
|
return Translator.translate(c.getName()).getOpenType();
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Returns the type name according to the rules described
|
|
* in {@link javax.management.MXBean}. Namely, for a type,
|
|
* {@code T}, {@code typename(T)} is computed as follows:
|
|
* </p>
|
|
* <ul>
|
|
* <li>If T is non-generic and not an array, then the value
|
|
* of {@link java.lang.Class#getName()} is returned.</li>
|
|
* <li>If T is an array type, {@code{E[]}, then the type name
|
|
* is {@code typename(E)} followed by an occurrence
|
|
* of {@code '[]'} for each dimension.</li>
|
|
* <li>If T is a generic or parameterized type, the type name
|
|
* is composed of {@code typename(P)}, where {@code P} is the
|
|
* parameterized type name, followed by {@code '<'}, the resulting
|
|
* list of type names of the parameters after applying {@code typename}
|
|
* to each, separated by commas, and {@code '>'}.</li>
|
|
* </ul>
|
|
*
|
|
* @param type the type to return the type name of.
|
|
* @return the type name computed according to the rules above.
|
|
*/
|
|
private static final String getTypeName(Type type)
|
|
{
|
|
if (type instanceof Class)
|
|
{
|
|
Class<?> c = (Class<?>) type;
|
|
if (c.isArray())
|
|
{
|
|
StringBuilder b =
|
|
new StringBuilder(c.getComponentType().getName());
|
|
String normName = c.getName();
|
|
for (int a = 0; a < normName.length(); ++a)
|
|
{
|
|
if (normName.charAt(a) == '[')
|
|
b.append("[]");
|
|
else
|
|
break;
|
|
}
|
|
return b.toString();
|
|
}
|
|
return c.getName();
|
|
}
|
|
return type.toString();
|
|
}
|
|
|
|
}
|