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
948 lines
26 KiB
Java
948 lines
26 KiB
Java
/* JPopupMenu.java --
|
|
Copyright (C) 2002, 2004, 2005 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.Component;
|
|
import java.awt.Dimension;
|
|
import java.awt.Insets;
|
|
import java.awt.Point;
|
|
import java.awt.event.KeyEvent;
|
|
import java.awt.event.MouseEvent;
|
|
import java.beans.PropertyChangeEvent;
|
|
import java.beans.PropertyChangeListener;
|
|
import java.util.ArrayList;
|
|
import java.util.EventListener;
|
|
|
|
import javax.accessibility.Accessible;
|
|
import javax.accessibility.AccessibleContext;
|
|
import javax.accessibility.AccessibleRole;
|
|
import javax.swing.event.MenuKeyListener;
|
|
import javax.swing.event.PopupMenuEvent;
|
|
import javax.swing.event.PopupMenuListener;
|
|
import javax.swing.plaf.PopupMenuUI;
|
|
|
|
/**
|
|
* JPopupMenu is a container that is used to display popup menu's menu
|
|
* items. By default JPopupMenu is a lightweight container, however if it
|
|
* is the case that JPopupMenu's bounds are outside of main window, then
|
|
* heawyweight container will be used to display menu items. It is also
|
|
* possible to change JPopupMenu's default behavior and set JPopupMenu
|
|
* to always use heavyweight container.
|
|
*
|
|
* JPopupMenu can be displayed anywhere; it is a floating free popup menu.
|
|
* However before JPopupMenu is diplayed, its invoker property should be set.
|
|
* JPopupMenu's invoker is a component relative to which popup menu is
|
|
* displayed.
|
|
*
|
|
* JPopupMenu fires PopupMenuEvents to its registered listeners. Whenever
|
|
* JPopupMenu becomes visible on the screen then PopupMenuEvent indicating
|
|
* that popup menu became visible will be fired. In the case when
|
|
* JPopupMenu becomes invisible or cancelled without selection, then
|
|
* popupMenuBecomeInvisible() or popupMenuCancelled() methods of
|
|
* PopupMenuListeners will be invoked.
|
|
*
|
|
* JPopupMenu also fires PropertyChangeEvents when its bound properties
|
|
* change.In addittion to inheritted bound properties, JPopupMenu has
|
|
* 'visible' bound property. When JPopupMenu becomes visible/invisible on
|
|
* the screen it fires PropertyChangeEvents to its registered
|
|
* PropertyChangeListeners.
|
|
*/
|
|
public class JPopupMenu extends JComponent implements Accessible, MenuElement
|
|
{
|
|
private static final long serialVersionUID = -8336996630009646009L;
|
|
|
|
/* indicates if popup's menu border should be painted*/
|
|
private boolean borderPainted = true;
|
|
|
|
/** Flag indicating whether lightweight, mediumweight or heavyweight popup
|
|
is used to display menu items.
|
|
|
|
These are the possible cases:
|
|
|
|
1. if DefaultLightWeightPopupEnabled true
|
|
(i) use lightweight container if popup feets inside top-level window
|
|
(ii) only use heavyweight container (JDialog) if popup doesn't fit.
|
|
|
|
2. if DefaultLightWeightPopupEnabled false
|
|
(i) if popup fits, use awt.Panel (mediumWeight)
|
|
(ii) if popup doesn't fit, use JDialog (heavyWeight)
|
|
*/
|
|
private static boolean DefaultLightWeightPopupEnabled = true;
|
|
|
|
/* Component that invokes popup menu. */
|
|
transient Component invoker;
|
|
|
|
/* Label for this popup menu. It is not used in most of the look and feel themes. */
|
|
private String label;
|
|
|
|
/*Amount of space between menuItem's in JPopupMenu and JPopupMenu's border */
|
|
private Insets margin;
|
|
|
|
/** Indicates whether ligthWeight container can be used to display popup
|
|
menu. This flag is the same as DefaultLightWeightPopupEnabled, but setting
|
|
this flag can change popup menu after creation of the object */
|
|
private boolean lightWeightPopupEnabled;
|
|
|
|
/** SelectionModel that keeps track of menu selection. */
|
|
protected SingleSelectionModel selectionModel;
|
|
|
|
/* Popup that is used to display JPopupMenu */
|
|
private transient Popup popup;
|
|
|
|
/**
|
|
* Location of the popup, X coordinate.
|
|
*/
|
|
private int popupLocationX;
|
|
|
|
/**
|
|
* Location of the popup, Y coordinate.
|
|
*/
|
|
private int popupLocationY;
|
|
|
|
/* Field indicating if popup menu is visible or not */
|
|
private boolean visible = false;
|
|
|
|
/**
|
|
* Creates a new JPopupMenu object.
|
|
*/
|
|
public JPopupMenu()
|
|
{
|
|
this(null);
|
|
}
|
|
|
|
/**
|
|
* Creates a new JPopupMenu with specified label
|
|
*
|
|
* @param label Label for popup menu.
|
|
*/
|
|
public JPopupMenu(String label)
|
|
{
|
|
lightWeightPopupEnabled = getDefaultLightWeightPopupEnabled();
|
|
setLabel(label);
|
|
setSelectionModel(new DefaultSingleSelectionModel());
|
|
super.setVisible(false);
|
|
updateUI();
|
|
}
|
|
|
|
/**
|
|
* Adds given menu item to the popup menu
|
|
*
|
|
* @param item menu item to add to the popup menu
|
|
*
|
|
* @return menu item that was added to the popup menu
|
|
*/
|
|
public JMenuItem add(JMenuItem item)
|
|
{
|
|
this.insert(item, -1);
|
|
return item;
|
|
}
|
|
|
|
/**
|
|
* Constructs menu item with a specified label and adds it to
|
|
* popup menu
|
|
*
|
|
* @param text label for the menu item to be added
|
|
*
|
|
* @return constructed menu item that was added to the popup menu
|
|
*/
|
|
public JMenuItem add(String text)
|
|
{
|
|
JMenuItem item = new JMenuItem(text);
|
|
return add(item);
|
|
}
|
|
|
|
/**
|
|
* Constructs menu item associated with the specified action
|
|
* and adds it to the popup menu
|
|
*
|
|
* @param action Action for the new menu item
|
|
*
|
|
* @return menu item that was added to the menu
|
|
*/
|
|
public JMenuItem add(Action action)
|
|
{
|
|
JMenuItem item = createActionComponent(action);
|
|
|
|
if (action != null)
|
|
action.addPropertyChangeListener(createActionChangeListener(item));
|
|
|
|
return add(item);
|
|
}
|
|
|
|
/**
|
|
* Revomes component at the given index from the menu.
|
|
*
|
|
* @param index index of the component that will be removed in the menu
|
|
*/
|
|
public void remove(int index)
|
|
{
|
|
super.remove(index);
|
|
revalidate();
|
|
}
|
|
|
|
/**
|
|
* Create menu item associated with the given action
|
|
* and inserts it into the popup menu at the specified index
|
|
*
|
|
* @param action Action for the new menu item
|
|
* @param index index in the popup menu at which to insert new menu item.
|
|
*/
|
|
public void insert(Action action, int index)
|
|
{
|
|
JMenuItem item = new JMenuItem(action);
|
|
this.insert(item, index);
|
|
}
|
|
|
|
/**
|
|
* Insert given component to the popup menu at the
|
|
* specified index
|
|
*
|
|
* @param component Component to insert
|
|
* @param index Index at which to insert given component
|
|
*/
|
|
public void insert(Component component, int index)
|
|
{
|
|
super.add(component, index);
|
|
}
|
|
|
|
/**
|
|
* Returns flag indicating if newly created JPopupMenu will use
|
|
* heavyweight or lightweight container to display its menu items
|
|
*
|
|
* @return true if JPopupMenu will use lightweight container to display
|
|
* menu items by default, and false otherwise.
|
|
*/
|
|
public static boolean getDefaultLightWeightPopupEnabled()
|
|
{
|
|
return DefaultLightWeightPopupEnabled;
|
|
}
|
|
|
|
/**
|
|
* Sets whether JPopupMenu should use ligthWeight container to
|
|
* display it menu items by default
|
|
*
|
|
* @param enabled true if JPopupMenu should use lightweight container
|
|
* for displaying its menu items, and false otherwise.
|
|
*/
|
|
public static void setDefaultLightWeightPopupEnabled(boolean enabled)
|
|
{
|
|
DefaultLightWeightPopupEnabled = enabled;
|
|
}
|
|
|
|
/**
|
|
* This method returns the UI used to display the JPopupMenu.
|
|
*
|
|
* @return The UI used to display the JPopupMenu.
|
|
*/
|
|
public PopupMenuUI getUI()
|
|
{
|
|
return (PopupMenuUI) ui;
|
|
}
|
|
|
|
/**
|
|
* Set the "UI" property of the menu item, which is a look and feel class
|
|
* responsible for handling popupMenu's input events and painting it.
|
|
*
|
|
* @param ui The new "UI" property
|
|
*/
|
|
public void setUI(PopupMenuUI ui)
|
|
{
|
|
super.setUI(ui);
|
|
}
|
|
|
|
/**
|
|
* This method sets this menuItem's UI to the UIManager's default for the
|
|
* current look and feel.
|
|
*/
|
|
public void updateUI()
|
|
{
|
|
setUI((PopupMenuUI) UIManager.getUI(this));
|
|
}
|
|
|
|
/**
|
|
* This method returns a name to identify which look and feel class will be
|
|
* the UI delegate for the menuItem.
|
|
*
|
|
* @return The Look and Feel classID. "PopupMenuUI"
|
|
*/
|
|
public String getUIClassID()
|
|
{
|
|
return "PopupMenuUI";
|
|
}
|
|
|
|
/**
|
|
* Returns selectionModel used by this popup menu to keep
|
|
* track of the selection.
|
|
*
|
|
* @return popup menu's selection model
|
|
*/
|
|
public SingleSelectionModel getSelectionModel()
|
|
{
|
|
return selectionModel;
|
|
}
|
|
|
|
/**
|
|
* Sets selection model for this popup menu
|
|
*
|
|
* @param model new selection model of this popup menu
|
|
*/
|
|
public void setSelectionModel(SingleSelectionModel model)
|
|
{
|
|
selectionModel = model;
|
|
}
|
|
|
|
/**
|
|
* Creates new menu item associated with a given action.
|
|
*
|
|
* @param action Action used to create new menu item
|
|
*
|
|
* @return new created menu item associated with a given action.
|
|
*/
|
|
protected JMenuItem createActionComponent(Action action)
|
|
{
|
|
return new JMenuItem(action);
|
|
}
|
|
|
|
/**
|
|
* Creates PropertyChangeListener that listens to PropertyChangeEvents
|
|
* occuring in the Action associated with given menu item in this popup menu.
|
|
*
|
|
* @param item MenuItem
|
|
*
|
|
* @return The PropertyChangeListener
|
|
*/
|
|
protected PropertyChangeListener createActionChangeListener(JMenuItem item)
|
|
{
|
|
return new ActionChangeListener();
|
|
}
|
|
|
|
/**
|
|
* Returns true if this popup menu will display its menu item in
|
|
* a lightweight container and false otherwise.
|
|
*
|
|
* @return true if this popup menu will display its menu items
|
|
* in a lightweight container and false otherwise.
|
|
*/
|
|
public boolean isLightWeightPopupEnabled()
|
|
{
|
|
return lightWeightPopupEnabled;
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param enabled DOCUMENT ME!
|
|
*/
|
|
public void setLightWeightPopupEnabled(boolean enabled)
|
|
{
|
|
lightWeightPopupEnabled = enabled;
|
|
}
|
|
|
|
/**
|
|
* Returns label for this popup menu
|
|
*
|
|
* @return label for this popup menu
|
|
*/
|
|
public String getLabel()
|
|
{
|
|
return label;
|
|
}
|
|
|
|
/**
|
|
* Sets label for this popup menu. This method fires PropertyChangeEvent
|
|
* when the label property is changed. Please note that most
|
|
* of the Look & Feel will ignore this property.
|
|
*
|
|
* @param label label for this popup menu
|
|
*/
|
|
public void setLabel(String label)
|
|
{
|
|
if (label != this.label)
|
|
{
|
|
String oldLabel = this.label;
|
|
this.label = label;
|
|
firePropertyChange("label", oldLabel, label);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Adds separator to this popup menu
|
|
*/
|
|
public void addSeparator()
|
|
{
|
|
// insert separator at the end of the list of menu items
|
|
this.insert(new Separator(), -1);
|
|
}
|
|
|
|
/**
|
|
* Adds a MenuKeyListener to the popup.
|
|
*
|
|
* @param l - the listener to add.
|
|
*/
|
|
public void addMenuKeyListener(MenuKeyListener l)
|
|
{
|
|
listenerList.add(MenuKeyListener.class, l);
|
|
}
|
|
|
|
/**
|
|
* Removes a MenuKeyListener from the popup.
|
|
*
|
|
* @param l - the listener to remove.
|
|
*/
|
|
public void removeMenuKeyListener(MenuKeyListener l)
|
|
{
|
|
listenerList.remove(MenuKeyListener.class, l);
|
|
}
|
|
|
|
/**
|
|
* Returns array of getMenuKeyListeners that are listening to JPopupMenu.
|
|
*
|
|
* @return array of getMenuKeyListeners that are listening to JPopupMenu
|
|
*/
|
|
public MenuKeyListener[] getMenuKeyListeners()
|
|
{
|
|
return ((MenuKeyListener[]) listenerList.getListeners(MenuKeyListener.class));
|
|
}
|
|
|
|
/**
|
|
* Adds popupMenuListener to listen for PopupMenuEvents fired
|
|
* by the JPopupMenu
|
|
*
|
|
* @param listener PopupMenuListener to add to JPopupMenu
|
|
*/
|
|
public void addPopupMenuListener(PopupMenuListener listener)
|
|
{
|
|
listenerList.add(PopupMenuListener.class, listener);
|
|
}
|
|
|
|
/**
|
|
* Removes PopupMenuListener from JPopupMenu's list of listeners
|
|
*
|
|
* @param listener PopupMenuListener which needs to be removed
|
|
*/
|
|
public void removePopupMenuListener(PopupMenuListener listener)
|
|
{
|
|
listenerList.remove(PopupMenuListener.class, listener);
|
|
}
|
|
|
|
/**
|
|
* Returns array of PopupMenuListeners that are listening to JPopupMenu
|
|
*
|
|
* @return Array of PopupMenuListeners that are listening to JPopupMenu
|
|
*/
|
|
public PopupMenuListener[] getPopupMenuListeners()
|
|
{
|
|
return ((PopupMenuListener[]) listenerList.getListeners(PopupMenuListener.class));
|
|
}
|
|
|
|
/**
|
|
* This method calls popupMenuWillBecomeVisible() of popup menu's
|
|
* PopupMenuListeners. This method is invoked just before popup menu
|
|
* will appear on the screen.
|
|
*/
|
|
protected void firePopupMenuWillBecomeVisible()
|
|
{
|
|
EventListener[] ll = listenerList.getListeners(PopupMenuListener.class);
|
|
|
|
for (int i = 0; i < ll.length; i++)
|
|
((PopupMenuListener) ll[i]).popupMenuWillBecomeVisible(new PopupMenuEvent(this));
|
|
}
|
|
|
|
/**
|
|
* This method calls popupMenuWillBecomeInvisible() of popup
|
|
* menu's PopupMenuListeners. This method is invoked just before popup
|
|
* menu will disappear from the screen
|
|
*/
|
|
protected void firePopupMenuWillBecomeInvisible()
|
|
{
|
|
EventListener[] ll = listenerList.getListeners(PopupMenuListener.class);
|
|
|
|
for (int i = 0; i < ll.length; i++)
|
|
((PopupMenuListener) ll[i]).popupMenuWillBecomeInvisible(new PopupMenuEvent(this));
|
|
}
|
|
|
|
/**
|
|
* This method calls popupMenuCanceled() of popup menu's PopupMenuListeners.
|
|
* This method is invoked just before popup menu is cancelled. This happens
|
|
* when popup menu is closed without selecting any of its menu items. This
|
|
* usually happens when the top-level window is resized or moved.
|
|
*/
|
|
protected void firePopupMenuCanceled()
|
|
{
|
|
EventListener[] ll = listenerList.getListeners(PopupMenuListener.class);
|
|
|
|
for (int i = 0; i < ll.length; i++)
|
|
((PopupMenuListener) ll[i]).popupMenuCanceled(new PopupMenuEvent(this));
|
|
}
|
|
|
|
/**
|
|
* This methods sets popup menu's size to its' preferred size. If the
|
|
* popup menu's size is previously set it will be ignored.
|
|
*/
|
|
public void pack()
|
|
{
|
|
// Hook up this call so that it gets executed on the event thread in order
|
|
// to avoid synchronization problems when calling the layout manager.
|
|
if (! SwingUtilities.isEventDispatchThread())
|
|
{
|
|
SwingUtilities.invokeLater(new Runnable()
|
|
{
|
|
public void run()
|
|
{
|
|
show();
|
|
}
|
|
});
|
|
}
|
|
|
|
setSize(getPreferredSize());
|
|
}
|
|
|
|
/**
|
|
* Return visibility of the popup menu
|
|
*
|
|
* @return true if popup menu is visible on the screen and false otherwise.
|
|
*/
|
|
public boolean isVisible()
|
|
{
|
|
return visible;
|
|
}
|
|
|
|
/**
|
|
* Sets visibility property of this popup menu. If the property is
|
|
* set to true then popup menu will be dispayed and popup menu will
|
|
* hide itself if visible property is set to false.
|
|
*
|
|
* @param visible true if popup menu will become visible and false otherwise.
|
|
*/
|
|
public void setVisible(final boolean visible)
|
|
{
|
|
// Hook up this call so that it gets executed on the event thread in order
|
|
// to avoid synchronization problems when calling the layout manager.
|
|
if (! SwingUtilities.isEventDispatchThread())
|
|
{
|
|
SwingUtilities.invokeLater(new Runnable()
|
|
{
|
|
public void run()
|
|
{
|
|
setVisible(visible);
|
|
}
|
|
});
|
|
}
|
|
|
|
if (visible == isVisible())
|
|
return;
|
|
|
|
boolean old = isVisible();
|
|
this.visible = visible;
|
|
if (old != isVisible())
|
|
{
|
|
if (visible)
|
|
{
|
|
if (invoker != null && !(invoker instanceof JMenu))
|
|
{
|
|
MenuElement[] menuEls;
|
|
if (getSubElements().length > 0)
|
|
{
|
|
menuEls = new MenuElement[2];
|
|
menuEls[0] = this;
|
|
menuEls[1] = getSubElements()[0];
|
|
}
|
|
else
|
|
{
|
|
menuEls = new MenuElement[1];
|
|
menuEls[0] = this;
|
|
}
|
|
MenuSelectionManager.defaultManager().setSelectedPath(menuEls);
|
|
}
|
|
firePopupMenuWillBecomeVisible();
|
|
PopupFactory pf = PopupFactory.getSharedInstance();
|
|
pack();
|
|
popup = pf.getPopup(invoker, this, popupLocationX, popupLocationY);
|
|
popup.show();
|
|
}
|
|
else
|
|
{
|
|
getSelectionModel().clearSelection();
|
|
firePopupMenuWillBecomeInvisible();
|
|
popup.hide();
|
|
}
|
|
firePropertyChange("visible", old, isVisible());
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Sets location of the popup menu.
|
|
*
|
|
* @param x X coordinate of the popup menu's location
|
|
* @param y Y coordinate of the popup menu's location
|
|
*/
|
|
public void setLocation(int x, int y)
|
|
{
|
|
popupLocationX = x;
|
|
popupLocationY = y;
|
|
// Handle the case when the popup is already showing. In this case we need
|
|
// to fetch a new popup from PopupFactory and use this. See the general
|
|
// contract of the PopupFactory.
|
|
}
|
|
|
|
/**
|
|
* Returns popup menu's invoker.
|
|
*
|
|
* @return popup menu's invoker
|
|
*/
|
|
public Component getInvoker()
|
|
{
|
|
return invoker;
|
|
}
|
|
|
|
/**
|
|
* Sets popup menu's invoker.
|
|
*
|
|
* @param component The new invoker of this popup menu
|
|
*/
|
|
public void setInvoker(Component component)
|
|
{
|
|
invoker = component;
|
|
}
|
|
|
|
/**
|
|
* This method displays JPopupMenu on the screen at the specified
|
|
* location. Note that x and y coordinates given to this method
|
|
* should be expressed in terms of the popup menus' invoker.
|
|
*
|
|
* @param component Invoker for this popup menu
|
|
* @param x x-coordinate of the popup menu relative to the specified invoker
|
|
* @param y y-coordiate of the popup menu relative to the specified invoker
|
|
*/
|
|
public void show(Component component, int x, int y)
|
|
{
|
|
if (component.isShowing())
|
|
{
|
|
setInvoker(component);
|
|
Point p = new Point(x, y);
|
|
SwingUtilities.convertPointToScreen(p, component);
|
|
setLocation(p.x, p.y);
|
|
setVisible(true);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns component located at the specified index in the popup menu
|
|
*
|
|
* @param index index of the component to return
|
|
*
|
|
* @return component located at the specified index in the popup menu
|
|
*
|
|
* @deprecated Replaced by getComponent(int)
|
|
*/
|
|
public Component getComponentAtIndex(int index)
|
|
{
|
|
return getComponent(index);
|
|
}
|
|
|
|
/**
|
|
* Returns index of the specified component in the popup menu
|
|
*
|
|
* @param component Component to look for
|
|
*
|
|
* @return index of the specified component in the popup menu
|
|
*/
|
|
public int getComponentIndex(Component component)
|
|
{
|
|
Component[] items = getComponents();
|
|
|
|
for (int i = 0; i < items.length; i++)
|
|
{
|
|
if (items[i].equals(component))
|
|
return i;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* Sets size of the popup
|
|
*
|
|
* @param size Dimensions representing new size of the popup menu
|
|
*/
|
|
public void setPopupSize(Dimension size)
|
|
{
|
|
super.setSize(size);
|
|
}
|
|
|
|
/**
|
|
* Sets size of the popup menu
|
|
*
|
|
* @param width width for the new size
|
|
* @param height height for the new size
|
|
*/
|
|
public void setPopupSize(int width, int height)
|
|
{
|
|
super.setSize(width, height);
|
|
}
|
|
|
|
/**
|
|
* Selects specified component in this popup menu.
|
|
*
|
|
* @param selected component to select
|
|
*/
|
|
public void setSelected(Component selected)
|
|
{
|
|
int index = getComponentIndex(selected);
|
|
selectionModel.setSelectedIndex(index);
|
|
}
|
|
|
|
/**
|
|
* Checks if this popup menu paints its border.
|
|
*
|
|
* @return true if this popup menu paints its border and false otherwise.
|
|
*/
|
|
public boolean isBorderPainted()
|
|
{
|
|
return borderPainted;
|
|
}
|
|
|
|
/**
|
|
* Sets if the border of the popup menu should be
|
|
* painter or not.
|
|
*
|
|
* @param painted true if the border should be painted and false otherwise
|
|
*/
|
|
public void setBorderPainted(boolean painted)
|
|
{
|
|
borderPainted = painted;
|
|
}
|
|
|
|
/**
|
|
* Returns margin for this popup menu.
|
|
*
|
|
* @return margin for this popup menu.
|
|
*/
|
|
public Insets getMargin()
|
|
{
|
|
return margin;
|
|
}
|
|
|
|
/**
|
|
* A string that describes this JPopupMenu. Normally only used
|
|
* for debugging.
|
|
*
|
|
* @return A string describing this JMenuItem
|
|
*/
|
|
protected String paramString()
|
|
{
|
|
CPStringBuilder sb = new CPStringBuilder();
|
|
sb.append(super.paramString());
|
|
sb.append(",label=");
|
|
if (getLabel() != null)
|
|
sb.append(getLabel());
|
|
sb.append(",lightWeightPopupEnabled=").append(isLightWeightPopupEnabled());
|
|
sb.append(",margin=");
|
|
if (getMargin() != null)
|
|
sb.append(margin);
|
|
sb.append(",paintBorder=").append(isBorderPainted());
|
|
return sb.toString();
|
|
}
|
|
|
|
/**
|
|
* Process mouse events forwarded from MenuSelectionManager. This method
|
|
* doesn't do anything. It is here to conform to the MenuElement interface.
|
|
*
|
|
* @param event event forwarded from MenuSelectionManager
|
|
* @param path path to the menu element from which event was generated
|
|
* @param manager MenuSelectionManager for the current menu hierarchy
|
|
*/
|
|
public void processMouseEvent(MouseEvent event, MenuElement[] path,
|
|
MenuSelectionManager manager)
|
|
{
|
|
// Empty Implementation. This method is needed for the implementation
|
|
// of MenuElement interface
|
|
}
|
|
|
|
/**
|
|
* Process key events forwarded from MenuSelectionManager. This method
|
|
* doesn't do anything. It is here to conform to the MenuElement interface.
|
|
*
|
|
* @param event event forwarded from MenuSelectionManager
|
|
* @param path path to the menu element from which event was generated
|
|
* @param manager MenuSelectionManager for the current menu hierarchy
|
|
*
|
|
*/
|
|
public void processKeyEvent(KeyEvent event, MenuElement[] path,
|
|
MenuSelectionManager manager)
|
|
{
|
|
// Empty Implementation. This method is needed for the implementation
|
|
// of MenuElement interface
|
|
}
|
|
|
|
/**
|
|
* Method of MenuElement Interface. It is invoked when
|
|
* popupMenu's selection has changed
|
|
*
|
|
* @param changed true if this popupMenu is part of current menu
|
|
* hierarchy and false otherwise.
|
|
*/
|
|
public void menuSelectionChanged(boolean changed)
|
|
{
|
|
if (invoker instanceof JMenu)
|
|
{
|
|
// We need to special case this since the JMenu calculates the
|
|
// position etc of the popup.
|
|
JMenu menu = (JMenu) invoker;
|
|
menu.setPopupMenuVisible(changed);
|
|
}
|
|
else if (! changed)
|
|
setVisible(false);
|
|
}
|
|
|
|
/**
|
|
* Return subcomonents of this popup menu. This method returns only
|
|
* components that implement the <code>MenuElement</code> interface.
|
|
*
|
|
* @return array of menu items belonging to this popup menu
|
|
*/
|
|
public MenuElement[] getSubElements()
|
|
{
|
|
Component[] items = getComponents();
|
|
ArrayList subElements = new ArrayList();
|
|
|
|
for (int i = 0; i < items.length; i++)
|
|
if (items[i] instanceof MenuElement)
|
|
subElements.add(items[i]);
|
|
|
|
return (MenuElement[])
|
|
subElements.toArray(new MenuElement[subElements.size()]);
|
|
}
|
|
|
|
/**
|
|
* Method of the MenuElement interface. Returns reference to itself.
|
|
*
|
|
* @return Returns reference to itself
|
|
*/
|
|
public Component getComponent()
|
|
{
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Checks if observing mouse event should trigger popup
|
|
* menu to show on the screen.
|
|
*
|
|
* @param event MouseEvent to check
|
|
*
|
|
* @return true if the observing mouse event is popup trigger and false otherwise
|
|
*/
|
|
public boolean isPopupTrigger(MouseEvent event)
|
|
{
|
|
return ((PopupMenuUI) getUI()).isPopupTrigger(event);
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
public AccessibleContext getAccessibleContext()
|
|
{
|
|
if (accessibleContext == null)
|
|
accessibleContext = new AccessibleJPopupMenu();
|
|
|
|
return accessibleContext;
|
|
}
|
|
|
|
/**
|
|
* This is the separator that can be used in popup menu.
|
|
*/
|
|
public static class Separator extends JSeparator
|
|
{
|
|
public Separator()
|
|
{
|
|
super();
|
|
}
|
|
|
|
public String getUIClassID()
|
|
{
|
|
return "PopupMenuSeparatorUI";
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns <code>true</code> if the component is guaranteed to be painted
|
|
* on top of others. This returns false by default and is overridden by
|
|
* components like JMenuItem, JPopupMenu and JToolTip to return true for
|
|
* added efficiency.
|
|
*
|
|
* @return <code>true</code> if the component is guaranteed to be painted
|
|
* on top of others
|
|
*/
|
|
boolean onTop()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
protected class AccessibleJPopupMenu extends AccessibleJComponent
|
|
{
|
|
private static final long serialVersionUID = 7423261328879849768L;
|
|
|
|
protected AccessibleJPopupMenu()
|
|
{
|
|
// Nothing to do here.
|
|
}
|
|
|
|
public AccessibleRole getAccessibleRole()
|
|
{
|
|
return AccessibleRole.POPUP_MENU;
|
|
}
|
|
}
|
|
|
|
/* This class resizes popup menu and repaints popup menu appropriately if one
|
|
of item's action has changed */
|
|
private class ActionChangeListener implements PropertyChangeListener
|
|
{
|
|
public void propertyChange(PropertyChangeEvent evt)
|
|
{
|
|
// We used to have a revalidate() and repaint() call here. However I think
|
|
// this is not needed. Instead, a new Popup has to be fetched from the
|
|
// PopupFactory and used here.
|
|
}
|
|
}
|
|
}
|