gcc/libjava/classpath/javax/swing/JComboBox.java
Matthias Klose cd6d4007aa 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

1500 lines
43 KiB
Java

/* JComboBox.java --
Copyright (C) 2002, 2004, 2005, 2006, Free Software Foundation, Inc.
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package javax.swing;
import gnu.java.lang.CPStringBuilder;
import java.awt.ItemSelectable;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.Vector;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleAction;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleSelection;
import javax.swing.event.ListDataEvent;
import javax.swing.event.ListDataListener;
import javax.swing.event.PopupMenuEvent;
import javax.swing.event.PopupMenuListener;
import javax.swing.plaf.ComboBoxUI;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.ComboPopup;
/**
* A component that allows a user to select any item in its list and
* displays the selected item to the user. JComboBox also can show/hide a
* popup menu containing its list of item whenever the mouse is pressed
* over it.
*
* @author Andrew Selkirk
* @author Olga Rodimina
* @author Robert Schuster
*/
public class JComboBox extends JComponent implements ItemSelectable,
ListDataListener,
ActionListener,
Accessible
{
private static final long serialVersionUID = 5654585963292734470L;
/**
* Classes implementing this interface are
* responsible for matching key characters typed by the user with combo
* box's items.
*/
public static interface KeySelectionManager
{
int selectionForKey(char aKey, ComboBoxModel aModel);
}
/**
* Maximum number of rows that should be visible by default in the
* JComboBox's popup
*/
private static final int DEFAULT_MAXIMUM_ROW_COUNT = 8;
/**
* Data model used by JComboBox to keep track of its list data and currently
* selected element in the list.
*/
protected ComboBoxModel dataModel;
/**
* Renderer renders(paints) every object in the combo box list in its
* associated list cell. This ListCellRenderer is used only when this
* JComboBox is uneditable.
*/
protected ListCellRenderer renderer;
/**
* Editor that is responsible for editing an object in a combo box list.
*/
protected ComboBoxEditor editor;
/**
* Number of rows that will be visible in the JComboBox's popup.
*/
protected int maximumRowCount;
/**
* This field indicates if textfield of this JComboBox is editable or not.
*/
protected boolean isEditable;
/**
* This field is reference to the current selection of the combo box.
*/
protected Object selectedItemReminder;
/**
* keySelectionManager
*/
protected KeySelectionManager keySelectionManager;
/**
* This actionCommand is used in ActionEvent that is fired to JComboBox's
* ActionListeneres.
*/
protected String actionCommand;
/**
* This property indicates if heavyweight popup or lightweight popup will be
* used to diplay JComboBox's elements.
*/
protected boolean lightWeightPopupEnabled;
/**
* The action taken when new item is selected in the JComboBox
*/
private Action action;
/**
* since 1.4 If this field is set then comboBox's display area for the
* selected item will be set by default to this value.
*/
private Object prototypeDisplayValue;
/**
* Constructs JComboBox object with specified data model for it.
* <p>Note that the JComboBox will not change the value that
* is preselected by your ComboBoxModel implementation.</p>
*
* @param model Data model that will be used by this JComboBox to keep track
* of its list of items.
*/
public JComboBox(ComboBoxModel model)
{
setEditable(false);
setEnabled(true);
setMaximumRowCount(DEFAULT_MAXIMUM_ROW_COUNT);
setModel(model);
setActionCommand("comboBoxChanged");
lightWeightPopupEnabled = true;
isEditable = false;
updateUI();
}
/**
* Constructs JComboBox with specified list of items.
*
* @param itemArray array containing list of items for this JComboBox
*/
public JComboBox(Object[] itemArray)
{
this(new DefaultComboBoxModel(itemArray));
if (itemArray.length > 0)
setSelectedIndex(0);
}
/**
* Constructs JComboBox object with specified list of items.
*
* @param itemVector vector containing list of items for this JComboBox.
*/
public JComboBox(Vector<?> itemVector)
{
this(new DefaultComboBoxModel(itemVector));
if (itemVector.size() > 0)
setSelectedIndex(0);
}
/**
* Constructor. Creates new empty JComboBox. ComboBox's data model is set to
* DefaultComboBoxModel.
*/
public JComboBox()
{
this(new DefaultComboBoxModel());
}
/**
* This method returns true JComboBox is editable and false otherwise
*
* @return boolean true if JComboBox is editable and false otherwise
*/
public boolean isEditable()
{
return isEditable;
}
/*
* This method adds ancestor listener to this JComboBox.
*/
protected void installAncestorListener()
{
/* FIXME: Need to implement.
*
* Need to add ancestor listener to this JComboBox. This listener
* should close combo box's popup list of items whenever it
* receives an AncestorEvent.
*/
}
/**
* Set the "UI" property of the combo box, which is a look and feel class
* responsible for handling comboBox's input events and painting it.
*
* @param ui The new "UI" property
*/
public void setUI(ComboBoxUI ui)
{
super.setUI(ui);
}
/**
* This method sets this comboBox's UI to the UIManager's default for the
* current look and feel.
*/
public void updateUI()
{
setUI((ComboBoxUI) UIManager.getUI(this));
}
/**
* This method returns the String identifier for the UI class to the used
* with the JComboBox.
*
* @return The String identifier for the UI class.
*/
public String getUIClassID()
{
return "ComboBoxUI";
}
/**
* This method returns the UI used to display the JComboBox.
*
* @return The UI used to display the JComboBox.
*/
public ComboBoxUI getUI()
{
return (ComboBoxUI) ui;
}
/**
* Set the data model for this JComboBox. This un-registers all listeners
* associated with the current model, and re-registers them with the new
* model.
*
* @param newDataModel The new data model for this JComboBox
*/
public void setModel(ComboBoxModel newDataModel)
{
// dataModel is null if it this method is called from inside the constructors.
if (dataModel != null)
{
// Prevents unneccessary updates.
if (dataModel == newDataModel)
return;
// Removes itself (as DataListener) from the to-be-replaced model.
dataModel.removeListDataListener(this);
}
/* Adds itself as a DataListener to the new model.
* It is intentioned that this operation will fail with a NullPointerException if the
* caller delivered a null argument.
*/
newDataModel.addListDataListener(this);
// Stores old data model for event notification.
ComboBoxModel oldDataModel = dataModel;
dataModel = newDataModel;
selectedItemReminder = newDataModel.getSelectedItem();
// Notifies the listeners of the model change.
firePropertyChange("model", oldDataModel, dataModel);
}
/**
* This method returns data model for this comboBox.
*
* @return ComboBoxModel containing items for this combo box.
*/
public ComboBoxModel getModel()
{
return dataModel;
}
/**
* This method sets JComboBox's popup to be either lightweight or
* heavyweight. If 'enabled' is true then lightweight popup is used and
* heavyweight otherwise. By default lightweight popup is used to display
* this JComboBox's elements.
*
* @param enabled indicates if lightweight popup or heavyweight popup should
* be used to display JComboBox's elements.
*/
public void setLightWeightPopupEnabled(boolean enabled)
{
lightWeightPopupEnabled = enabled;
}
/**
* This method returns whether popup menu that is used to display list of
* combo box's item is lightWeight or not.
*
* @return boolean true if popup menu is lightweight and false otherwise.
*/
public boolean isLightWeightPopupEnabled()
{
return lightWeightPopupEnabled;
}
/**
* This method sets editability of the combo box. If combo box is editable
* the user can choose component from the combo box list by typing
* component's name in the editor(JTextfield by default). Otherwise if not
* editable, the user should use the list to choose the component. This
* method fires PropertyChangeEvents to JComboBox's registered
* PropertyChangeListeners to indicate that 'editable' property of the
* JComboBox has changed.
*
* @param editable indicates if the JComboBox's textfield should be editable
* or not.
*/
public void setEditable(boolean editable)
{
if (isEditable != editable)
{
isEditable = editable;
firePropertyChange("editable", !isEditable, isEditable);
}
}
/**
* Sets number of rows that should be visible in this JComboBox's popup. If
* this JComboBox's popup has more elements that maximum number or rows
* then popup will have a scroll pane to allow users to view other
* elements.
*
* @param rowCount number of rows that will be visible in JComboBox's popup.
*/
public void setMaximumRowCount(int rowCount)
{
if (maximumRowCount != rowCount)
{
int oldMaximumRowCount = maximumRowCount;
maximumRowCount = rowCount;
firePropertyChange("maximumRowCount", oldMaximumRowCount,
maximumRowCount);
}
}
/**
* This method returns number of rows visible in the JComboBox's list of
* items.
*
* @return int maximun number of visible rows in the JComboBox's list.
*/
public int getMaximumRowCount()
{
return maximumRowCount;
}
/**
* This method sets cell renderer for this JComboBox that will be used to
* paint combo box's items. The Renderer should only be used only when
* JComboBox is not editable. In the case when JComboBox is editable the
* editor must be used. This method also fires PropertyChangeEvent when
* cellRendered for this JComboBox has changed.
*
* @param aRenderer cell renderer that will be used by this JComboBox to
* paint its elements.
*/
public void setRenderer(ListCellRenderer aRenderer)
{
if (renderer != aRenderer)
{
ListCellRenderer oldRenderer = renderer;
renderer = aRenderer;
firePropertyChange("renderer", oldRenderer, renderer);
}
}
/**
* This method returns renderer responsible for rendering selected item in
* the combo box
*
* @return ListCellRenderer
*/
public ListCellRenderer getRenderer()
{
return renderer;
}
/**
* Sets editor for this JComboBox
*
* @param newEditor ComboBoxEditor for this JComboBox. This method fires
* PropertyChangeEvent when 'editor' property is changed.
*/
public void setEditor(ComboBoxEditor newEditor)
{
if (editor == newEditor)
return;
if (editor != null)
editor.removeActionListener(this);
ComboBoxEditor oldEditor = editor;
editor = newEditor;
if (editor != null)
editor.addActionListener(this);
firePropertyChange("editor", oldEditor, editor);
}
/**
* Returns editor component that is responsible for displaying/editing
* selected item in the combo box.
*
* @return ComboBoxEditor
*/
public ComboBoxEditor getEditor()
{
return editor;
}
/**
* Forces combo box to select given item
*
* @param item element in the combo box to select.
*/
public void setSelectedItem(Object item)
{
dataModel.setSelectedItem(item);
fireActionEvent();
}
/**
* Returns currently selected item in the combo box.
* The result may be <code>null</code> to indicate that nothing is
* currently selected.
*
* @return element that is currently selected in this combo box.
*/
public Object getSelectedItem()
{
return dataModel.getSelectedItem();
}
/**
* Forces JComboBox to select component located in the given index in the
* combo box.
* <p>If the index is below -1 or exceeds the upper bound an
* <code>IllegalArgumentException</code> is thrown.<p/>
* <p>If the index is -1 then no item gets selected.</p>
*
* @param index index specifying location of the component that should be
* selected.
*/
public void setSelectedIndex(int index)
{
if (index < -1 || index >= dataModel.getSize())
// Fails because index is out of bounds.
throw new IllegalArgumentException("illegal index: " + index);
else
// Selects the item at the given index or clears the selection if the
// index value is -1.
setSelectedItem((index == -1) ? null : dataModel.getElementAt(index));
}
/**
* Returns index of the item that is currently selected in the combo box. If
* no item is currently selected, then -1 is returned.
* <p>
* Note: For performance reasons you should minimize invocation of this
* method. If the data model is not an instance of
* <code>DefaultComboBoxModel</code> the complexity is O(n) where n is the
* number of elements in the combo box.
* </p>
*
* @return int Index specifying location of the currently selected item in the
* combo box or -1 if nothing is selected in the combo box.
*/
public int getSelectedIndex()
{
Object selectedItem = getSelectedItem();
if (selectedItem != null)
{
if (dataModel instanceof DefaultComboBoxModel)
// Uses special method of DefaultComboBoxModel to retrieve the index.
return ((DefaultComboBoxModel) dataModel).getIndexOf(selectedItem);
else
{
// Iterates over all items to retrieve the index.
int size = dataModel.getSize();
for (int i = 0; i < size; i++)
{
Object o = dataModel.getElementAt(i);
// XXX: Is special handling of ComparableS neccessary?
if ((selectedItem != null) ? selectedItem.equals(o) : o == null)
return i;
}
}
}
// returns that no item is currently selected
return -1;
}
/**
* Returns an object that is used as the display value when calculating the
* preferred size for the combo box. This value is, of course, never
* displayed anywhere.
*
* @return The prototype display value (possibly <code>null</code>).
*
* @since 1.4
* @see #setPrototypeDisplayValue(Object)
*/
public Object getPrototypeDisplayValue()
{
return prototypeDisplayValue;
}
/**
* Sets the object that is assumed to be the displayed item when calculating
* the preferred size for the combo box. A {@link PropertyChangeEvent} (with
* the name <code>prototypeDisplayValue</code>) is sent to all registered
* listeners.
*
* @param value the new value (<code>null</code> permitted).
*
* @since 1.4
* @see #getPrototypeDisplayValue()
*/
public void setPrototypeDisplayValue(Object value)
{
Object oldValue = prototypeDisplayValue;
prototypeDisplayValue = value;
firePropertyChange("prototypeDisplayValue", oldValue, value);
}
/**
* This method adds given element to this JComboBox.
* <p>A <code>RuntimeException</code> is thrown if the data model is not
* an instance of {@link MutableComboBoxModel}.</p>
*
* @param element element to add
*/
public void addItem(Object element)
{
if (dataModel instanceof MutableComboBoxModel)
((MutableComboBoxModel) dataModel).addElement(element);
else
throw new RuntimeException("Unable to add the item because the data "
+ "model it is not an instance of "
+ "MutableComboBoxModel.");
}
/**
* Inserts given element at the specified index to this JComboBox.
* <p>A <code>RuntimeException</code> is thrown if the data model is not
* an instance of {@link MutableComboBoxModel}.</p>
*
* @param element element to insert
* @param index position where to insert the element
*/
public void insertItemAt(Object element, int index)
{
if (dataModel instanceof MutableComboBoxModel)
((MutableComboBoxModel) dataModel).insertElementAt(element, index);
else
throw new RuntimeException("Unable to insert the item because the data "
+ "model it is not an instance of "
+ "MutableComboBoxModel.");
}
/**
* This method removes given element from this JComboBox.
* <p>A <code>RuntimeException</code> is thrown if the data model is not
* an instance of {@link MutableComboBoxModel}.</p>
*
* @param element element to remove
*/
public void removeItem(Object element)
{
if (dataModel instanceof MutableComboBoxModel)
((MutableComboBoxModel) dataModel).removeElement(element);
else
throw new RuntimeException("Unable to remove the item because the data "
+ "model it is not an instance of "
+ "MutableComboBoxModel.");
}
/**
* This method remove element location in the specified index in the
* JComboBox.
* <p>A <code>RuntimeException</code> is thrown if the data model is not
* an instance of {@link MutableComboBoxModel}.</p>
*
* @param index index specifying position of the element to remove
*/
public void removeItemAt(int index)
{
if (dataModel instanceof MutableComboBoxModel)
((MutableComboBoxModel) dataModel).removeElementAt(index);
else
throw new RuntimeException("Unable to remove the item because the data "
+ "model it is not an instance of "
+ "MutableComboBoxModel.");
}
/**
* This method removes all elements from this JComboBox.
* <p>
* A <code>RuntimeException</code> is thrown if the data model is not an
* instance of {@link MutableComboBoxModel}.
* </p>
*/
public void removeAllItems()
{
if (dataModel instanceof DefaultComboBoxModel)
// Uses special method if we have a DefaultComboBoxModel.
((DefaultComboBoxModel) dataModel).removeAllElements();
else if (dataModel instanceof MutableComboBoxModel)
{
// Iterates over all items and removes each.
MutableComboBoxModel mcbm = (MutableComboBoxModel) dataModel;
// We intentionally remove the items backwards to support models which
// shift their content to the beginning (e.g. linked lists)
for (int i = mcbm.getSize() - 1; i >= 0; i--)
mcbm.removeElementAt(i);
}
else
throw new RuntimeException("Unable to remove the items because the data "
+ "model it is not an instance of "
+ "MutableComboBoxModel.");
}
/**
* This method displays popup with list of combo box's items on the screen
*/
public void showPopup()
{
setPopupVisible(true);
}
/**
* This method hides popup containing list of combo box's items
*/
public void hidePopup()
{
setPopupVisible(false);
}
/**
* This method either displayes or hides the popup containing list of combo
* box's items.
*
* @param visible show popup if 'visible' is true and hide it otherwise
*/
public void setPopupVisible(boolean visible)
{
getUI().setPopupVisible(this, visible);
}
/**
* Checks if popup is currently visible on the screen.
*
* @return boolean true if popup is visible and false otherwise
*/
public boolean isPopupVisible()
{
return getUI().isPopupVisible(this);
}
/**
* This method sets actionCommand to the specified string. ActionEvent fired
* to this JComboBox registered ActionListeners will contain this
* actionCommand.
*
* @param aCommand new action command for the JComboBox's ActionEvent
*/
public void setActionCommand(String aCommand)
{
actionCommand = aCommand;
}
/**
* Returns actionCommand associated with the ActionEvent fired by the
* JComboBox to its registered ActionListeners.
*
* @return String actionCommand for the ActionEvent
*/
public String getActionCommand()
{
return actionCommand;
}
/**
* setAction
*
* @param a action to set
*/
public void setAction(Action a)
{
Action old = action;
action = a;
configurePropertiesFromAction(action);
if (action != null)
// FIXME: remove from old action and add to new action
// PropertyChangeListener to listen to changes in the action
addActionListener(action);
}
/**
* This method returns Action that is invoked when selected item is changed
* in the JComboBox.
*
* @return Action
*/
public Action getAction()
{
return action;
}
/**
* Configure properties of the JComboBox by reading properties of specified
* action. This method always sets the comboBox's "enabled" property to the
* value of the Action's "enabled" property.
*
* @param a An Action to configure the combo box from
*/
protected void configurePropertiesFromAction(Action a)
{
if (a == null)
{
setEnabled(true);
setToolTipText(null);
}
else
{
setEnabled(a.isEnabled());
setToolTipText((String) (a.getValue(Action.SHORT_DESCRIPTION)));
}
}
/**
* Creates PropertyChangeListener to listen for the changes in comboBox's
* action properties.
*
* @param action action to listen to for property changes
*
* @return a PropertyChangeListener that listens to changes in
* action properties.
*/
protected PropertyChangeListener createActionPropertyChangeListener(Action action)
{
return new PropertyChangeListener()
{
public void propertyChange(PropertyChangeEvent e)
{
Action act = (Action) (e.getSource());
configurePropertiesFromAction(act);
}
};
}
/**
* This method fires ItemEvent to this JComboBox's registered ItemListeners.
* This method is invoked when currently selected item in this combo box
* has changed.
*
* @param e the ItemEvent describing the change in the combo box's
* selection.
*/
protected void fireItemStateChanged(ItemEvent e)
{
ItemListener[] ll = getItemListeners();
for (int i = 0; i < ll.length; i++)
ll[i].itemStateChanged(e);
}
/**
* This method fires ActionEvent to this JComboBox's registered
* ActionListeners. This method is invoked when user explicitly changes
* currently selected item.
*/
protected void fireActionEvent()
{
ActionListener[] ll = getActionListeners();
for (int i = 0; i < ll.length; i++)
ll[i].actionPerformed(new ActionEvent(this,
ActionEvent.ACTION_PERFORMED,
actionCommand));
}
/**
* Fires a popupMenuCanceled() event to all <code>PopupMenuListeners</code>.
*
* Note: This method is intended for use by plaf classes only.
*/
public void firePopupMenuCanceled()
{
PopupMenuListener[] listeners = getPopupMenuListeners();
PopupMenuEvent e = new PopupMenuEvent(this);
for (int i = 0; i < listeners.length; i++)
listeners[i].popupMenuCanceled(e);
}
/**
* Fires a popupMenuWillBecomeInvisible() event to all
* <code>PopupMenuListeners</code>.
*
* Note: This method is intended for use by plaf classes only.
*/
public void firePopupMenuWillBecomeInvisible()
{
PopupMenuListener[] listeners = getPopupMenuListeners();
PopupMenuEvent e = new PopupMenuEvent(this);
for (int i = 0; i < listeners.length; i++)
listeners[i].popupMenuWillBecomeInvisible(e);
}
/**
* Fires a popupMenuWillBecomeVisible() event to all
* <code>PopupMenuListeners</code>.
*
* Note: This method is intended for use by plaf classes only.
*/
public void firePopupMenuWillBecomeVisible()
{
PopupMenuListener[] listeners = getPopupMenuListeners();
PopupMenuEvent e = new PopupMenuEvent(this);
for (int i = 0; i < listeners.length; i++)
listeners[i].popupMenuWillBecomeVisible(e);
}
/**
* This method is invoked whenever selected item changes in the combo box's
* data model. It fires ItemEvent and ActionEvent to all registered
* ComboBox's ItemListeners and ActionListeners respectively, indicating
* the change.
*/
protected void selectedItemChanged()
{
// Fire ItemEvent to indicated that previously selected item is now
// deselected
if (selectedItemReminder != null)
fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED,
selectedItemReminder,
ItemEvent.DESELECTED));
// Fire ItemEvent to indicate that new item is selected
Object newSelection = getSelectedItem();
if (newSelection != null)
fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED,
newSelection, ItemEvent.SELECTED));
// Fire Action Event to JComboBox's registered listeners
fireActionEvent();
selectedItemReminder = newSelection;
}
/**
* Returns Object array of size 1 containing currently selected element in
* the JComboBox.
*
* @return Object[] Object array of size 1 containing currently selected
* element in the JComboBox.
*/
public Object[] getSelectedObjects()
{
return new Object[] { getSelectedItem() };
}
/**
* This method handles actionEvents fired by the ComboBoxEditor. It changes
* this JComboBox's selection to the new value currently in the editor and
* hides list of combo box items.
*
* @param e the ActionEvent
*/
public void actionPerformed(ActionEvent e)
{
setSelectedItem(getEditor().getItem());
setPopupVisible(false);
}
/**
* This method selects item in this combo box that matches specified
* specified keyChar and returns true if such item is found. Otherwise
* false is returned.
*
* @param keyChar character indicating which item in the combo box should be
* selected.
*
* @return boolean true if item corresponding to the specified keyChar
* exists in the combo box. Otherwise false is returned.
*/
public boolean selectWithKeyChar(char keyChar)
{
if (keySelectionManager == null)
{
keySelectionManager = createDefaultKeySelectionManager();
}
int index = keySelectionManager.selectionForKey(keyChar, getModel());
boolean retVal = false;
if (index >= 0)
{
setSelectedIndex(index);
retVal = true;
}
return retVal;
}
/**
* The part of implementation of ListDataListener interface. This method is
* invoked when some items where added to the JComboBox's data model.
*
* @param event ListDataEvent describing the change
*/
public void intervalAdded(ListDataEvent event)
{
// FIXME: Need to implement
repaint();
}
/**
* The part of implementation of ListDataListener interface. This method is
* invoked when some items where removed from the JComboBox's data model.
*
* @param event ListDataEvent describing the change.
*/
public void intervalRemoved(ListDataEvent event)
{
// FIXME: Need to implement
repaint();
}
/**
* The part of implementation of ListDataListener interface. This method is
* invoked when contents of the JComboBox's data model changed.
*
* @param event ListDataEvent describing the change
*/
public void contentsChanged(ListDataEvent event)
{
// if first and last index of the given ListDataEvent are both -1,
// then it indicates that selected item in the combo box data model
// have changed.
if (event.getIndex0() == -1 && event.getIndex1() == -1)
selectedItemChanged();
}
/**
* This method disables or enables JComboBox. If the JComboBox is enabled,
* then user is able to make item choice, otherwise if JComboBox is
* disabled then user is not able to make a selection.
*
* @param enabled if 'enabled' is true then enable JComboBox and disable it
*/
public void setEnabled(boolean enabled)
{
boolean oldEnabled = super.isEnabled();
if (enabled != oldEnabled)
{
super.setEnabled(enabled);
firePropertyChange("enabled", oldEnabled, enabled);
}
}
/**
* This method initializes specified ComboBoxEditor to display given item.
*
* @param anEditor ComboBoxEditor to initialize
* @param anItem Item that should displayed in the specified editor
*/
public void configureEditor(ComboBoxEditor anEditor, Object anItem)
{
anEditor.setItem(anItem);
}
/**
* This method is fired whenever a key is pressed with the combo box
* in focus
*
* @param e The KeyEvent indicating which key was pressed.
*/
public void processKeyEvent(KeyEvent e)
{
if (e.getKeyCode() == KeyEvent.VK_TAB)
setPopupVisible(false);
else
super.processKeyEvent(e);
}
/**
* setKeySelectionManager
*
* @param aManager
*/
public void setKeySelectionManager(KeySelectionManager aManager)
{
keySelectionManager = aManager;
}
/**
* getKeySelectionManager
*
* @return JComboBox.KeySelectionManager
*/
public KeySelectionManager getKeySelectionManager()
{
return keySelectionManager;
}
/**
* This method returns number of elements in this JComboBox
*
* @return int number of elements in this JComboBox
*/
public int getItemCount()
{
return dataModel.getSize();
}
/**
* Returns elements located in the combo box at the given index.
*
* @param index index specifying location of the component to return.
*
* @return component in the combo box that is located in the given index.
*/
public Object getItemAt(int index)
{
return dataModel.getElementAt(index);
}
/**
* createDefaultKeySelectionManager
*
* @return KeySelectionManager
*/
protected KeySelectionManager createDefaultKeySelectionManager()
{
return new DefaultKeySelectionManager();
}
/**
* Returns an implementation-dependent string describing the attributes of
* this <code>JComboBox</code>.
*
* @return A string describing the attributes of this <code>JComboBox</code>
* (never <code>null</code>).
*/
protected String paramString()
{
String superParamStr = super.paramString();
CPStringBuilder sb = new CPStringBuilder();
sb.append(",isEditable=").append(isEditable());
sb.append(",lightWeightPopupEnabled=").append(isLightWeightPopupEnabled());
sb.append(",maximumRowCount=").append(getMaximumRowCount());
sb.append(",selectedItemReminder=");
if (selectedItemReminder != null)
sb.append(selectedItemReminder);
return superParamStr + sb.toString();
}
/**
* Returns the object that provides accessibility features for this
* <code>JComboBox</code> component.
*
* @return The accessible context (an instance of
* {@link AccessibleJComboBox}).
*/
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
accessibleContext = new AccessibleJComboBox();
return accessibleContext;
}
/**
* This methods adds specified ActionListener to this JComboBox.
*
* @param listener to add
*/
public void addActionListener(ActionListener listener)
{
listenerList.add(ActionListener.class, listener);
}
/**
* This method removes specified ActionListener from this JComboBox.
*
* @param listener ActionListener
*/
public void removeActionListener(ActionListener listener)
{
listenerList.remove(ActionListener.class, listener);
}
/**
* This method returns array of ActionListeners that are registered with
* this JComboBox.
*
* @since 1.4
*/
public ActionListener[] getActionListeners()
{
return (ActionListener[]) getListeners(ActionListener.class);
}
/**
* This method registers given ItemListener with this JComboBox
*
* @param listener to remove
*/
public void addItemListener(ItemListener listener)
{
listenerList.add(ItemListener.class, listener);
}
/**
* This method unregisters given ItemListener from this JComboBox
*
* @param listener to remove
*/
public void removeItemListener(ItemListener listener)
{
listenerList.remove(ItemListener.class, listener);
}
/**
* This method returns array of ItemListeners that are registered with this
* JComboBox.
*
* @since 1.4
*/
public ItemListener[] getItemListeners()
{
return (ItemListener[]) getListeners(ItemListener.class);
}
/**
* Adds PopupMenuListener to combo box to listen to the events fired by the
* combo box's popup menu containing its list of items
*
* @param listener to add
*/
public void addPopupMenuListener(PopupMenuListener listener)
{
listenerList.add(PopupMenuListener.class, listener);
}
/**
* Removes PopupMenuListener to combo box to listen to the events fired by
* the combo box's popup menu containing its list of items
*
* @param listener to add
*/
public void removePopupMenuListener(PopupMenuListener listener)
{
listenerList.remove(PopupMenuListener.class, listener);
}
/**
* Returns array of PopupMenuListeners that are registered with combo box.
*/
public PopupMenuListener[] getPopupMenuListeners()
{
return (PopupMenuListener[]) getListeners(PopupMenuListener.class);
}
/**
* Accessibility support for <code>JComboBox</code>.
*/
protected class AccessibleJComboBox extends AccessibleJComponent
implements AccessibleAction, AccessibleSelection
{
private static final long serialVersionUID = 8217828307256675666L;
/**
* @specnote This constructor was protected in 1.4, but made public
* in 1.5.
*/
public AccessibleJComboBox()
{
// Nothing to do here.
}
/**
* Returns the number of accessible children of this object. The
* implementation of AccessibleJComboBox delegates this call to the UI
* of the associated JComboBox.
*
* @return the number of accessible children of this object
*
* @see ComponentUI#getAccessibleChildrenCount(JComponent)
*/
public int getAccessibleChildrenCount()
{
ComponentUI ui = getUI();
int count;
if (ui != null)
count = ui.getAccessibleChildrenCount(JComboBox.this);
else
count = super.getAccessibleChildrenCount();
return count;
}
/**
* Returns the number of accessible children of this object. The
* implementation of AccessibleJComboBox delegates this call to the UI
* of the associated JComboBox.
*
* @param index the index of the accessible child to fetch
*
* @return the number of accessible children of this object
*
* @see ComponentUI#getAccessibleChild(JComponent, int)
*/
public Accessible getAccessibleChild(int index)
{
ComponentUI ui = getUI();
Accessible child = null;
if (ui != null)
child = ui.getAccessibleChild(JComboBox.this, index);
else
child = super.getAccessibleChild(index);
return child;
}
/**
* Returns the AccessibleSelection object associated with this object.
* AccessibleJComboBoxes handle their selection themselves, so this
* always returns <code>this</code>.
*
* @return the AccessibleSelection object associated with this object
*/
public AccessibleSelection getAccessibleSelection()
{
return this;
}
/**
* Returns the accessible selection from this AccssibleJComboBox.
*
* @param index the index of the selected child to fetch
*
* @return the accessible selection from this AccssibleJComboBox
*/
public Accessible getAccessibleSelection(int index)
{
// Get hold of the actual popup.
Accessible popup = getUI().getAccessibleChild(JComboBox.this, 0);
Accessible selected = null;
if (popup != null && popup instanceof ComboPopup)
{
ComboPopup cPopup = (ComboPopup) popup;
// Query the list for the currently selected child.
JList l = cPopup.getList();
AccessibleContext listCtx = l.getAccessibleContext();
if (listCtx != null)
{
AccessibleSelection s = listCtx.getAccessibleSelection();
if (s != null)
{
selected = s.getAccessibleSelection(index);
}
}
}
return selected;
}
/**
* Returns <code>true</code> if the accessible child with the specified
* <code>index</code> is selected, <code>false</code> otherwise.
*
* @param index the index of the accessible child
*
* @return <code>true</code> if the accessible child with the specified
* <code>index</code> is selected, <code>false</code> otherwise
*/
public boolean isAccessibleChildSelected(int index)
{
return getSelectedIndex() == index;
}
/**
* Returns the accessible role for the <code>JComboBox</code> component.
*
* @return {@link AccessibleRole#COMBO_BOX}.
*/
public AccessibleRole getAccessibleRole()
{
return AccessibleRole.COMBO_BOX;
}
/**
* Returns the accessible action associated to this accessible object.
* AccessibleJComboBox implements its own AccessibleAction, so this
* method returns <code>this</code>.
*
* @return the accessible action associated to this accessible object
*/
public AccessibleAction getAccessibleAction()
{
return this;
}
/**
* Returns the description of the specified action. AccessibleJComboBox
* implements 1 action (toggle the popup menu) and thus returns
* <code>UIManager.getString("ComboBox.togglePopupText")</code>
*
* @param actionIndex the index of the action for which to return the
* description
*
* @return the description of the specified action
*/
public String getAccessibleActionDescription(int actionIndex)
{
return UIManager.getString("ComboBox.togglePopupText");
}
/**
* Returns the number of accessible actions that can be performed by
* this object. AccessibleJComboBox implement s one accessible action
* (toggle the popup menu), so this method always returns <code>1</code>.
*
* @return the number of accessible actions that can be performed by
* this object
*/
public int getAccessibleActionCount()
{
return 1;
}
/**
* Performs the accessible action with the specified index.
* AccessibleJComboBox has 1 accessible action
* (<code>actionIndex == 0</code>), which is to toggle the
* popup menu. All other action indices have no effect and return
* <code<>false</code>.
*
* @param actionIndex the index of the action to perform
*
* @return <code>true</code> if the action has been performed,
* <code>false</code> otherwise
*/
public boolean doAccessibleAction(int actionIndex)
{
boolean actionPerformed = false;
if (actionIndex == 0)
{
setPopupVisible(! isPopupVisible());
actionPerformed = true;
}
return actionPerformed;
}
/**
* Returns the number of selected accessible children of this object. This
* returns <code>1</code> if the combobox has a selected entry,
* <code>0</code> otherwise.
*
* @return the number of selected accessible children of this object
*/
public int getAccessibleSelectionCount()
{
Object sel = getSelectedItem();
int count = 0;
if (sel != null)
count = 1;
return count;
}
/**
* Sets the current selection to the specified <code>index</code>.
*
* @param index the index to set as selection
*/
public void addAccessibleSelection(int index)
{
setSelectedIndex(index);
}
/**
* Removes the specified index from the current selection.
*
* @param index the index to remove from the selection
*/
public void removeAccessibleSelection(int index)
{
if (getSelectedIndex() == index)
clearAccessibleSelection();
}
/**
* Clears the current selection.
*/
public void clearAccessibleSelection()
{
setSelectedIndex(-1);
}
/**
* Multiple selection is not supported by AccessibleJComboBox, so this
* does nothing.
*/
public void selectAllAccessibleSelection()
{
// Nothing to do here.
}
}
private class DefaultKeySelectionManager
implements KeySelectionManager
{
public int selectionForKey(char aKey, ComboBoxModel aModel)
{
int selectedIndex = getSelectedIndex();
// Start at currently selected item and iterate to end of list
for (int i = selectedIndex + 1; i < aModel.getSize(); i++)
{
String nextItem = aModel.getElementAt(i).toString();
if (nextItem.charAt(0) == aKey)
return i;
}
// Wrap to start of list if no match yet
for (int i = 0; i <= selectedIndex; i++)
{
String nextItem = aModel.getElementAt(i).toString();
if (nextItem.charAt(0) == aKey)
return i;
}
return - 1;
}
}
}