2005-07-16 00:30:23 +00:00
|
|
|
/* DefaultTreeSelectionModel.java
|
2006-05-18 17:29:21 +00:00
|
|
|
Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
|
2005-07-16 00:30:23 +00:00
|
|
|
|
|
|
|
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. */
|
|
|
|
|
2006-05-18 17:29:21 +00:00
|
|
|
|
2005-07-16 00:30:23 +00:00
|
|
|
package javax.swing.tree;
|
|
|
|
|
re PR libgcj/37636 (java tools are unable to find resource files)
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
2008-10-21 17:55:01 +00:00
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
|
2005-07-16 00:30:23 +00:00
|
|
|
import java.beans.PropertyChangeListener;
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.io.ObjectInputStream;
|
|
|
|
import java.io.ObjectOutputStream;
|
|
|
|
import java.io.Serializable;
|
2006-05-18 17:29:21 +00:00
|
|
|
import java.util.Arrays;
|
2007-01-09 19:58:05 +00:00
|
|
|
import java.util.BitSet;
|
2005-07-16 00:30:23 +00:00
|
|
|
import java.util.EventListener;
|
2006-05-18 17:29:21 +00:00
|
|
|
import java.util.HashSet;
|
|
|
|
import java.util.Iterator;
|
2005-07-16 00:30:23 +00:00
|
|
|
import java.util.Vector;
|
|
|
|
|
|
|
|
import javax.swing.DefaultListSelectionModel;
|
|
|
|
import javax.swing.event.EventListenerList;
|
|
|
|
import javax.swing.event.SwingPropertyChangeSupport;
|
|
|
|
import javax.swing.event.TreeSelectionEvent;
|
|
|
|
import javax.swing.event.TreeSelectionListener;
|
|
|
|
|
|
|
|
/**
|
2006-05-18 17:29:21 +00:00
|
|
|
* The implementation of the default tree selection model. The installed
|
|
|
|
* listeners are notified about the path and not the row changes. If you
|
|
|
|
* specifically need to track the row changes, register the listener for the
|
|
|
|
* expansion events.
|
2005-07-16 00:30:23 +00:00
|
|
|
*
|
|
|
|
* @author Andrew Selkirk
|
2006-05-18 17:29:21 +00:00
|
|
|
* @author Audrius Meskauskas
|
2005-07-16 00:30:23 +00:00
|
|
|
*/
|
|
|
|
public class DefaultTreeSelectionModel
|
2006-05-18 17:29:21 +00:00
|
|
|
implements Cloneable, Serializable, TreeSelectionModel
|
2005-07-16 00:30:23 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* According to the API docs, the method
|
|
|
|
* {@link DefaultTreeSelectionModel#notifyPathChange} should
|
|
|
|
* expect instances of a class PathPlaceHolder in the Vector parameter.
|
|
|
|
* This seems to be a non-public class, so I can only make guesses about the
|
|
|
|
* use of it.
|
|
|
|
*/
|
|
|
|
private static class PathPlaceHolder
|
|
|
|
{
|
|
|
|
/**
|
|
|
|
* The path that we wrap.
|
|
|
|
*/
|
|
|
|
TreePath path;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Indicates if the path is new or already in the selection.
|
|
|
|
*/
|
|
|
|
boolean isNew;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Creates a new instance.
|
|
|
|
*
|
|
|
|
* @param p the path to wrap
|
|
|
|
* @param n if the path is new or already in the selection
|
|
|
|
*/
|
|
|
|
PathPlaceHolder(TreePath p, boolean n)
|
|
|
|
{
|
|
|
|
path = p;
|
|
|
|
isNew = n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-05-18 17:29:21 +00:00
|
|
|
/**
|
|
|
|
* Use serialVersionUID for interoperability.
|
|
|
|
*/
|
|
|
|
static final long serialVersionUID = 3288129636638950196L;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The name of the selection mode property.
|
|
|
|
*/
|
|
|
|
public static final String SELECTION_MODE_PROPERTY = "selectionMode";
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Our Swing property change support.
|
|
|
|
*/
|
|
|
|
protected SwingPropertyChangeSupport changeSupport;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The current selection.
|
|
|
|
*/
|
|
|
|
protected TreePath[] selection;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Our TreeSelectionListeners.
|
|
|
|
*/
|
|
|
|
protected EventListenerList listenerList;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The current RowMapper.
|
|
|
|
*/
|
|
|
|
protected transient RowMapper rowMapper;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The current listSelectionModel.
|
|
|
|
*/
|
|
|
|
protected DefaultListSelectionModel listSelectionModel;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The current selection mode.
|
|
|
|
*/
|
|
|
|
protected int selectionMode;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The path that has been added last.
|
|
|
|
*/
|
|
|
|
protected TreePath leadPath;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The index of the last added path.
|
|
|
|
*/
|
|
|
|
protected int leadIndex;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The row of the last added path according to the RowMapper.
|
|
|
|
*/
|
|
|
|
protected int leadRow = -1;
|
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
/**
|
|
|
|
* A supporting datastructure that is used in addSelectionPaths() and
|
|
|
|
* removeSelectionPaths(). It contains currently selected paths.
|
|
|
|
*
|
|
|
|
* @see #addSelectionPaths(TreePath[])
|
|
|
|
* @see #removeSelectionPaths(TreePath[])
|
|
|
|
* @see #setSelectionPaths(TreePath[])
|
|
|
|
*/
|
2008-06-28 13:29:13 +00:00
|
|
|
private transient HashSet<TreePath> selectedPaths;
|
2007-01-09 19:58:05 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* A supporting datastructure that is used in addSelectionPaths() and
|
|
|
|
* removeSelectionPaths(). It contains the paths that are added or removed.
|
|
|
|
*
|
|
|
|
* @see #addSelectionPaths(TreePath[])
|
|
|
|
* @see #removeSelectionPaths(TreePath[])
|
|
|
|
* @see #setSelectionPaths(TreePath[])
|
|
|
|
*/
|
2008-06-28 13:29:13 +00:00
|
|
|
private transient HashSet<TreePath> tmpPaths;
|
2007-01-09 19:58:05 +00:00
|
|
|
|
2006-05-18 17:29:21 +00:00
|
|
|
/**
|
|
|
|
* Constructs a new DefaultTreeSelectionModel.
|
|
|
|
*/
|
|
|
|
public DefaultTreeSelectionModel()
|
|
|
|
{
|
|
|
|
setSelectionMode(DISCONTIGUOUS_TREE_SELECTION);
|
2007-01-09 19:58:05 +00:00
|
|
|
listSelectionModel = new DefaultListSelectionModel();
|
2006-05-18 17:29:21 +00:00
|
|
|
listenerList = new EventListenerList();
|
2007-01-09 19:58:05 +00:00
|
|
|
leadIndex = -1;
|
2008-06-28 13:29:13 +00:00
|
|
|
tmpPaths = new HashSet<TreePath>();
|
|
|
|
selectedPaths = new HashSet<TreePath>();
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Creates a clone of this DefaultTreeSelectionModel with the same selection.
|
|
|
|
* The cloned instance will have the same registered listeners, the listeners
|
|
|
|
* themselves will not be cloned. The selection will be cloned.
|
|
|
|
*
|
|
|
|
* @exception CloneNotSupportedException should not be thrown here
|
|
|
|
* @return a copy of this DefaultTreeSelectionModel
|
|
|
|
*/
|
|
|
|
public Object clone() throws CloneNotSupportedException
|
|
|
|
{
|
|
|
|
DefaultTreeSelectionModel cloned =
|
|
|
|
(DefaultTreeSelectionModel) super.clone();
|
2007-01-09 19:58:05 +00:00
|
|
|
cloned.changeSupport = null;
|
2006-05-18 17:29:21 +00:00
|
|
|
cloned.selection = (TreePath[]) selection.clone();
|
2007-01-09 19:58:05 +00:00
|
|
|
cloned.listenerList = new EventListenerList();
|
|
|
|
cloned.listSelectionModel =
|
|
|
|
(DefaultListSelectionModel) listSelectionModel.clone();
|
2008-06-28 13:29:13 +00:00
|
|
|
cloned.selectedPaths = new HashSet<TreePath>();
|
|
|
|
cloned.tmpPaths = new HashSet<TreePath>();
|
2007-01-09 19:58:05 +00:00
|
|
|
|
2006-05-18 17:29:21 +00:00
|
|
|
return cloned;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a string that shows this object's properties.
|
|
|
|
* The returned string lists the selected tree rows, if any.
|
|
|
|
*
|
|
|
|
* @return a string that shows this object's properties
|
|
|
|
*/
|
|
|
|
public String toString()
|
|
|
|
{
|
|
|
|
if (isSelectionEmpty())
|
|
|
|
return "[selection empty]";
|
|
|
|
else
|
|
|
|
{
|
re PR libgcj/37636 (java tools are unable to find resource files)
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
2008-10-21 17:55:01 +00:00
|
|
|
CPStringBuilder b = new CPStringBuilder("selected rows: [");
|
2006-05-18 17:29:21 +00:00
|
|
|
for (int i = 0; i < selection.length; i++)
|
|
|
|
{
|
|
|
|
b.append(getRow(selection[i]));
|
|
|
|
b.append(' ');
|
|
|
|
}
|
String.java, [...]: Merge from GNU Classpath HEAD.
2006-06-09 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/lang/String.java, classpath/native/jni/classpath/jcl.h,
classpath/native/jni/qt-peer/eventmethods.h,
classpath/native/jni/qt-peer/qtmenupeer.cpp,
classpath/native/jni/qt-peer/.cvsignore,
classpath/native/jni/gtk-peer/gdkdisplay.h,
classpath/native/jni/gtk-peer/cairographics2d.h,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,
classpath/native/jni/gtk-peer/.cvsignore,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
classpath/native/jni/gtk-peer/gtkpeer.h,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c,
classpath/native/jni/gtk-peer/Makefile.am,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
classpath/native/jawt/Makefile.am,
classpath/native/jawt/.cvsignore,
classpath/native/target/Linux/Makefile.in,
classpath/native/plugin/gcjwebplugin.cc,
classpath/native/plugin/Makefile.am,
classpath/native/plugin/.cvsignore,
classpath/resource/Makefile.in,
classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java,
classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,
classpath/gnu/java/awt/peer/gtk/CairoSurface.java,
classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java,
classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,
classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java,
classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java,
classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphics.java,
classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,
classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java,
classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java,
classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java,
classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,
classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java,
classpath/gnu/java/awt/peer/gtk/GtkImage.java,
classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java,
classpath/gnu/java/awt/peer/gtk/GdkGlyphVector.java,
classpath/gnu/java/awt/peer/gtk/GtkCanvasPeer.java,
classpath/gnu/java/awt/peer/swing/SwingContainerPeer.java,
classpath/gnu/java/awt/peer/swing/SwingComponent.java,
classpath/gnu/java/awt/peer/swing/SwingTextFieldPeer.java,
classpath/gnu/java/awt/peer/swing/SwingMenuBarPeer.java,
classpath/gnu/java/awt/peer/swing/SwingFramePeer.java,
classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java,
classpath/gnu/java/awt/peer/swing/SwingWindowPeer.java,
classpath/gnu/java/awt/print/JavaPrinterJob.java,
classpath/gnu/java/awt/print/PostScriptGraphics2D.java,
classpath/gnu/java/awt/print/SpooledDocument.java,
classpath/gnu/java/awt/print/JavaPrinterGraphics.java,
classpath/gnu/java/awt/BitwiseXORComposite.java,
classpath/gnu/java/awt/font/GNUGlyphVector.java,
classpath/gnu/java/awt/font/opentype/NameDecoder.java,
classpath/gnu/java/awt/java2d/RasterGraphics.java,
classpath/gnu/java/awt/java2d/TexturePaintContext.java,
classpath/gnu/java/awt/java2d/PolyEdge.java,
classpath/gnu/java/awt/java2d/AbstractGraphics2D.java,
classpath/gnu/java/awt/java2d/AlphaCompositeContext.java,
classpath/gnu/java/awt/java2d/ImagePaint.java,
classpath/gnu/java/awt/Buffers.java,
classpath/gnu/classpath/Configuration.java.in,
classpath/gnu/javax/swing/text/html/CombinedAttributes.java,
classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java,
classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java,
classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java,
classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java,
classpath/tools/toolwrapper.c,
classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java,
classpath/tools/gnu/classpath/tools/native2ascii/Messages.java,
classpath/tools/gnu/classpath/tools/getopt/FileArgumentCallback.java,
classpath/tools/gnu/classpath/tools/getopt/OptionGroup.java,
classpath/tools/gnu/classpath/tools/getopt/OptionException.java,
classpath/tools/gnu/classpath/tools/getopt/Messages.java,
classpath/tools/gnu/classpath/tools/getopt/Option.java,
classpath/tools/gnu/classpath/tools/getopt/Parser.java,
classpath/tools/gnu/classpath/tools/getopt/ClasspathToolParser.java,
classpath/tools/gnu/classpath/tools/jarsigner/JarSigner.java,
classpath/tools/gnu/classpath/tools/jarsigner/Main.java,
classpath/tools/gnu/classpath/tools/jarsigner/Messages.java,
classpath/tools/gnu/classpath/tools/jarsigner/package.html,
classpath/tools/gnu/classpath/tools/keytool/ListCmd.java,
classpath/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java,
classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java,
classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java,
classpath/tools/gnu/classpath/tools/keytool/Messages.java,
classpath/tools/gnu/classpath/tools/keytool/package.html,
classpath/tools/gnu/classpath/tools/keytool/Command.java,
classpath/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java,
classpath/tools/gnu/classpath/tools/keytool/Main.java,
classpath/tools/gnu/classpath/tools/keytool/DeleteCmd.java,
classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java,
classpath/tools/gnu/classpath/tools/keytool/SelfCertCmd.java,
classpath/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java,
classpath/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java,
classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java,
classpath/tools/gnu/classpath/tools/keytool/PrintCertCmd.java,
classpath/tools/gnu/classpath/tools/rmi/registry/package.html,
classpath/tools/gnu/classpath/tools/rmi/RMIC.txt,
classpath/tools/gnu/classpath/tools/rmi/RMIC.java,
classpath/tools/gnu/classpath/tools/appletviewer/ErrorApplet.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletClassLoader.java,
classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java,
classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletContext.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java,
classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletContext.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletWarning.java,
classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletTag.java,
classpath/tools/gnu/classpath/tools/appletviewer/ConsoleDialog.java,
classpath/tools/gnu/classpath/tools/appletviewer/Main.java,
classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java,
classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java,
classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java,
classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java,
classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java,
classpath/tools/gnu/classpath/tools/serialver/Messages.java,
classpath/tools/gnu/classpath/tools/serialver/SerialVer.java,
classpath/tools/gnu/classpath/tools/jar/Creator.java,
classpath/tools/gnu/classpath/tools/jar/Entry.java,
classpath/tools/gnu/classpath/tools/jar/Lister.java,
classpath/tools/gnu/classpath/tools/jar/Main.java,
classpath/tools/gnu/classpath/tools/jar/Updater.java,
classpath/tools/gnu/classpath/tools/jar/Messages.java,
classpath/tools/gnu/classpath/tools/jar/Extractor.java,
classpath/tools/gnu/classpath/tools/jar/Action.java,
classpath/tools/gnu/classpath/tools/jar/Indexer.java,
classpath/tools/gnu/classpath/tools/jar/WorkSet.java,
classpath/tools/gnu/classpath/tools/giop/GRMIC.txt,
classpath/tools/gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java,
classpath/tools/gnu/classpath/tools/giop/GRMIC.java,
classpath/tools/Makefile.am, classpath/tools/jarsigner.in,
classpath/tools/keytool.in, classpath/tools/appletviewer.in,
classpath/tools/.cvsignore, classpath/configure.ac,
classpath/javax/swing/JTabbedPane.java,
classpath/javax/swing/AbstractButton.java,
classpath/javax/swing/JViewport.java,
classpath/javax/swing/KeyboardManager.java,
classpath/javax/swing/JMenuItem.java,
classpath/javax/swing/JMenuBar.java,
classpath/javax/swing/MenuSelectionManager.java,
classpath/javax/swing/JOptionPane.java,
classpath/javax/swing/JSpinner.java,
classpath/javax/swing/JCheckBoxMenuItem.java,
classpath/javax/swing/JEditorPane.java,
classpath/javax/swing/JFormattedTextField.java,
classpath/javax/swing/JTree.java,
classpath/javax/swing/CellRendererPane.java,
classpath/javax/swing/JScrollPane.java,
classpath/javax/swing/tree/VariableHeightLayoutCache.java,
classpath/javax/swing/tree/TreeNode.java,
classpath/javax/swing/tree/FixedHeightLayoutCache.java,
classpath/javax/swing/tree/DefaultTreeCellEditor.java,
classpath/javax/swing/tree/TreePath.java,
classpath/javax/swing/tree/RowMapper.java,
classpath/javax/swing/tree/DefaultMutableTreeNode.java,
classpath/javax/swing/tree/DefaultTreeModel.java,
classpath/javax/swing/tree/AbstractLayoutCache.java,
classpath/javax/swing/tree/TreeSelectionModel.java,
classpath/javax/swing/tree/DefaultTreeSelectionModel.java,
classpath/javax/swing/tree/DefaultTreeCellRenderer.java,
classpath/javax/swing/tree/ExpandVetoException.java,
classpath/javax/swing/JList.java,
classpath/javax/swing/table/JTableHeader.java,
classpath/javax/swing/table/AbstractTableModel.java,
classpath/javax/swing/table/DefaultTableModel.java,
classpath/javax/swing/table/TableCellEditor.java,
classpath/javax/swing/table/TableCellRenderer.java,
classpath/javax/swing/ProgressMonitor.java,
classpath/javax/swing/JToolBar.java,
classpath/javax/swing/TransferHandler.java,
classpath/javax/swing/DefaultCellEditor.java,
classpath/javax/swing/DefaultButtonModel.java,
classpath/javax/swing/JLayeredPane.java,
classpath/javax/swing/text/DefaultEditorKit.java,
classpath/javax/swing/text/DefaultCaret.java,
classpath/javax/swing/text/FieldView.java,
classpath/javax/swing/text/JTextComponent.java,
classpath/javax/swing/text/TextAction.java,
classpath/javax/swing/text/StyleContext.java,
classpath/javax/swing/text/html/HTMLDocument.java,
classpath/javax/swing/text/html/MinimalHTMLWriter.java,
classpath/javax/swing/text/html/ImageView.java,
classpath/javax/swing/text/html/HTMLEditorKit.java,
classpath/javax/swing/text/AbstractWriter.java,
classpath/javax/swing/text/GapContent.java,
classpath/javax/swing/text/Utilities.java,
classpath/javax/swing/text/PlainView.java,
classpath/javax/swing/UIManager.java,
classpath/javax/swing/JSplitPane.java,
classpath/javax/swing/JComponent.java,
classpath/javax/swing/SwingUtilities.java,
classpath/javax/swing/border/AbstractBorder.java,
classpath/javax/swing/border/CompoundBorder.java,
classpath/javax/swing/border/TitledBorder.java,
classpath/javax/swing/border/MatteBorder.java,
classpath/javax/swing/border/BevelBorder.java,
classpath/javax/swing/RepaintManager.java,
classpath/javax/swing/JTable.java,
classpath/javax/swing/UIDefaults.java,
classpath/javax/swing/DefaultDesktopManager.java,
classpath/javax/swing/JMenu.java,
classpath/javax/swing/JLabel.java,
classpath/javax/swing/JSlider.java,
classpath/javax/swing/plaf/basic/BasicToolBarUI.java,
classpath/javax/swing/plaf/basic/BasicButtonUI.java,
classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java,
classpath/javax/swing/plaf/basic/BasicTextAreaUI.java,
classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java,
classpath/javax/swing/plaf/basic/BasicSpinnerUI.java,
classpath/javax/swing/plaf/basic/BasicSliderUI.java,
classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,
classpath/javax/swing/plaf/basic/BasicComboPopup.java,
classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java,
classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java,
classpath/javax/swing/plaf/basic/BasicProgressBarUI.java,
classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java,
classpath/javax/swing/plaf/basic/BasicPanelUI.java,
classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java,
classpath/javax/swing/plaf/basic/BasicTreeUI.java,
classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java,
classpath/javax/swing/plaf/basic/BasicFileChooserUI.java,
classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java,
classpath/javax/swing/plaf/basic/BasicComboBoxUI.java,
classpath/javax/swing/plaf/basic/BasicListUI.java,
classpath/javax/swing/plaf/basic/BasicIconFactory.java,
classpath/javax/swing/plaf/basic/BasicTextUI.java,
classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,
classpath/javax/swing/plaf/basic/BasicDirectoryModel.java,
classpath/javax/swing/plaf/basic/BasicRootPaneUI.java,
classpath/javax/swing/plaf/basic/BasicTableUI.java,
classpath/javax/swing/plaf/basic/SharedUIDefaults.java,
classpath/javax/swing/plaf/multi/MultiComboBoxUI.java,
classpath/javax/swing/plaf/multi/MultiListUI.java,
classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java,
classpath/javax/swing/plaf/multi/MultiFileChooserUI.java,
classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java,
classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java,
classpath/javax/swing/plaf/multi/MultiLookAndFeel.java,
classpath/javax/swing/plaf/metal/MetalSliderUI.java,
classpath/javax/swing/plaf/metal/MetalIconFactory.java,
classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java,
classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java,
classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,
classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java,
classpath/javax/swing/plaf/metal/MetalSeparatorUI.java,
classpath/javax/swing/plaf/metal/MetalBorders.java,
classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java,
classpath/javax/swing/plaf/metal/MetalScrollBarUI.java,
classpath/javax/swing/plaf/metal/MetalRootPaneUI.java,
classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java,
classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java,
classpath/javax/swing/plaf/metal/MetalToolTipUI.java,
classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java,
classpath/javax/swing/plaf/metal/MetalFileChooserUI.java,
classpath/javax/swing/plaf/metal/MetalUtils.java,
classpath/javax/swing/plaf/metal/MetalComboBoxButton.java,
classpath/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java,
classpath/javax/swing/plaf/metal/MetalButtonUI.java,
classpath/javax/swing/JPopupMenu.java,
classpath/javax/swing/JProgressBar.java,
classpath/javax/swing/WindowConstants.java,
classpath/javax/swing/JFrame.java,
classpath/javax/swing/JFileChooser.java,
classpath/javax/swing/JComboBox.java,
classpath/javax/swing/event/EventListenerList.java,
classpath/javax/swing/ListSelectionModel.java,
classpath/javax/swing/JScrollBar.java,
classpath/java/text/SimpleDateFormat.java,
classpath/java/text/NumberFormat.java,
classpath/java/text/class-dependencies.conf,
classpath/java/awt/image/ColorModel.java,
classpath/java/awt/image/BufferedImage.java,
classpath/java/awt/Window.java,
classpath/java/awt/ContainerOrderFocusTraversalPolicy.java,
classpath/java/awt/LightweightDispatcher.java,
classpath/java/awt/EventDispatchThread.java,
classpath/java/awt/BasicStroke.java,
classpath/java/awt/ColorPaintContext.java,
classpath/java/awt/Container.java,
classpath/java/awt/TexturePaint.java,
classpath/java/awt/Component.java, classpath/java/awt/Font.java,
classpath/java/awt/GraphicsConfiguration.java,
classpath/java/awt/DefaultKeyboardFocusManager.java,
classpath/java/awt/print/PrinterJob.java,
classpath/java/awt/im/InputContext.java,
classpath/java/awt/dnd/DragGestureRecognizer.java,
classpath/java/awt/Toolkit.java,
classpath/java/awt/font/GraphicAttribute.java,
classpath/java/awt/font/ImageGraphicAttribute.java,
classpath/java/awt/font/GlyphVector.java,
classpath/java/awt/font/GlyphMetrics.java,
classpath/java/awt/font/ShapeGraphicAttribute.java,
classpath/java/awt/Graphics2D.java,
classpath/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h,
classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h,
classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,
classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h,
classpath/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h,
classpath/include/config.h.in,
classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h,
classpath/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h,
classpath/include/gnu_java_awt_peer_gtk_GdkFontPeer.h,
classpath/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h,
classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h,
classpath/include/gnu_java_awt_peer_gtk_GtkImage.h,
classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h,
classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h:
Merge from GNU Classpath HEAD.
From-SVN: r114510
2006-06-09 16:07:07 +00:00
|
|
|
b.append(", lead " + getLeadSelectionRow());
|
2006-05-18 17:29:21 +00:00
|
|
|
return b.toString();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* writeObject
|
|
|
|
*
|
|
|
|
* @param value0 TODO
|
|
|
|
* @exception IOException TODO
|
|
|
|
*/
|
|
|
|
private void writeObject(ObjectOutputStream value0) throws IOException
|
|
|
|
{
|
|
|
|
// TODO
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* readObject
|
|
|
|
*
|
|
|
|
* @param value0 TODO
|
|
|
|
* @exception IOException TODO
|
|
|
|
* @exception ClassNotFoundException TODO
|
|
|
|
*/
|
|
|
|
private void readObject(ObjectInputStream value0) throws IOException,
|
|
|
|
ClassNotFoundException
|
|
|
|
{
|
|
|
|
// TODO
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the RowMapper that should be used to map between paths and their rows.
|
|
|
|
*
|
|
|
|
* @param mapper the RowMapper to set
|
|
|
|
* @see RowMapper
|
|
|
|
*/
|
|
|
|
public void setRowMapper(RowMapper mapper)
|
|
|
|
{
|
|
|
|
rowMapper = mapper;
|
2007-01-09 19:58:05 +00:00
|
|
|
resetRowSelection();
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the RowMapper that is currently used to map between paths and their
|
|
|
|
* rows.
|
|
|
|
*
|
|
|
|
* @return the current RowMapper
|
|
|
|
* @see RowMapper
|
|
|
|
*/
|
|
|
|
public RowMapper getRowMapper()
|
|
|
|
{
|
|
|
|
return rowMapper;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the current selection mode. Possible values are
|
|
|
|
* {@link #SINGLE_TREE_SELECTION}, {@link #CONTIGUOUS_TREE_SELECTION} and
|
|
|
|
* {@link #DISCONTIGUOUS_TREE_SELECTION}.
|
|
|
|
*
|
|
|
|
* @param mode the selection mode to be set
|
|
|
|
* @see #getSelectionMode
|
|
|
|
* @see #SINGLE_TREE_SELECTION
|
|
|
|
* @see #CONTIGUOUS_TREE_SELECTION
|
|
|
|
* @see #DISCONTIGUOUS_TREE_SELECTION
|
|
|
|
*/
|
|
|
|
public void setSelectionMode(int mode)
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
int oldMode = selectionMode;
|
2006-05-18 17:29:21 +00:00
|
|
|
selectionMode = mode;
|
2007-01-09 19:58:05 +00:00
|
|
|
// Make sure we have a valid selection mode.
|
|
|
|
if (selectionMode != SINGLE_TREE_SELECTION
|
|
|
|
&& selectionMode != CONTIGUOUS_TREE_SELECTION
|
|
|
|
&& selectionMode != DISCONTIGUOUS_TREE_SELECTION)
|
|
|
|
selectionMode = DISCONTIGUOUS_TREE_SELECTION;
|
|
|
|
|
|
|
|
// Fire property change event.
|
|
|
|
if (oldMode != selectionMode && changeSupport != null)
|
|
|
|
changeSupport.firePropertyChange(SELECTION_MODE_PROPERTY, oldMode,
|
|
|
|
selectionMode);
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the current selection mode.
|
|
|
|
*
|
|
|
|
* @return the current selection mode
|
|
|
|
* @see #setSelectionMode
|
|
|
|
* @see #SINGLE_TREE_SELECTION
|
|
|
|
* @see #CONTIGUOUS_TREE_SELECTION
|
|
|
|
* @see #DISCONTIGUOUS_TREE_SELECTION
|
|
|
|
*/
|
|
|
|
public int getSelectionMode()
|
|
|
|
{
|
|
|
|
return selectionMode;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets this path as the only selection. If this changes the selection the
|
|
|
|
* registered TreeSelectionListeners are notified.
|
|
|
|
*
|
|
|
|
* @param path the path to set as selection
|
|
|
|
*/
|
|
|
|
public void setSelectionPath(TreePath path)
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
TreePath[] paths = null;
|
|
|
|
if (path != null)
|
|
|
|
paths = new TreePath[]{ path };
|
|
|
|
setSelectionPaths(paths);
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Get the number of the tree row for the given path.
|
|
|
|
*
|
|
|
|
* @param path the tree path
|
|
|
|
* @return the tree row for this path or -1 if the path is not visible.
|
|
|
|
*/
|
|
|
|
int getRow(TreePath path)
|
|
|
|
{
|
|
|
|
RowMapper mapper = getRowMapper();
|
|
|
|
|
|
|
|
if (mapper instanceof AbstractLayoutCache)
|
|
|
|
{
|
|
|
|
// The absolute majority of cases, unless the TreeUI is very
|
|
|
|
// seriously rewritten
|
|
|
|
AbstractLayoutCache ama = (AbstractLayoutCache) mapper;
|
|
|
|
return ama.getRowForPath(path);
|
|
|
|
}
|
2007-01-09 19:58:05 +00:00
|
|
|
else if (mapper != null)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
|
|
|
// Generic non optimized implementation.
|
|
|
|
int[] rows = mapper.getRowsForPaths(new TreePath[] { path });
|
|
|
|
if (rows.length == 0)
|
|
|
|
return - 1;
|
|
|
|
else
|
|
|
|
return rows[0];
|
|
|
|
}
|
2007-01-09 19:58:05 +00:00
|
|
|
return -1;
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the paths as selection. This method checks for duplicates and removes
|
|
|
|
* them. If this changes the selection the registered TreeSelectionListeners
|
|
|
|
* are notified.
|
|
|
|
*
|
|
|
|
* @param paths the paths to set as selection
|
|
|
|
*/
|
|
|
|
public void setSelectionPaths(TreePath[] paths)
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
int oldLength = 0;
|
|
|
|
if (selection != null)
|
|
|
|
oldLength = selection.length;
|
|
|
|
int newLength = 0;
|
|
|
|
if (paths != null)
|
|
|
|
newLength = paths.length;
|
|
|
|
if (newLength > 0 || oldLength > 0)
|
|
|
|
{
|
|
|
|
// For SINGLE_TREE_SELECTION and for CONTIGUOUS_TREE_SELECTION with
|
|
|
|
// a non-contiguous path, we only allow the first path element.
|
|
|
|
if ((selectionMode == SINGLE_TREE_SELECTION && newLength > 1)
|
|
|
|
|| (selectionMode == CONTIGUOUS_TREE_SELECTION && newLength > 0
|
|
|
|
&& ! arePathsContiguous(paths)))
|
|
|
|
{
|
|
|
|
paths = new TreePath[] { paths[0] };
|
|
|
|
newLength = 1;
|
|
|
|
}
|
|
|
|
// Find new paths.
|
2008-06-28 13:29:13 +00:00
|
|
|
Vector<PathPlaceHolder> changedPaths = null;
|
2007-01-09 19:58:05 +00:00
|
|
|
tmpPaths.clear();
|
|
|
|
int validPaths = 0;
|
|
|
|
TreePath oldLeadPath = leadPath;
|
|
|
|
for (int i = 0; i < newLength; i++)
|
|
|
|
{
|
|
|
|
if (paths[i] != null && ! tmpPaths.contains(paths[i]))
|
|
|
|
{
|
|
|
|
validPaths++;
|
|
|
|
tmpPaths.add(paths[i]);
|
|
|
|
if (! selectedPaths.contains(paths[i]))
|
|
|
|
{
|
|
|
|
if (changedPaths == null)
|
2008-06-28 13:29:13 +00:00
|
|
|
changedPaths = new Vector<PathPlaceHolder>();
|
2007-01-09 19:58:05 +00:00
|
|
|
changedPaths.add(new PathPlaceHolder(paths[i], true));
|
|
|
|
}
|
|
|
|
leadPath = paths[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Put together the new selection.
|
|
|
|
TreePath[] newSelection = null;
|
|
|
|
if (validPaths != 0)
|
|
|
|
{
|
|
|
|
if (validPaths != newLength)
|
|
|
|
{
|
|
|
|
// Some of the paths are already selected, put together
|
|
|
|
// the new selection carefully.
|
|
|
|
newSelection = new TreePath[validPaths];
|
2008-06-28 13:29:13 +00:00
|
|
|
Iterator<TreePath> newPaths = tmpPaths.iterator();
|
2007-01-09 19:58:05 +00:00
|
|
|
validPaths = 0;
|
|
|
|
for (int i = 0; newPaths.hasNext(); i++)
|
2008-06-28 13:29:13 +00:00
|
|
|
newSelection[i] = newPaths.next();
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
newSelection = new TreePath[paths.length];
|
|
|
|
System.arraycopy(paths, 0, newSelection, 0, paths.length);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Find paths that have been selected, but are no more.
|
|
|
|
for (int i = 0; i < oldLength; i++)
|
|
|
|
{
|
|
|
|
if (selection[i] != null && ! tmpPaths.contains(selection[i]))
|
|
|
|
{
|
|
|
|
if (changedPaths == null)
|
2008-06-28 13:29:13 +00:00
|
|
|
changedPaths = new Vector<PathPlaceHolder>();
|
2007-01-09 19:58:05 +00:00
|
|
|
changedPaths.add(new PathPlaceHolder(selection[i], false));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Perform changes and notification.
|
|
|
|
selection = newSelection;
|
2008-06-28 13:29:13 +00:00
|
|
|
HashSet<TreePath> tmp = selectedPaths;
|
2007-01-09 19:58:05 +00:00
|
|
|
selectedPaths = tmpPaths;
|
|
|
|
tmpPaths = tmp;
|
|
|
|
tmpPaths.clear();
|
|
|
|
|
|
|
|
// Not necessary, but required according to the specs and to tests.
|
|
|
|
if (selection != null)
|
|
|
|
insureUniqueness();
|
|
|
|
updateLeadIndex();
|
|
|
|
resetRowSelection();
|
|
|
|
if (changedPaths != null && changedPaths.size() > 0)
|
|
|
|
notifyPathChange(changedPaths, oldLeadPath);
|
|
|
|
}
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Adds a path to the list of selected paths. This method checks if the path
|
|
|
|
* is already selected and doesn't add the same path twice. If this changes
|
|
|
|
* the selection the registered TreeSelectionListeners are notified.
|
|
|
|
*
|
|
|
|
* The lead path is changed to the added path. This also happen if the
|
|
|
|
* passed path was already selected before.
|
|
|
|
*
|
|
|
|
* @param path the path to add to the selection
|
|
|
|
*/
|
|
|
|
public void addSelectionPath(TreePath path)
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (path != null)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
TreePath[] add = new TreePath[]{ path };
|
|
|
|
addSelectionPaths(add);
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Adds the paths to the list of selected paths. This method checks if the
|
|
|
|
* paths are already selected and doesn't add the same path twice. If this
|
|
|
|
* changes the selection the registered TreeSelectionListeners are notified.
|
|
|
|
*
|
|
|
|
* @param paths the paths to add to the selection
|
|
|
|
*/
|
|
|
|
public void addSelectionPaths(TreePath[] paths)
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
int length = paths != null ? paths.length : 0;
|
|
|
|
if (length > 0)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (selectionMode == SINGLE_TREE_SELECTION)
|
|
|
|
setSelectionPaths(paths);
|
|
|
|
else if (selectionMode == CONTIGUOUS_TREE_SELECTION
|
|
|
|
&& ! canPathsBeAdded(paths))
|
|
|
|
{
|
|
|
|
if (arePathsContiguous(paths))
|
|
|
|
setSelectionPaths(paths);
|
|
|
|
else
|
|
|
|
setSelectionPaths(new TreePath[] { paths[0] });
|
|
|
|
}
|
|
|
|
else
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2008-06-28 13:29:13 +00:00
|
|
|
Vector<PathPlaceHolder> changedPaths = null;
|
2007-01-09 19:58:05 +00:00
|
|
|
tmpPaths.clear();
|
|
|
|
int validPaths = 0;
|
|
|
|
TreePath oldLeadPath = leadPath;
|
|
|
|
int oldPaths = 0;
|
|
|
|
if (selection != null)
|
|
|
|
oldPaths = selection.length;
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < length; i++)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (paths[i] != null)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (! selectedPaths.contains(paths[i]))
|
|
|
|
{
|
|
|
|
validPaths++;
|
|
|
|
if (changedPaths == null)
|
2008-06-28 13:29:13 +00:00
|
|
|
changedPaths = new Vector<PathPlaceHolder>();
|
2007-01-09 19:58:05 +00:00
|
|
|
changedPaths.add(new PathPlaceHolder(paths[i], true));
|
|
|
|
selectedPaths.add(paths[i]);
|
|
|
|
tmpPaths.add(paths[i]);
|
|
|
|
}
|
|
|
|
leadPath = paths[i];
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
}
|
2007-01-09 19:58:05 +00:00
|
|
|
if (validPaths > 0)
|
|
|
|
{
|
|
|
|
TreePath[] newSelection = new TreePath[oldPaths + validPaths];
|
|
|
|
if (oldPaths > 0)
|
|
|
|
System.arraycopy(selection, 0, newSelection, 0, oldPaths);
|
|
|
|
if (validPaths != paths.length)
|
|
|
|
{
|
|
|
|
// Some of the paths are already selected, put together
|
|
|
|
// the new selection carefully.
|
2008-06-28 13:29:13 +00:00
|
|
|
Iterator<TreePath> newPaths = tmpPaths.iterator();
|
2007-01-09 19:58:05 +00:00
|
|
|
i = oldPaths;
|
|
|
|
while (newPaths.hasNext())
|
|
|
|
{
|
2008-06-28 13:29:13 +00:00
|
|
|
newSelection[i] = newPaths.next();
|
2007-01-09 19:58:05 +00:00
|
|
|
i++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
System.arraycopy(paths, 0, newSelection, oldPaths,
|
|
|
|
validPaths);
|
|
|
|
selection = newSelection;
|
|
|
|
insureUniqueness();
|
|
|
|
updateLeadIndex();
|
|
|
|
resetRowSelection();
|
|
|
|
if (changedPaths != null && changedPaths.size() > 0)
|
|
|
|
notifyPathChange(changedPaths, oldLeadPath);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
leadPath = oldLeadPath;
|
|
|
|
tmpPaths.clear();
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Removes the path from the selection. If this changes the selection the
|
|
|
|
* registered TreeSelectionListeners are notified.
|
|
|
|
*
|
|
|
|
* @param path the path to remove
|
|
|
|
*/
|
|
|
|
public void removeSelectionPath(TreePath path)
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (path != null)
|
|
|
|
removeSelectionPaths(new TreePath[]{ path });
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Removes the paths from the selection. If this changes the selection the
|
|
|
|
* registered TreeSelectionListeners are notified.
|
|
|
|
*
|
|
|
|
* @param paths the paths to remove
|
|
|
|
*/
|
|
|
|
public void removeSelectionPaths(TreePath[] paths)
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (paths != null && selection != null && paths.length > 0)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (! canPathsBeRemoved(paths))
|
|
|
|
clearSelection();
|
|
|
|
else
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2008-06-28 13:29:13 +00:00
|
|
|
Vector<PathPlaceHolder> pathsToRemove = null;
|
2007-01-09 19:58:05 +00:00
|
|
|
for (int i = paths.length - 1; i >= 0; i--)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (paths[i] != null && selectedPaths.contains(paths[i]))
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (pathsToRemove == null)
|
2008-06-28 13:29:13 +00:00
|
|
|
pathsToRemove = new Vector<PathPlaceHolder>();
|
2007-01-09 19:58:05 +00:00
|
|
|
selectedPaths.remove(paths[i]);
|
|
|
|
pathsToRemove.add(new PathPlaceHolder(paths[i],
|
|
|
|
false));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (pathsToRemove != null)
|
|
|
|
{
|
|
|
|
int numRemove = pathsToRemove.size();
|
|
|
|
TreePath oldLead = leadPath;
|
|
|
|
if (numRemove == selection.length)
|
|
|
|
selection = null;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
selection = new TreePath[selection.length - numRemove];
|
2008-06-28 13:29:13 +00:00
|
|
|
Iterator<TreePath> keep = selectedPaths.iterator();
|
2007-01-09 19:58:05 +00:00
|
|
|
for (int valid = 0; keep.hasNext(); valid++)
|
2008-06-28 13:29:13 +00:00
|
|
|
selection[valid] = keep.next();
|
2007-01-09 19:58:05 +00:00
|
|
|
}
|
|
|
|
// Update lead path.
|
|
|
|
if (leadPath != null && ! selectedPaths.contains(leadPath))
|
|
|
|
{
|
|
|
|
if (selection != null)
|
|
|
|
leadPath = selection[selection.length - 1];
|
|
|
|
else
|
2006-05-18 17:29:21 +00:00
|
|
|
leadPath = null;
|
|
|
|
}
|
2007-01-09 19:58:05 +00:00
|
|
|
else if (selection != null)
|
|
|
|
leadPath = selection[selection.length - 1];
|
|
|
|
else
|
|
|
|
leadPath = null;
|
|
|
|
updateLeadIndex();
|
|
|
|
resetRowSelection();
|
|
|
|
notifyPathChange(pathsToRemove, oldLead);
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the first path in the selection. This is especially useful when the
|
|
|
|
* selectionMode is {@link #SINGLE_TREE_SELECTION}.
|
|
|
|
*
|
|
|
|
* @return the first path in the selection
|
|
|
|
*/
|
|
|
|
public TreePath getSelectionPath()
|
|
|
|
{
|
|
|
|
if ((selection == null) || (selection.length == 0))
|
|
|
|
return null;
|
|
|
|
else
|
|
|
|
return selection[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the complete selection.
|
|
|
|
*
|
|
|
|
* @return the complete selection
|
|
|
|
*/
|
|
|
|
public TreePath[] getSelectionPaths()
|
|
|
|
{
|
|
|
|
return selection;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the number of paths in the selection.
|
|
|
|
*
|
|
|
|
* @return the number of paths in the selection
|
|
|
|
*/
|
|
|
|
public int getSelectionCount()
|
|
|
|
{
|
|
|
|
if (selection == null)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return selection.length;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Checks if a given path is in the selection.
|
|
|
|
*
|
|
|
|
* @param path the path to check
|
|
|
|
* @return <code>true</code> if the path is in the selection,
|
|
|
|
* <code>false</code> otherwise
|
|
|
|
*/
|
|
|
|
public boolean isPathSelected(TreePath path)
|
|
|
|
{
|
|
|
|
if (selection == null)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
for (int i = 0; i < selection.length; i++)
|
|
|
|
{
|
|
|
|
if (selection[i].equals(path))
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Checks if the selection is empty.
|
|
|
|
*
|
|
|
|
* @return <code>true</code> if the selection is empty, <code>false</code>
|
|
|
|
* otherwise
|
|
|
|
*/
|
|
|
|
public boolean isSelectionEmpty()
|
|
|
|
{
|
String.java, [...]: Merge from GNU Classpath HEAD.
2006-06-09 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/lang/String.java, classpath/native/jni/classpath/jcl.h,
classpath/native/jni/qt-peer/eventmethods.h,
classpath/native/jni/qt-peer/qtmenupeer.cpp,
classpath/native/jni/qt-peer/.cvsignore,
classpath/native/jni/gtk-peer/gdkdisplay.h,
classpath/native/jni/gtk-peer/cairographics2d.h,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,
classpath/native/jni/gtk-peer/.cvsignore,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
classpath/native/jni/gtk-peer/gtkpeer.h,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c,
classpath/native/jni/gtk-peer/Makefile.am,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
classpath/native/jawt/Makefile.am,
classpath/native/jawt/.cvsignore,
classpath/native/target/Linux/Makefile.in,
classpath/native/plugin/gcjwebplugin.cc,
classpath/native/plugin/Makefile.am,
classpath/native/plugin/.cvsignore,
classpath/resource/Makefile.in,
classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java,
classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,
classpath/gnu/java/awt/peer/gtk/CairoSurface.java,
classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java,
classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,
classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java,
classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java,
classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphics.java,
classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,
classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java,
classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java,
classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java,
classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,
classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java,
classpath/gnu/java/awt/peer/gtk/GtkImage.java,
classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java,
classpath/gnu/java/awt/peer/gtk/GdkGlyphVector.java,
classpath/gnu/java/awt/peer/gtk/GtkCanvasPeer.java,
classpath/gnu/java/awt/peer/swing/SwingContainerPeer.java,
classpath/gnu/java/awt/peer/swing/SwingComponent.java,
classpath/gnu/java/awt/peer/swing/SwingTextFieldPeer.java,
classpath/gnu/java/awt/peer/swing/SwingMenuBarPeer.java,
classpath/gnu/java/awt/peer/swing/SwingFramePeer.java,
classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java,
classpath/gnu/java/awt/peer/swing/SwingWindowPeer.java,
classpath/gnu/java/awt/print/JavaPrinterJob.java,
classpath/gnu/java/awt/print/PostScriptGraphics2D.java,
classpath/gnu/java/awt/print/SpooledDocument.java,
classpath/gnu/java/awt/print/JavaPrinterGraphics.java,
classpath/gnu/java/awt/BitwiseXORComposite.java,
classpath/gnu/java/awt/font/GNUGlyphVector.java,
classpath/gnu/java/awt/font/opentype/NameDecoder.java,
classpath/gnu/java/awt/java2d/RasterGraphics.java,
classpath/gnu/java/awt/java2d/TexturePaintContext.java,
classpath/gnu/java/awt/java2d/PolyEdge.java,
classpath/gnu/java/awt/java2d/AbstractGraphics2D.java,
classpath/gnu/java/awt/java2d/AlphaCompositeContext.java,
classpath/gnu/java/awt/java2d/ImagePaint.java,
classpath/gnu/java/awt/Buffers.java,
classpath/gnu/classpath/Configuration.java.in,
classpath/gnu/javax/swing/text/html/CombinedAttributes.java,
classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java,
classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java,
classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java,
classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java,
classpath/tools/toolwrapper.c,
classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java,
classpath/tools/gnu/classpath/tools/native2ascii/Messages.java,
classpath/tools/gnu/classpath/tools/getopt/FileArgumentCallback.java,
classpath/tools/gnu/classpath/tools/getopt/OptionGroup.java,
classpath/tools/gnu/classpath/tools/getopt/OptionException.java,
classpath/tools/gnu/classpath/tools/getopt/Messages.java,
classpath/tools/gnu/classpath/tools/getopt/Option.java,
classpath/tools/gnu/classpath/tools/getopt/Parser.java,
classpath/tools/gnu/classpath/tools/getopt/ClasspathToolParser.java,
classpath/tools/gnu/classpath/tools/jarsigner/JarSigner.java,
classpath/tools/gnu/classpath/tools/jarsigner/Main.java,
classpath/tools/gnu/classpath/tools/jarsigner/Messages.java,
classpath/tools/gnu/classpath/tools/jarsigner/package.html,
classpath/tools/gnu/classpath/tools/keytool/ListCmd.java,
classpath/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java,
classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java,
classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java,
classpath/tools/gnu/classpath/tools/keytool/Messages.java,
classpath/tools/gnu/classpath/tools/keytool/package.html,
classpath/tools/gnu/classpath/tools/keytool/Command.java,
classpath/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java,
classpath/tools/gnu/classpath/tools/keytool/Main.java,
classpath/tools/gnu/classpath/tools/keytool/DeleteCmd.java,
classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java,
classpath/tools/gnu/classpath/tools/keytool/SelfCertCmd.java,
classpath/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java,
classpath/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java,
classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java,
classpath/tools/gnu/classpath/tools/keytool/PrintCertCmd.java,
classpath/tools/gnu/classpath/tools/rmi/registry/package.html,
classpath/tools/gnu/classpath/tools/rmi/RMIC.txt,
classpath/tools/gnu/classpath/tools/rmi/RMIC.java,
classpath/tools/gnu/classpath/tools/appletviewer/ErrorApplet.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletClassLoader.java,
classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java,
classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletContext.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java,
classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletContext.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletWarning.java,
classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletTag.java,
classpath/tools/gnu/classpath/tools/appletviewer/ConsoleDialog.java,
classpath/tools/gnu/classpath/tools/appletviewer/Main.java,
classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java,
classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java,
classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java,
classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java,
classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java,
classpath/tools/gnu/classpath/tools/serialver/Messages.java,
classpath/tools/gnu/classpath/tools/serialver/SerialVer.java,
classpath/tools/gnu/classpath/tools/jar/Creator.java,
classpath/tools/gnu/classpath/tools/jar/Entry.java,
classpath/tools/gnu/classpath/tools/jar/Lister.java,
classpath/tools/gnu/classpath/tools/jar/Main.java,
classpath/tools/gnu/classpath/tools/jar/Updater.java,
classpath/tools/gnu/classpath/tools/jar/Messages.java,
classpath/tools/gnu/classpath/tools/jar/Extractor.java,
classpath/tools/gnu/classpath/tools/jar/Action.java,
classpath/tools/gnu/classpath/tools/jar/Indexer.java,
classpath/tools/gnu/classpath/tools/jar/WorkSet.java,
classpath/tools/gnu/classpath/tools/giop/GRMIC.txt,
classpath/tools/gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java,
classpath/tools/gnu/classpath/tools/giop/GRMIC.java,
classpath/tools/Makefile.am, classpath/tools/jarsigner.in,
classpath/tools/keytool.in, classpath/tools/appletviewer.in,
classpath/tools/.cvsignore, classpath/configure.ac,
classpath/javax/swing/JTabbedPane.java,
classpath/javax/swing/AbstractButton.java,
classpath/javax/swing/JViewport.java,
classpath/javax/swing/KeyboardManager.java,
classpath/javax/swing/JMenuItem.java,
classpath/javax/swing/JMenuBar.java,
classpath/javax/swing/MenuSelectionManager.java,
classpath/javax/swing/JOptionPane.java,
classpath/javax/swing/JSpinner.java,
classpath/javax/swing/JCheckBoxMenuItem.java,
classpath/javax/swing/JEditorPane.java,
classpath/javax/swing/JFormattedTextField.java,
classpath/javax/swing/JTree.java,
classpath/javax/swing/CellRendererPane.java,
classpath/javax/swing/JScrollPane.java,
classpath/javax/swing/tree/VariableHeightLayoutCache.java,
classpath/javax/swing/tree/TreeNode.java,
classpath/javax/swing/tree/FixedHeightLayoutCache.java,
classpath/javax/swing/tree/DefaultTreeCellEditor.java,
classpath/javax/swing/tree/TreePath.java,
classpath/javax/swing/tree/RowMapper.java,
classpath/javax/swing/tree/DefaultMutableTreeNode.java,
classpath/javax/swing/tree/DefaultTreeModel.java,
classpath/javax/swing/tree/AbstractLayoutCache.java,
classpath/javax/swing/tree/TreeSelectionModel.java,
classpath/javax/swing/tree/DefaultTreeSelectionModel.java,
classpath/javax/swing/tree/DefaultTreeCellRenderer.java,
classpath/javax/swing/tree/ExpandVetoException.java,
classpath/javax/swing/JList.java,
classpath/javax/swing/table/JTableHeader.java,
classpath/javax/swing/table/AbstractTableModel.java,
classpath/javax/swing/table/DefaultTableModel.java,
classpath/javax/swing/table/TableCellEditor.java,
classpath/javax/swing/table/TableCellRenderer.java,
classpath/javax/swing/ProgressMonitor.java,
classpath/javax/swing/JToolBar.java,
classpath/javax/swing/TransferHandler.java,
classpath/javax/swing/DefaultCellEditor.java,
classpath/javax/swing/DefaultButtonModel.java,
classpath/javax/swing/JLayeredPane.java,
classpath/javax/swing/text/DefaultEditorKit.java,
classpath/javax/swing/text/DefaultCaret.java,
classpath/javax/swing/text/FieldView.java,
classpath/javax/swing/text/JTextComponent.java,
classpath/javax/swing/text/TextAction.java,
classpath/javax/swing/text/StyleContext.java,
classpath/javax/swing/text/html/HTMLDocument.java,
classpath/javax/swing/text/html/MinimalHTMLWriter.java,
classpath/javax/swing/text/html/ImageView.java,
classpath/javax/swing/text/html/HTMLEditorKit.java,
classpath/javax/swing/text/AbstractWriter.java,
classpath/javax/swing/text/GapContent.java,
classpath/javax/swing/text/Utilities.java,
classpath/javax/swing/text/PlainView.java,
classpath/javax/swing/UIManager.java,
classpath/javax/swing/JSplitPane.java,
classpath/javax/swing/JComponent.java,
classpath/javax/swing/SwingUtilities.java,
classpath/javax/swing/border/AbstractBorder.java,
classpath/javax/swing/border/CompoundBorder.java,
classpath/javax/swing/border/TitledBorder.java,
classpath/javax/swing/border/MatteBorder.java,
classpath/javax/swing/border/BevelBorder.java,
classpath/javax/swing/RepaintManager.java,
classpath/javax/swing/JTable.java,
classpath/javax/swing/UIDefaults.java,
classpath/javax/swing/DefaultDesktopManager.java,
classpath/javax/swing/JMenu.java,
classpath/javax/swing/JLabel.java,
classpath/javax/swing/JSlider.java,
classpath/javax/swing/plaf/basic/BasicToolBarUI.java,
classpath/javax/swing/plaf/basic/BasicButtonUI.java,
classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java,
classpath/javax/swing/plaf/basic/BasicTextAreaUI.java,
classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java,
classpath/javax/swing/plaf/basic/BasicSpinnerUI.java,
classpath/javax/swing/plaf/basic/BasicSliderUI.java,
classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,
classpath/javax/swing/plaf/basic/BasicComboPopup.java,
classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java,
classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java,
classpath/javax/swing/plaf/basic/BasicProgressBarUI.java,
classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java,
classpath/javax/swing/plaf/basic/BasicPanelUI.java,
classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java,
classpath/javax/swing/plaf/basic/BasicTreeUI.java,
classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java,
classpath/javax/swing/plaf/basic/BasicFileChooserUI.java,
classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java,
classpath/javax/swing/plaf/basic/BasicComboBoxUI.java,
classpath/javax/swing/plaf/basic/BasicListUI.java,
classpath/javax/swing/plaf/basic/BasicIconFactory.java,
classpath/javax/swing/plaf/basic/BasicTextUI.java,
classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,
classpath/javax/swing/plaf/basic/BasicDirectoryModel.java,
classpath/javax/swing/plaf/basic/BasicRootPaneUI.java,
classpath/javax/swing/plaf/basic/BasicTableUI.java,
classpath/javax/swing/plaf/basic/SharedUIDefaults.java,
classpath/javax/swing/plaf/multi/MultiComboBoxUI.java,
classpath/javax/swing/plaf/multi/MultiListUI.java,
classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java,
classpath/javax/swing/plaf/multi/MultiFileChooserUI.java,
classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java,
classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java,
classpath/javax/swing/plaf/multi/MultiLookAndFeel.java,
classpath/javax/swing/plaf/metal/MetalSliderUI.java,
classpath/javax/swing/plaf/metal/MetalIconFactory.java,
classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java,
classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java,
classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,
classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java,
classpath/javax/swing/plaf/metal/MetalSeparatorUI.java,
classpath/javax/swing/plaf/metal/MetalBorders.java,
classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java,
classpath/javax/swing/plaf/metal/MetalScrollBarUI.java,
classpath/javax/swing/plaf/metal/MetalRootPaneUI.java,
classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java,
classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java,
classpath/javax/swing/plaf/metal/MetalToolTipUI.java,
classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java,
classpath/javax/swing/plaf/metal/MetalFileChooserUI.java,
classpath/javax/swing/plaf/metal/MetalUtils.java,
classpath/javax/swing/plaf/metal/MetalComboBoxButton.java,
classpath/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java,
classpath/javax/swing/plaf/metal/MetalButtonUI.java,
classpath/javax/swing/JPopupMenu.java,
classpath/javax/swing/JProgressBar.java,
classpath/javax/swing/WindowConstants.java,
classpath/javax/swing/JFrame.java,
classpath/javax/swing/JFileChooser.java,
classpath/javax/swing/JComboBox.java,
classpath/javax/swing/event/EventListenerList.java,
classpath/javax/swing/ListSelectionModel.java,
classpath/javax/swing/JScrollBar.java,
classpath/java/text/SimpleDateFormat.java,
classpath/java/text/NumberFormat.java,
classpath/java/text/class-dependencies.conf,
classpath/java/awt/image/ColorModel.java,
classpath/java/awt/image/BufferedImage.java,
classpath/java/awt/Window.java,
classpath/java/awt/ContainerOrderFocusTraversalPolicy.java,
classpath/java/awt/LightweightDispatcher.java,
classpath/java/awt/EventDispatchThread.java,
classpath/java/awt/BasicStroke.java,
classpath/java/awt/ColorPaintContext.java,
classpath/java/awt/Container.java,
classpath/java/awt/TexturePaint.java,
classpath/java/awt/Component.java, classpath/java/awt/Font.java,
classpath/java/awt/GraphicsConfiguration.java,
classpath/java/awt/DefaultKeyboardFocusManager.java,
classpath/java/awt/print/PrinterJob.java,
classpath/java/awt/im/InputContext.java,
classpath/java/awt/dnd/DragGestureRecognizer.java,
classpath/java/awt/Toolkit.java,
classpath/java/awt/font/GraphicAttribute.java,
classpath/java/awt/font/ImageGraphicAttribute.java,
classpath/java/awt/font/GlyphVector.java,
classpath/java/awt/font/GlyphMetrics.java,
classpath/java/awt/font/ShapeGraphicAttribute.java,
classpath/java/awt/Graphics2D.java,
classpath/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h,
classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h,
classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,
classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h,
classpath/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h,
classpath/include/config.h.in,
classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h,
classpath/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h,
classpath/include/gnu_java_awt_peer_gtk_GdkFontPeer.h,
classpath/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h,
classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h,
classpath/include/gnu_java_awt_peer_gtk_GtkImage.h,
classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h,
classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h:
Merge from GNU Classpath HEAD.
From-SVN: r114510
2006-06-09 16:07:07 +00:00
|
|
|
return (selection == null) || (selection.length == 0);
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Removes all paths from the selection. Fire the unselection event.
|
|
|
|
*/
|
|
|
|
public void clearSelection()
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (selection != null)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
int selectionLength = selection.length;
|
|
|
|
boolean[] news = new boolean[selectionLength];
|
|
|
|
Arrays.fill(news, false);
|
|
|
|
TreeSelectionEvent event = new TreeSelectionEvent(this, selection,
|
|
|
|
news, leadPath,
|
|
|
|
null);
|
2006-05-18 17:29:21 +00:00
|
|
|
leadPath = null;
|
2007-01-09 19:58:05 +00:00
|
|
|
leadIndex = 0;
|
|
|
|
leadRow = 0;
|
|
|
|
selectedPaths.clear();
|
2006-05-18 17:29:21 +00:00
|
|
|
selection = null;
|
2007-01-09 19:58:05 +00:00
|
|
|
resetRowSelection();
|
2006-05-18 17:29:21 +00:00
|
|
|
fireValueChanged(event);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Adds a <code>TreeSelectionListener</code> object to this model.
|
|
|
|
*
|
|
|
|
* @param listener the listener to add
|
|
|
|
*/
|
|
|
|
public void addTreeSelectionListener(TreeSelectionListener listener)
|
|
|
|
{
|
|
|
|
listenerList.add(TreeSelectionListener.class, listener);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Removes a <code>TreeSelectionListener</code> object from this model.
|
|
|
|
*
|
|
|
|
* @param listener the listener to remove
|
|
|
|
*/
|
|
|
|
public void removeTreeSelectionListener(TreeSelectionListener listener)
|
|
|
|
{
|
|
|
|
listenerList.remove(TreeSelectionListener.class, listener);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns all <code>TreeSelectionListener</code> added to this model.
|
|
|
|
*
|
|
|
|
* @return an array of listeners
|
|
|
|
* @since 1.4
|
|
|
|
*/
|
|
|
|
public TreeSelectionListener[] getTreeSelectionListeners()
|
|
|
|
{
|
|
|
|
return (TreeSelectionListener[]) getListeners(TreeSelectionListener.class);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* fireValueChanged
|
|
|
|
*
|
|
|
|
* @param event the event to fire.
|
|
|
|
*/
|
|
|
|
protected void fireValueChanged(TreeSelectionEvent event)
|
|
|
|
{
|
|
|
|
TreeSelectionListener[] listeners = getTreeSelectionListeners();
|
|
|
|
|
|
|
|
for (int i = 0; i < listeners.length; ++i)
|
|
|
|
listeners[i].valueChanged(event);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns all added listeners of a special type.
|
|
|
|
*
|
|
|
|
* @param listenerType the listener type
|
|
|
|
* @return an array of listeners
|
|
|
|
* @since 1.3
|
|
|
|
*/
|
2007-01-09 19:58:05 +00:00
|
|
|
public <T extends EventListener> T[] getListeners(Class<T> listenerType)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
|
|
|
return listenerList.getListeners(listenerType);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the currently selected rows.
|
|
|
|
*
|
|
|
|
* @return the currently selected rows
|
|
|
|
*/
|
|
|
|
public int[] getSelectionRows()
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
int[] rows = null;
|
|
|
|
if (rowMapper != null && selection != null)
|
|
|
|
{
|
|
|
|
rows = rowMapper.getRowsForPaths(selection);
|
|
|
|
if (rows != null)
|
|
|
|
{
|
|
|
|
// Find invisible rows.
|
|
|
|
int invisible = 0;
|
|
|
|
for (int i = rows.length - 1; i >= 0; i--)
|
|
|
|
{
|
|
|
|
if (rows[i] == -1)
|
|
|
|
invisible++;
|
|
|
|
|
|
|
|
}
|
|
|
|
// Clean up invisible rows.
|
|
|
|
if (invisible > 0)
|
|
|
|
{
|
|
|
|
if (invisible == rows.length)
|
|
|
|
rows = null;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int[] newRows = new int[rows.length - invisible];
|
|
|
|
int visCount = 0;
|
|
|
|
for (int i = rows.length - 1; i >= 0; i--)
|
|
|
|
{
|
|
|
|
if (rows[i] != -1)
|
|
|
|
{
|
|
|
|
newRows[visCount] = rows[i];
|
|
|
|
visCount++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rows = newRows;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return rows;
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the smallest row index from the selection.
|
|
|
|
*
|
|
|
|
* @return the smallest row index from the selection
|
|
|
|
*/
|
|
|
|
public int getMinSelectionRow()
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
return listSelectionModel.getMinSelectionIndex();
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the largest row index from the selection.
|
|
|
|
*
|
|
|
|
* @return the largest row index from the selection
|
|
|
|
*/
|
|
|
|
public int getMaxSelectionRow()
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
return listSelectionModel.getMaxSelectionIndex();
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Checks if a particular row is selected.
|
|
|
|
*
|
|
|
|
* @param row the index of the row to check
|
|
|
|
* @return <code>true</code> if the row is in this selection,
|
|
|
|
* <code>false</code> otherwise
|
|
|
|
* @throws NullPointerException if the row mapper is not set (can only happen
|
|
|
|
* if the user has plugged in the custom incorrect TreeUI
|
|
|
|
* implementation.
|
|
|
|
*/
|
|
|
|
public boolean isRowSelected(int row)
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
return listSelectionModel.isSelectedIndex(row);
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Updates the mappings from TreePaths to row indices.
|
|
|
|
*/
|
|
|
|
public void resetRowSelection()
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
listSelectionModel.clearSelection();
|
|
|
|
if (selection != null && rowMapper != null)
|
|
|
|
{
|
|
|
|
int[] rows = rowMapper.getRowsForPaths(selection);
|
|
|
|
// Update list selection model.
|
|
|
|
for (int i = 0; i < rows.length; i++)
|
|
|
|
{
|
|
|
|
int row = rows[i];
|
|
|
|
if (row != -1)
|
|
|
|
listSelectionModel.addSelectionInterval(row, row);
|
|
|
|
}
|
|
|
|
// Update lead selection.
|
|
|
|
if (leadIndex != -1 && rows != null)
|
|
|
|
leadRow = rows[leadIndex];
|
|
|
|
else if (leadPath != null)
|
|
|
|
{
|
|
|
|
TreePath[] tmp = new TreePath[]{ leadPath };
|
|
|
|
rows = rowMapper.getRowsForPaths(tmp);
|
|
|
|
leadRow = rows != null ? rows[0] : -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
leadRow = -1;
|
|
|
|
insureRowContinuity();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
leadRow = -1;
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* getLeadSelectionRow
|
|
|
|
*
|
|
|
|
* @return int
|
|
|
|
*/
|
|
|
|
public int getLeadSelectionRow()
|
|
|
|
{
|
|
|
|
return leadRow;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* getLeadSelectionPath
|
|
|
|
*
|
|
|
|
* @return TreePath
|
|
|
|
*/
|
|
|
|
public TreePath getLeadSelectionPath()
|
|
|
|
{
|
|
|
|
return leadPath;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Adds a <code>PropertyChangeListener</code> object to this model.
|
|
|
|
*
|
|
|
|
* @param listener the listener to add.
|
|
|
|
*/
|
|
|
|
public void addPropertyChangeListener(PropertyChangeListener listener)
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (changeSupport == null)
|
|
|
|
changeSupport = new SwingPropertyChangeSupport(this);
|
2006-05-18 17:29:21 +00:00
|
|
|
changeSupport.addPropertyChangeListener(listener);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Removes a <code>PropertyChangeListener</code> object from this model.
|
|
|
|
*
|
|
|
|
* @param listener the listener to remove.
|
|
|
|
*/
|
|
|
|
public void removePropertyChangeListener(PropertyChangeListener listener)
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (changeSupport != null)
|
|
|
|
changeSupport.removePropertyChangeListener(listener);
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns all added <code>PropertyChangeListener</code> objects.
|
|
|
|
*
|
|
|
|
* @return an array of listeners.
|
|
|
|
* @since 1.4
|
|
|
|
*/
|
|
|
|
public PropertyChangeListener[] getPropertyChangeListeners()
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
PropertyChangeListener[] listeners = null;
|
|
|
|
if (changeSupport != null)
|
|
|
|
listeners = changeSupport.getPropertyChangeListeners();
|
|
|
|
else
|
|
|
|
listeners = new PropertyChangeListener[0];
|
|
|
|
return listeners;
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Makes sure the currently selected paths are valid according to the current
|
|
|
|
* selectionMode. If the selectionMode is set to
|
|
|
|
* {@link #CONTIGUOUS_TREE_SELECTION} and the selection isn't contiguous then
|
|
|
|
* the selection is reset to the first set of contguous paths. If the
|
|
|
|
* selectionMode is set to {@link #SINGLE_TREE_SELECTION} and the selection
|
|
|
|
* has more than one path, the selection is reset to the contain only the
|
|
|
|
* first path.
|
|
|
|
*/
|
|
|
|
protected void insureRowContinuity()
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (selectionMode == CONTIGUOUS_TREE_SELECTION && selection != null
|
|
|
|
&& rowMapper != null)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
int min = listSelectionModel.getMinSelectionIndex();
|
|
|
|
if (min != -1)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
int max = listSelectionModel.getMaxSelectionIndex();
|
|
|
|
for (int i = min; i <= max; i++)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (! listSelectionModel.isSelectedIndex(i))
|
|
|
|
{
|
|
|
|
if (i == min)
|
|
|
|
clearSelection();
|
|
|
|
else
|
|
|
|
{
|
|
|
|
TreePath[] newSelection = new TreePath[i - min];
|
|
|
|
int[] rows = rowMapper.getRowsForPaths(selection);
|
|
|
|
for (int j = 0; j < rows.length; j++)
|
|
|
|
{
|
|
|
|
if (rows[j] < i)
|
|
|
|
newSelection[rows[j] - min] = selection[j];
|
|
|
|
}
|
|
|
|
setSelectionPaths(newSelection);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-01-09 19:58:05 +00:00
|
|
|
else if (selectionMode == SINGLE_TREE_SELECTION && selection != null
|
|
|
|
&& selection.length > 1)
|
|
|
|
setSelectionPath(selection[0]);
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns <code>true</code> if the paths are contiguous (take subsequent
|
|
|
|
* rows in the diplayed tree view. The method returns <code>true</code> if
|
|
|
|
* we have no RowMapper assigned.
|
|
|
|
*
|
|
|
|
* @param paths the paths to check for continuity
|
|
|
|
* @return <code>true</code> if the paths are contiguous or we have no
|
|
|
|
* RowMapper assigned
|
|
|
|
*/
|
|
|
|
protected boolean arePathsContiguous(TreePath[] paths)
|
|
|
|
{
|
|
|
|
if (rowMapper == null || paths.length < 2)
|
|
|
|
return true;
|
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
int length = paths.length;
|
|
|
|
TreePath[] tmp = new TreePath[1];
|
|
|
|
tmp[0] = paths[0];
|
|
|
|
int min = rowMapper.getRowsForPaths(tmp)[0];
|
|
|
|
BitSet selected = new BitSet();
|
|
|
|
int valid = 0;
|
|
|
|
for (int i = 0; i < length; i++)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (paths[i] != null)
|
|
|
|
{
|
|
|
|
tmp[0] = paths[i];
|
|
|
|
int[] rows = rowMapper.getRowsForPaths(tmp);
|
|
|
|
if (rows == null)
|
|
|
|
return false; // No row mapping yet, can't be selected.
|
|
|
|
int row = rows[0];
|
|
|
|
if (row == -1 || row < (min - length) || row > (min + length))
|
|
|
|
return false; // Not contiguous.
|
|
|
|
min = Math.min(min, row);
|
|
|
|
if (! selected.get(row))
|
|
|
|
{
|
|
|
|
selected.set(row);
|
|
|
|
valid++;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
2007-01-09 19:58:05 +00:00
|
|
|
int max = valid + min;
|
|
|
|
for (int i = min; i < max; i++)
|
|
|
|
if (! selected.get(i))
|
|
|
|
return false; // Not contiguous.
|
2006-05-18 17:29:21 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Checks if the paths can be added. This returns <code>true</code> if:
|
|
|
|
* <ul>
|
|
|
|
* <li><code>paths</code> is <code>null</code> or empty</li>
|
|
|
|
* <li>we have no RowMapper assigned</li>
|
|
|
|
* <li>nothing is currently selected</li>
|
|
|
|
* <li>selectionMode is {@link #DISCONTIGUOUS_TREE_SELECTION}</li>
|
|
|
|
* <li>adding the paths to the selection still results in a contiguous set of
|
|
|
|
* paths</li>
|
|
|
|
*
|
|
|
|
* @param paths the paths to check
|
|
|
|
* @return <code>true</code> if the paths can be added with respect to the
|
|
|
|
* selectionMode
|
|
|
|
*/
|
|
|
|
protected boolean canPathsBeAdded(TreePath[] paths)
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (paths == null || paths.length == 0 || rowMapper == null
|
|
|
|
|| selection == null || selectionMode == DISCONTIGUOUS_TREE_SELECTION)
|
2006-05-18 17:29:21 +00:00
|
|
|
return true;
|
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
BitSet selected = new BitSet();
|
|
|
|
int min = listSelectionModel.getMinSelectionIndex();
|
|
|
|
int max = listSelectionModel.getMaxSelectionIndex();
|
|
|
|
TreePath[] tmp = new TreePath[1];
|
|
|
|
if (min != -1)
|
|
|
|
{
|
|
|
|
// Set the bitmask of selected elements.
|
|
|
|
for (int i = min; i <= max; i++)
|
|
|
|
selected.set(i);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tmp[0] = paths[0];
|
|
|
|
min = rowMapper.getRowsForPaths(tmp)[0];
|
|
|
|
max = min;
|
|
|
|
}
|
|
|
|
// Mark new paths as selected.
|
|
|
|
for (int i = paths.length - 1; i >= 0; i--)
|
|
|
|
{
|
|
|
|
if (paths[i] != null)
|
|
|
|
{
|
|
|
|
tmp[0] = paths[i];
|
|
|
|
int[] rows = rowMapper.getRowsForPaths(tmp);
|
|
|
|
if (rows == null)
|
|
|
|
return false; // Now row mapping yet, can't be selected.
|
|
|
|
int row = rows[0];
|
|
|
|
if (row == -1)
|
|
|
|
return false; // Now row mapping yet, can't be selected.
|
|
|
|
min = Math.min(min, row);
|
|
|
|
max = Math.max(max, row);
|
|
|
|
selected.set(row);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Now look if the new selection would be contiguous.
|
|
|
|
for (int i = min; i <= max; i++)
|
|
|
|
if (! selected.get(i))
|
|
|
|
return false;
|
|
|
|
return true;
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Checks if the paths can be removed without breaking the continuity of the
|
|
|
|
* selection according to selectionMode.
|
|
|
|
*
|
|
|
|
* @param paths the paths to check
|
|
|
|
* @return <code>true</code> if the paths can be removed with respect to the
|
|
|
|
* selectionMode
|
|
|
|
*/
|
|
|
|
protected boolean canPathsBeRemoved(TreePath[] paths)
|
|
|
|
{
|
|
|
|
if (rowMapper == null || isSelectionEmpty()
|
|
|
|
|| selectionMode == DISCONTIGUOUS_TREE_SELECTION)
|
|
|
|
return true;
|
|
|
|
|
2008-06-28 13:29:13 +00:00
|
|
|
HashSet<TreePath> set = new HashSet<TreePath>();
|
2006-05-18 17:29:21 +00:00
|
|
|
for (int i = 0; i < selection.length; i++)
|
|
|
|
set.add(selection[i]);
|
|
|
|
|
|
|
|
for (int i = 0; i < paths.length; i++)
|
|
|
|
set.remove(paths[i]);
|
|
|
|
|
|
|
|
TreePath[] remaining = new TreePath[set.size()];
|
2008-06-28 13:29:13 +00:00
|
|
|
Iterator<TreePath> iter = set.iterator();
|
2006-05-18 17:29:21 +00:00
|
|
|
|
|
|
|
for (int i = 0; i < remaining.length; i++)
|
2008-06-28 13:29:13 +00:00
|
|
|
remaining[i] = iter.next();
|
2006-05-18 17:29:21 +00:00
|
|
|
|
|
|
|
return arePathsContiguous(remaining);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Notify the installed listeners that the given patches have changed. This
|
|
|
|
* method will call listeners if invoked, but it is not called from the
|
|
|
|
* implementation of this class.
|
|
|
|
*
|
2007-01-09 19:58:05 +00:00
|
|
|
* @param vPaths the vector of the changed patches
|
2006-05-18 17:29:21 +00:00
|
|
|
* @param oldLeadSelection the old selection index
|
|
|
|
*/
|
2008-06-28 13:29:13 +00:00
|
|
|
protected void notifyPathChange(Vector<PathPlaceHolder> vPaths,
|
|
|
|
TreePath oldLeadSelection)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
int numChangedPaths = vPaths.size();
|
|
|
|
boolean[] news = new boolean[numChangedPaths];
|
|
|
|
TreePath[] paths = new TreePath[numChangedPaths];
|
|
|
|
for (int i = 0; i < numChangedPaths; i++)
|
|
|
|
{
|
2008-06-28 13:29:13 +00:00
|
|
|
PathPlaceHolder p = vPaths.get(i);
|
2007-01-09 19:58:05 +00:00
|
|
|
news[i] = p.isNew;
|
|
|
|
paths[i] = p.path;
|
|
|
|
}
|
2006-05-18 17:29:21 +00:00
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
TreeSelectionEvent event = new TreeSelectionEvent(this, paths, news,
|
2006-05-18 17:29:21 +00:00
|
|
|
oldLeadSelection,
|
|
|
|
leadPath);
|
|
|
|
fireValueChanged(event);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Updates the lead selection row number after changing the lead selection
|
|
|
|
* path.
|
|
|
|
*/
|
|
|
|
protected void updateLeadIndex()
|
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
leadIndex = -1;
|
|
|
|
if (leadPath != null)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
leadRow = -1;
|
|
|
|
if (selection == null)
|
|
|
|
leadPath = null;
|
|
|
|
else
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
for (int i = selection.length - 1; i >= 0 && leadIndex == -1; i--)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2007-01-09 19:58:05 +00:00
|
|
|
if (selection[i] == leadPath)
|
|
|
|
leadIndex = i;
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This method exists due historical reasons and returns without action
|
|
|
|
* (unless overridden). For compatibility with the applications that override
|
|
|
|
* it, it is still called from the {@link #setSelectionPaths(TreePath[])} and
|
|
|
|
* {@link #addSelectionPaths(TreePath[])}.
|
|
|
|
*/
|
|
|
|
protected void insureUniqueness()
|
|
|
|
{
|
|
|
|
// Following the API 1.4, the method should return without action.
|
|
|
|
}
|
2005-07-16 00:30:23 +00:00
|
|
|
}
|