
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
1211 lines
29 KiB
Java
1211 lines
29 KiB
Java
/* DefaultMutableTreeNode.java --
|
|
Copyright (C) 2002, 2004, 2005, 2006, 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.swing.tree;
|
|
|
|
import gnu.java.util.EmptyEnumeration;
|
|
|
|
import java.io.IOException;
|
|
import java.io.ObjectInputStream;
|
|
import java.io.ObjectOutputStream;
|
|
import java.io.Serializable;
|
|
import java.util.ArrayList;
|
|
import java.util.Enumeration;
|
|
import java.util.LinkedList;
|
|
import java.util.NoSuchElementException;
|
|
import java.util.Stack;
|
|
import java.util.Vector;
|
|
|
|
|
|
/**
|
|
* A default implementation of the {@link MutableTreeNode} interface.
|
|
*
|
|
* @author Andrew Selkirk
|
|
* @author Robert Schuster (robertschuster@fsfe.org)
|
|
*/
|
|
public class DefaultMutableTreeNode
|
|
implements Cloneable, MutableTreeNode, Serializable
|
|
{
|
|
private static final long serialVersionUID = -4298474751201349152L;
|
|
|
|
/**
|
|
* An empty enumeration, returned by {@link #children()} if a node has no
|
|
* children.
|
|
*/
|
|
public static final Enumeration<TreeNode> EMPTY_ENUMERATION =
|
|
new EmptyEnumeration<TreeNode>();
|
|
|
|
/**
|
|
* The parent of this node (possibly <code>null</code>).
|
|
*/
|
|
protected MutableTreeNode parent;
|
|
|
|
/**
|
|
* The child nodes for this node (may be empty).
|
|
*/
|
|
protected Vector<MutableTreeNode> children = new Vector<MutableTreeNode>();
|
|
|
|
/**
|
|
* userObject
|
|
*/
|
|
protected transient Object userObject;
|
|
|
|
/**
|
|
* allowsChildren
|
|
*/
|
|
protected boolean allowsChildren;
|
|
|
|
/**
|
|
* Creates a <code>DefaultMutableTreeNode</code> object.
|
|
* This is equivalent to <code>DefaultMutableTreeNode(null, true)</code>.
|
|
*/
|
|
public DefaultMutableTreeNode()
|
|
{
|
|
this(null, true);
|
|
}
|
|
|
|
/**
|
|
* Creates a <code>DefaultMutableTreeNode</code> object with the given
|
|
* user object attached to it. This is equivalent to
|
|
* <code>DefaultMutableTreeNode(userObject, true)</code>.
|
|
*
|
|
* @param userObject the user object (<code>null</code> permitted).
|
|
*/
|
|
public DefaultMutableTreeNode(Object userObject)
|
|
{
|
|
this(userObject, true);
|
|
}
|
|
|
|
/**
|
|
* Creates a <code>DefaultMutableTreeNode</code> object with the given
|
|
* user object attached to it.
|
|
*
|
|
* @param userObject the user object (<code>null</code> permitted).
|
|
* @param allowsChildren <code>true</code> if the code allows to add child
|
|
* nodes, <code>false</code> otherwise
|
|
*/
|
|
public DefaultMutableTreeNode(Object userObject, boolean allowsChildren)
|
|
{
|
|
this.userObject = userObject;
|
|
this.allowsChildren = allowsChildren;
|
|
}
|
|
|
|
/**
|
|
* Returns a clone of the node. The clone contains a shallow copy of the
|
|
* user object, and does not copy the parent node or the child nodes.
|
|
*
|
|
* @return A clone of the node.
|
|
*/
|
|
public Object clone()
|
|
{
|
|
return new DefaultMutableTreeNode(this.userObject, this.allowsChildren);
|
|
}
|
|
|
|
/**
|
|
* Returns a string representation of the node. This implementation returns
|
|
* <code>getUserObject().toString()</code>, or <code>null</code> if there
|
|
* is no user object.
|
|
*
|
|
* @return A string representation of the node (possibly <code>null</code>).
|
|
*/
|
|
public String toString()
|
|
{
|
|
if (userObject == null)
|
|
return null;
|
|
|
|
return userObject.toString();
|
|
}
|
|
|
|
/**
|
|
* Adds a new child node to this node and sets this node as the parent of
|
|
* the child node. The child node must not be an ancestor of this node.
|
|
* If the tree uses the {@link DefaultTreeModel}, you must subsequently
|
|
* call {@link DefaultTreeModel#reload(TreeNode)}.
|
|
*
|
|
* @param child the child node (<code>null</code> not permitted).
|
|
*
|
|
* @throws IllegalStateException if {@link #getAllowsChildren()} returns
|
|
* <code>false</code>.
|
|
* @throws IllegalArgumentException if {@link #isNodeAncestor} returns
|
|
* <code>true</code>.
|
|
* @throws IllegalArgumentException if <code>child</code> is
|
|
* <code>null</code>.
|
|
*/
|
|
public void add(MutableTreeNode child)
|
|
{
|
|
if (! allowsChildren)
|
|
throw new IllegalStateException();
|
|
|
|
if (child == null)
|
|
throw new IllegalArgumentException();
|
|
|
|
if (isNodeAncestor(child))
|
|
throw new IllegalArgumentException("Cannot add ancestor node.");
|
|
|
|
children.add(child);
|
|
child.setParent(this);
|
|
}
|
|
|
|
/**
|
|
* Returns the parent node of this node.
|
|
*
|
|
* @return The parent node (possibly <code>null</code>).
|
|
*/
|
|
public TreeNode getParent()
|
|
{
|
|
return parent;
|
|
}
|
|
|
|
/**
|
|
* Removes the child with the given index from this node.
|
|
*
|
|
* @param index the index (in the range <code>0</code> to
|
|
* <code>getChildCount() - 1</code>).
|
|
*
|
|
* @throws ArrayIndexOutOfBoundsException if <code>index</code> is outside
|
|
* the valid range.
|
|
*/
|
|
public void remove(int index)
|
|
{
|
|
MutableTreeNode child = children.remove(index);
|
|
child.setParent(null);
|
|
}
|
|
|
|
/**
|
|
* Removes the given child from this node and sets its parent to
|
|
* <code>null</code>.
|
|
*
|
|
* @param node the child node (<code>null</code> not permitted).
|
|
*
|
|
* @throws IllegalArgumentException if <code>node</code> is not a child of
|
|
* this node.
|
|
* @throws IllegalArgumentException if <code>node</code> is null.
|
|
*/
|
|
public void remove(MutableTreeNode node)
|
|
{
|
|
if (node == null)
|
|
throw new IllegalArgumentException("Null 'node' argument.");
|
|
if (node.getParent() != this)
|
|
throw new IllegalArgumentException(
|
|
"The given 'node' is not a child of this node.");
|
|
children.remove(node);
|
|
node.setParent(null);
|
|
}
|
|
|
|
/**
|
|
* writeObject
|
|
*
|
|
* @param stream the output stream
|
|
*
|
|
* @exception IOException If an error occurs
|
|
*/
|
|
private void writeObject(ObjectOutputStream stream)
|
|
throws IOException
|
|
{
|
|
// TODO: Implement me.
|
|
}
|
|
|
|
/**
|
|
* readObject
|
|
*
|
|
* @param stream the input stream
|
|
*
|
|
* @exception IOException If an error occurs
|
|
* @exception ClassNotFoundException TODO
|
|
*/
|
|
private void readObject(ObjectInputStream stream)
|
|
throws IOException, ClassNotFoundException
|
|
{
|
|
// TODO: Implement me.
|
|
}
|
|
|
|
/**
|
|
* Inserts given child node at the given index.
|
|
*
|
|
* @param node the child node (<code>null</code> not permitted).
|
|
* @param index the index.
|
|
*
|
|
* @throws IllegalArgumentException if <code>node</code> is
|
|
* </code>null</code>.
|
|
*/
|
|
public void insert(MutableTreeNode node, int index)
|
|
{
|
|
if (! allowsChildren)
|
|
throw new IllegalStateException();
|
|
|
|
if (node == null)
|
|
throw new IllegalArgumentException("Null 'node' argument.");
|
|
|
|
if (isNodeAncestor(node))
|
|
throw new IllegalArgumentException("Cannot insert ancestor node.");
|
|
|
|
children.insertElementAt(node, index);
|
|
}
|
|
|
|
/**
|
|
* Returns a path to this node from the root.
|
|
*
|
|
* @return an array of tree nodes
|
|
*/
|
|
public TreeNode[] getPath()
|
|
{
|
|
return getPathToRoot(this, 0);
|
|
}
|
|
|
|
/**
|
|
* Returns an enumeration containing all children of this node.
|
|
* <code>EMPTY_ENUMERATION</code> is returned if this node has no children.
|
|
*
|
|
* @return an enumeration of tree nodes
|
|
*/
|
|
public Enumeration children()
|
|
{
|
|
if (children.size() == 0)
|
|
return EMPTY_ENUMERATION;
|
|
|
|
return children.elements();
|
|
}
|
|
|
|
/**
|
|
* Set the parent node for this node.
|
|
*
|
|
* @param node the parent node
|
|
*/
|
|
public void setParent(MutableTreeNode node)
|
|
{
|
|
parent = node;
|
|
}
|
|
|
|
/**
|
|
* Returns the child node at a given index.
|
|
*
|
|
* @param index the index
|
|
*
|
|
* @return the child node
|
|
*/
|
|
public TreeNode getChildAt(int index)
|
|
{
|
|
return (TreeNode) children.elementAt(index);
|
|
}
|
|
|
|
/**
|
|
* Returns the number of children of this node.
|
|
*
|
|
* @return the number of children
|
|
*/
|
|
public int getChildCount()
|
|
{
|
|
return children.size();
|
|
}
|
|
|
|
/**
|
|
* Returns the index of the specified child node, or -1 if the node is not
|
|
* in fact a child of this node.
|
|
*
|
|
* @param node the node (<code>null</code> not permitted).
|
|
*
|
|
* @return The index of the specified child node, or -1.
|
|
*
|
|
* @throws IllegalArgumentException if <code>node</code> is <code>null</code>.
|
|
*/
|
|
public int getIndex(TreeNode node)
|
|
{
|
|
if (node == null)
|
|
throw new IllegalArgumentException("Null 'node' argument.");
|
|
return children.indexOf(node);
|
|
}
|
|
|
|
/**
|
|
* Sets the flag that controls whether or not this node allows the addition /
|
|
* insertion of child nodes. If the flag is set to <code>false</code>, any
|
|
* existing children are removed.
|
|
*
|
|
* @param allowsChildren the flag.
|
|
*/
|
|
public void setAllowsChildren(boolean allowsChildren)
|
|
{
|
|
if (!allowsChildren)
|
|
removeAllChildren();
|
|
this.allowsChildren = allowsChildren;
|
|
}
|
|
|
|
/**
|
|
* getAllowsChildren
|
|
*
|
|
* @return boolean
|
|
*/
|
|
public boolean getAllowsChildren()
|
|
{
|
|
return allowsChildren;
|
|
}
|
|
|
|
/**
|
|
* Sets the user object for this node
|
|
*
|
|
* @param userObject the user object
|
|
*/
|
|
public void setUserObject(Object userObject)
|
|
{
|
|
this.userObject = userObject;
|
|
}
|
|
|
|
/**
|
|
* Returns the user object attached to this node. <code>null</code> is
|
|
* returned when no user object is set.
|
|
*
|
|
* @return the user object
|
|
*/
|
|
public Object getUserObject()
|
|
{
|
|
return userObject;
|
|
}
|
|
|
|
/**
|
|
* Removes this node from its parent.
|
|
*/
|
|
public void removeFromParent()
|
|
{
|
|
parent.remove(this);
|
|
parent = null;
|
|
}
|
|
|
|
/**
|
|
* Removes all child nodes from this node.
|
|
*/
|
|
public void removeAllChildren()
|
|
{
|
|
for (int i = getChildCount() - 1; i >= 0; i--)
|
|
remove(i);
|
|
}
|
|
|
|
/**
|
|
* Returns <code>true</code> if <code>node</code> is an ancestor of this
|
|
* tree node, and <code>false</code> otherwise. An ancestor node is any of:
|
|
* <ul>
|
|
* <li>this tree node;</li>
|
|
* <li>the parent node (if there is one);</li>
|
|
* <li>any ancestor of the parent node;</li>
|
|
* </ul>
|
|
* If <code>node</code> is <code>null</code>, this method returns
|
|
* <code>false</code>.
|
|
*
|
|
* @param node the node (<code>null</code> permitted).
|
|
*
|
|
* @return A boolean.
|
|
*/
|
|
public boolean isNodeAncestor(TreeNode node)
|
|
{
|
|
if (node == null)
|
|
return false;
|
|
|
|
TreeNode current = this;
|
|
|
|
while (current != null && current != node)
|
|
current = current.getParent();
|
|
|
|
return current == node;
|
|
}
|
|
|
|
/**
|
|
* Returns <code>true</code> if <code>node</code> is a descendant of this
|
|
* tree node, and <code>false</code> otherwise. A descendant node is any of:
|
|
* <ul>
|
|
* <li>this tree node;</li>
|
|
* <li>the child nodes belonging to this tree node, if there are any;</li>
|
|
* <li>any descendants of the child nodes;</li>
|
|
* </ul>
|
|
* If <code>node</code> is <code>null</code>, this method returns
|
|
* <code>false</code>.
|
|
*
|
|
* @param node the node (<code>null</code> permitted).
|
|
*
|
|
* @return A boolean.
|
|
*/
|
|
public boolean isNodeDescendant(DefaultMutableTreeNode node)
|
|
{
|
|
if (node == null)
|
|
return false;
|
|
|
|
TreeNode current = node;
|
|
|
|
while (current != null
|
|
&& current != this)
|
|
current = current.getParent();
|
|
|
|
return current == this;
|
|
}
|
|
|
|
/**
|
|
* getSharedAncestor
|
|
*
|
|
* @param node TODO
|
|
*
|
|
* @return TreeNode
|
|
*/
|
|
public TreeNode getSharedAncestor(DefaultMutableTreeNode node)
|
|
{
|
|
TreeNode current = this;
|
|
ArrayList<TreeNode> list = new ArrayList<TreeNode>();
|
|
|
|
while (current != null)
|
|
{
|
|
list.add(current);
|
|
current = current.getParent();
|
|
}
|
|
|
|
current = node;
|
|
|
|
while (current != null)
|
|
{
|
|
if (list.contains(current))
|
|
return current;
|
|
|
|
current = current.getParent();
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* isNodeRelated
|
|
*
|
|
* @param node TODO
|
|
*
|
|
* @return boolean
|
|
*/
|
|
public boolean isNodeRelated(DefaultMutableTreeNode node)
|
|
{
|
|
if (node == null)
|
|
return false;
|
|
|
|
return node.getRoot() == getRoot();
|
|
}
|
|
|
|
/**
|
|
* getDepth
|
|
*
|
|
* @return int
|
|
*/
|
|
public int getDepth()
|
|
{
|
|
if ((! allowsChildren)
|
|
|| children.size() == 0)
|
|
return 0;
|
|
|
|
Stack<Integer> stack = new Stack<Integer>();
|
|
stack.push(new Integer(0));
|
|
TreeNode node = getChildAt(0);
|
|
int depth = 0;
|
|
int current = 1;
|
|
|
|
while (! stack.empty())
|
|
{
|
|
if (node.getChildCount() != 0)
|
|
{
|
|
node = node.getChildAt(0);
|
|
stack.push(new Integer(0));
|
|
current++;
|
|
}
|
|
else
|
|
{
|
|
if (current > depth)
|
|
depth = current;
|
|
|
|
int size;
|
|
int index;
|
|
|
|
do
|
|
{
|
|
node = node.getParent();
|
|
size = node.getChildCount();
|
|
index = stack.pop().intValue() + 1;
|
|
current--;
|
|
}
|
|
while (index >= size
|
|
&& node != this);
|
|
|
|
if (index < size)
|
|
{
|
|
node = node.getChildAt(index);
|
|
stack.push(new Integer(index));
|
|
current++;
|
|
}
|
|
}
|
|
}
|
|
|
|
return depth;
|
|
}
|
|
|
|
/**
|
|
* getLevel
|
|
*
|
|
* @return int
|
|
*/
|
|
public int getLevel()
|
|
{
|
|
int count = -1;
|
|
TreeNode current = this;
|
|
|
|
do
|
|
{
|
|
current = current.getParent();
|
|
count++;
|
|
}
|
|
while (current != null);
|
|
|
|
return count;
|
|
}
|
|
|
|
/**
|
|
* getPathToRoot
|
|
*
|
|
* @param node TODO
|
|
* @param depth TODO
|
|
*
|
|
* @return TreeNode[]
|
|
*/
|
|
protected TreeNode[] getPathToRoot(TreeNode node, int depth)
|
|
{
|
|
if (node == null)
|
|
{
|
|
if (depth == 0)
|
|
return null;
|
|
|
|
return new TreeNode[depth];
|
|
}
|
|
|
|
TreeNode[] path = getPathToRoot(node.getParent(), depth + 1);
|
|
path[path.length - depth - 1] = node;
|
|
return path;
|
|
}
|
|
|
|
/**
|
|
* getUserObjectPath
|
|
*
|
|
* @return Object[]
|
|
*/
|
|
public Object[] getUserObjectPath()
|
|
{
|
|
TreeNode[] path = getPathToRoot(this, 0);
|
|
Object[] object = new Object[path.length];
|
|
|
|
for (int index = 0; index < path.length; ++index)
|
|
object[index] = ((DefaultMutableTreeNode) path[index]).getUserObject();
|
|
|
|
return object;
|
|
}
|
|
|
|
/**
|
|
* Returns the root node by iterating the parents of this node.
|
|
*
|
|
* @return the root node
|
|
*/
|
|
public TreeNode getRoot()
|
|
{
|
|
TreeNode current = this;
|
|
TreeNode check = current.getParent();
|
|
|
|
while (check != null)
|
|
{
|
|
current = check;
|
|
check = current.getParent();
|
|
}
|
|
|
|
return current;
|
|
}
|
|
|
|
/**
|
|
* Tells whether this node is the root node or not.
|
|
*
|
|
* @return <code>true</code> if this is the root node,
|
|
* <code>false</code>otherwise
|
|
*/
|
|
public boolean isRoot()
|
|
{
|
|
return parent == null;
|
|
}
|
|
|
|
/**
|
|
* getNextNode
|
|
*
|
|
* @return DefaultMutableTreeNode
|
|
*/
|
|
public DefaultMutableTreeNode getNextNode()
|
|
{
|
|
// Return first child.
|
|
if (getChildCount() != 0)
|
|
return (DefaultMutableTreeNode) getChildAt(0);
|
|
|
|
// Return next sibling (if needed the sibling of some parent).
|
|
DefaultMutableTreeNode node = this;
|
|
DefaultMutableTreeNode sibling;
|
|
|
|
do
|
|
{
|
|
sibling = node.getNextSibling();
|
|
node = (DefaultMutableTreeNode) node.getParent();
|
|
}
|
|
while (sibling == null &&
|
|
node != null);
|
|
|
|
// Return sibling.
|
|
return sibling;
|
|
}
|
|
|
|
/**
|
|
* getPreviousNode
|
|
*
|
|
* @return DefaultMutableTreeNode
|
|
*/
|
|
public DefaultMutableTreeNode getPreviousNode()
|
|
{
|
|
// Return null if no parent.
|
|
if (parent == null)
|
|
return null;
|
|
|
|
DefaultMutableTreeNode sibling = getPreviousSibling();
|
|
|
|
// Return parent if no sibling.
|
|
if (sibling == null)
|
|
return (DefaultMutableTreeNode) parent;
|
|
|
|
// Return last leaf of sibling.
|
|
if (sibling.getChildCount() != 0)
|
|
return sibling.getLastLeaf();
|
|
|
|
// Return sibling.
|
|
return sibling;
|
|
}
|
|
|
|
/**
|
|
* preorderEnumeration
|
|
*
|
|
* @return Enumeration
|
|
*/
|
|
public Enumeration preorderEnumeration()
|
|
{
|
|
return new PreorderEnumeration(this);
|
|
}
|
|
|
|
/**
|
|
* postorderEnumeration
|
|
*
|
|
* @return Enumeration
|
|
*/
|
|
public Enumeration postorderEnumeration()
|
|
{
|
|
return new PostorderEnumeration(this);
|
|
}
|
|
|
|
/**
|
|
* breadthFirstEnumeration
|
|
*
|
|
* @return Enumeration
|
|
*/
|
|
public Enumeration breadthFirstEnumeration()
|
|
{
|
|
return new BreadthFirstEnumeration(this);
|
|
}
|
|
|
|
/**
|
|
* depthFirstEnumeration
|
|
*
|
|
* @return Enumeration
|
|
*/
|
|
public Enumeration depthFirstEnumeration()
|
|
{
|
|
return postorderEnumeration();
|
|
}
|
|
|
|
/**
|
|
* pathFromAncestorEnumeration
|
|
*
|
|
* @param node TODO
|
|
*
|
|
* @return Enumeration
|
|
*/
|
|
public Enumeration pathFromAncestorEnumeration(TreeNode node)
|
|
{
|
|
if (node == null)
|
|
throw new IllegalArgumentException();
|
|
|
|
TreeNode parent = this;
|
|
Vector<TreeNode> nodes = new Vector<TreeNode>();
|
|
nodes.add(this);
|
|
|
|
while (parent != node && parent != null)
|
|
{
|
|
parent = parent.getParent();
|
|
nodes.add(0, parent);
|
|
}
|
|
|
|
if (parent != node)
|
|
throw new IllegalArgumentException();
|
|
|
|
return nodes.elements();
|
|
}
|
|
|
|
/**
|
|
* Returns <code>true</code> if <code>node</code> is a child of this tree
|
|
* node, and <code>false</code> otherwise. If <code>node</code> is
|
|
* <code>null</code>, this method returns <code>false</code>.
|
|
*
|
|
* @param node the node (<code>null</code> permitted).
|
|
*
|
|
* @return A boolean.
|
|
*/
|
|
public boolean isNodeChild(TreeNode node)
|
|
{
|
|
if (node == null)
|
|
return false;
|
|
|
|
return node.getParent() == this;
|
|
}
|
|
|
|
/**
|
|
* Returns the first child node belonging to this tree node.
|
|
*
|
|
* @return The first child node.
|
|
*
|
|
* @throws NoSuchElementException if this tree node has no children.
|
|
*/
|
|
public TreeNode getFirstChild()
|
|
{
|
|
return (TreeNode) children.firstElement();
|
|
}
|
|
|
|
/**
|
|
* Returns the last child node belonging to this tree node.
|
|
*
|
|
* @return The last child node.
|
|
*
|
|
* @throws NoSuchElementException if this tree node has no children.
|
|
*/
|
|
public TreeNode getLastChild()
|
|
{
|
|
return (TreeNode) children.lastElement();
|
|
}
|
|
|
|
/**
|
|
* Returns the next child after the specified <code>node</code>, or
|
|
* <code>null</code> if there is no child after the specified
|
|
* <code>node</code>.
|
|
*
|
|
* @param node a child of this node (<code>null</code> not permitted).
|
|
*
|
|
* @return The next child, or <code>null</code>.
|
|
*
|
|
* @throws IllegalArgumentException if <code>node</code> is not a child of
|
|
* this node, or is <code>null</code>.
|
|
*/
|
|
public TreeNode getChildAfter(TreeNode node)
|
|
{
|
|
if (node == null || node.getParent() != this)
|
|
throw new IllegalArgumentException();
|
|
|
|
int index = getIndex(node) + 1;
|
|
|
|
if (index == getChildCount())
|
|
return null;
|
|
|
|
return getChildAt(index);
|
|
}
|
|
|
|
/**
|
|
* Returns the previous child before the specified <code>node</code>, or
|
|
* <code>null</code> if there is no child before the specified
|
|
* <code>node</code>.
|
|
*
|
|
* @param node a child of this node (<code>null</code> not permitted).
|
|
*
|
|
* @return The previous child, or <code>null</code>.
|
|
*
|
|
* @throws IllegalArgumentException if <code>node</code> is not a child of
|
|
* this node, or is <code>null</code>.
|
|
*/
|
|
public TreeNode getChildBefore(TreeNode node)
|
|
{
|
|
if (node == null || node.getParent() != this)
|
|
throw new IllegalArgumentException();
|
|
|
|
int index = getIndex(node) - 1;
|
|
|
|
if (index < 0)
|
|
return null;
|
|
|
|
return getChildAt(index);
|
|
}
|
|
|
|
/**
|
|
* Returns <code>true</code> if this tree node and <code>node</code> share
|
|
* the same parent. If <code>node</code> is this tree node, the method
|
|
* returns <code>true</code> and if <code>node</code> is <code>null</code>
|
|
* this method returns <code>false</code>.
|
|
*
|
|
* @param node the node (<code>null</code> permitted).
|
|
*
|
|
* @return A boolean.
|
|
*/
|
|
public boolean isNodeSibling(TreeNode node)
|
|
{
|
|
if (node == null)
|
|
return false;
|
|
if (node == this)
|
|
return true;
|
|
return node.getParent() == getParent() && getParent() != null;
|
|
}
|
|
|
|
/**
|
|
* Returns the number of siblings for this tree node. If the tree node has
|
|
* a parent, this method returns the child count for the parent, otherwise
|
|
* it returns <code>1</code>.
|
|
*
|
|
* @return The sibling count.
|
|
*/
|
|
public int getSiblingCount()
|
|
{
|
|
if (parent == null)
|
|
return 1;
|
|
|
|
return parent.getChildCount();
|
|
}
|
|
|
|
/**
|
|
* Returns the next sibling for this tree node. If this node has no parent,
|
|
* or this node is the last child of its parent, this method returns
|
|
* <code>null</code>.
|
|
*
|
|
* @return The next sibling, or <code>null</code>.
|
|
*/
|
|
public DefaultMutableTreeNode getNextSibling()
|
|
{
|
|
if (parent == null)
|
|
return null;
|
|
|
|
int index = parent.getIndex(this) + 1;
|
|
|
|
if (index == parent.getChildCount())
|
|
return null;
|
|
|
|
return (DefaultMutableTreeNode) parent.getChildAt(index);
|
|
}
|
|
|
|
/**
|
|
* Returns the previous sibling for this tree node. If this node has no
|
|
* parent, or this node is the first child of its parent, this method returns
|
|
* <code>null</code>.
|
|
*
|
|
* @return The previous sibling, or <code>null</code>.
|
|
*/
|
|
public DefaultMutableTreeNode getPreviousSibling()
|
|
{
|
|
if (parent == null)
|
|
return null;
|
|
|
|
int index = parent.getIndex(this) - 1;
|
|
|
|
if (index < 0)
|
|
return null;
|
|
|
|
return (DefaultMutableTreeNode) parent.getChildAt(index);
|
|
}
|
|
|
|
/**
|
|
* Returns <code>true</code> if this tree node is a lead node (that is, it
|
|
* has no children), and <code>false</otherwise>.
|
|
*
|
|
* @return A boolean.
|
|
*/
|
|
public boolean isLeaf()
|
|
{
|
|
return children.size() == 0;
|
|
}
|
|
|
|
/**
|
|
* Returns the first leaf node that is a descendant of this node. Recall
|
|
* that a node is its own descendant, so if this node has no children then
|
|
* it is returned as the first leaf.
|
|
*
|
|
* @return The first leaf node.
|
|
*/
|
|
public DefaultMutableTreeNode getFirstLeaf()
|
|
{
|
|
TreeNode current = this;
|
|
|
|
while (current.getChildCount() > 0)
|
|
current = current.getChildAt(0);
|
|
|
|
return (DefaultMutableTreeNode) current;
|
|
}
|
|
|
|
/**
|
|
* Returns the last leaf node that is a descendant of this node. Recall
|
|
* that a node is its own descendant, so if this node has no children then
|
|
* it is returned as the last leaf.
|
|
*
|
|
* @return The first leaf node.
|
|
*/
|
|
public DefaultMutableTreeNode getLastLeaf()
|
|
{
|
|
TreeNode current = this;
|
|
int size = current.getChildCount();
|
|
|
|
while (size > 0)
|
|
{
|
|
current = current.getChildAt(size - 1);
|
|
size = current.getChildCount();
|
|
}
|
|
|
|
return (DefaultMutableTreeNode) current;
|
|
}
|
|
|
|
/**
|
|
* Returns the next leaf node after this tree node.
|
|
*
|
|
* @return The next leaf node, or <code>null</code>.
|
|
*/
|
|
public DefaultMutableTreeNode getNextLeaf()
|
|
{
|
|
// if there is a next sibling, return its first leaf
|
|
DefaultMutableTreeNode sibling = getNextSibling();
|
|
if (sibling != null)
|
|
return sibling.getFirstLeaf();
|
|
// otherwise move up one level and try again...
|
|
if (parent != null)
|
|
return ((DefaultMutableTreeNode) parent).getNextLeaf();
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns the previous leaf node before this tree node.
|
|
*
|
|
* @return The previous leaf node, or <code>null</code>.
|
|
*/
|
|
public DefaultMutableTreeNode getPreviousLeaf()
|
|
{
|
|
// if there is a previous sibling, return its last leaf
|
|
DefaultMutableTreeNode sibling = getPreviousSibling();
|
|
if (sibling != null)
|
|
return sibling.getLastLeaf();
|
|
// otherwise move up one level and try again...
|
|
if (parent != null)
|
|
return ((DefaultMutableTreeNode) parent).getPreviousLeaf();
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* getLeafCount
|
|
*
|
|
* @return int
|
|
*/
|
|
public int getLeafCount()
|
|
{
|
|
int count = 0;
|
|
Enumeration e = depthFirstEnumeration();
|
|
|
|
while (e.hasMoreElements())
|
|
{
|
|
TreeNode current = (TreeNode) e.nextElement();
|
|
|
|
if (current.isLeaf())
|
|
count++;
|
|
}
|
|
|
|
return count;
|
|
}
|
|
|
|
/** Provides an enumeration of a tree in breadth-first traversal
|
|
* order.
|
|
*/
|
|
static class BreadthFirstEnumeration implements Enumeration<TreeNode>
|
|
{
|
|
|
|
LinkedList<TreeNode> queue = new LinkedList<TreeNode>();
|
|
|
|
BreadthFirstEnumeration(TreeNode node)
|
|
{
|
|
queue.add(node);
|
|
}
|
|
|
|
public boolean hasMoreElements()
|
|
{
|
|
return !queue.isEmpty();
|
|
}
|
|
|
|
@SuppressWarnings("unchecked")
|
|
public TreeNode nextElement()
|
|
{
|
|
if (queue.isEmpty())
|
|
throw new NoSuchElementException("No more elements left.");
|
|
|
|
TreeNode node = queue.removeFirst();
|
|
|
|
Enumeration<TreeNode> children =
|
|
(Enumeration<TreeNode>) node.children();
|
|
while (children.hasMoreElements())
|
|
queue.add(children.nextElement());
|
|
|
|
return node;
|
|
}
|
|
}
|
|
|
|
/** Provides an enumeration of a tree traversing it
|
|
* preordered.
|
|
*/
|
|
static class PreorderEnumeration implements Enumeration<TreeNode>
|
|
{
|
|
TreeNode next;
|
|
|
|
Stack<Enumeration<TreeNode>> childrenEnums =
|
|
new Stack<Enumeration<TreeNode>>();
|
|
|
|
@SuppressWarnings("unchecked")
|
|
PreorderEnumeration(TreeNode node)
|
|
{
|
|
next = node;
|
|
childrenEnums.push((Enumeration<TreeNode>) node.children());
|
|
}
|
|
|
|
public boolean hasMoreElements()
|
|
{
|
|
return next != null;
|
|
}
|
|
|
|
public TreeNode nextElement()
|
|
{
|
|
if (next == null)
|
|
throw new NoSuchElementException("No more elements left.");
|
|
|
|
TreeNode current = next;
|
|
|
|
Enumeration<TreeNode> children = childrenEnums.peek();
|
|
|
|
// Retrieves the next element.
|
|
next = traverse(children);
|
|
|
|
return current;
|
|
}
|
|
|
|
@SuppressWarnings("unchecked")
|
|
private TreeNode traverse(Enumeration<TreeNode> children)
|
|
{
|
|
// If more children are available step down.
|
|
if (children.hasMoreElements())
|
|
{
|
|
TreeNode child = children.nextElement();
|
|
childrenEnums.push((Enumeration<TreeNode>) child.children());
|
|
|
|
return child;
|
|
}
|
|
|
|
// If no children are left, we return to a higher level.
|
|
childrenEnums.pop();
|
|
|
|
// If there are no more levels left, there is no next
|
|
// element to return.
|
|
if (childrenEnums.isEmpty())
|
|
return null;
|
|
else
|
|
{
|
|
return traverse(childrenEnums.peek());
|
|
}
|
|
}
|
|
}
|
|
|
|
/** Provides an enumeration of a tree traversing it
|
|
* postordered (= depth-first).
|
|
*/
|
|
static class PostorderEnumeration implements Enumeration<TreeNode>
|
|
{
|
|
|
|
Stack<TreeNode> nodes = new Stack<TreeNode>();
|
|
Stack<Enumeration<TreeNode>> childrenEnums =
|
|
new Stack<Enumeration<TreeNode>>();
|
|
|
|
@SuppressWarnings("unchecked")
|
|
PostorderEnumeration(TreeNode node)
|
|
{
|
|
nodes.push(node);
|
|
childrenEnums.push((Enumeration<TreeNode>) node.children());
|
|
}
|
|
|
|
public boolean hasMoreElements()
|
|
{
|
|
return !nodes.isEmpty();
|
|
}
|
|
|
|
public TreeNode nextElement()
|
|
{
|
|
if (nodes.isEmpty())
|
|
throw new NoSuchElementException("No more elements left!");
|
|
|
|
Enumeration<TreeNode> children = childrenEnums.peek();
|
|
|
|
return traverse(children);
|
|
}
|
|
|
|
@SuppressWarnings("unchecked")
|
|
private TreeNode traverse(Enumeration<TreeNode> children)
|
|
{
|
|
if (children.hasMoreElements())
|
|
{
|
|
TreeNode node = children.nextElement();
|
|
nodes.push(node);
|
|
|
|
Enumeration<TreeNode> newChildren =
|
|
(Enumeration<TreeNode>) node.children();
|
|
childrenEnums.push(newChildren);
|
|
|
|
return traverse(newChildren);
|
|
}
|
|
else
|
|
{
|
|
childrenEnums.pop();
|
|
|
|
// Returns the node whose children
|
|
// have all been visited. (= postorder)
|
|
TreeNode next = nodes.peek();
|
|
nodes.pop();
|
|
|
|
return next;
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
}
|