cd6d4007aa
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
693 lines
20 KiB
Java
693 lines
20 KiB
Java
/* JMenuBar.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.Component;
|
|
import java.awt.Graphics;
|
|
import java.awt.Insets;
|
|
import java.awt.event.KeyEvent;
|
|
import java.awt.event.MouseEvent;
|
|
|
|
import javax.accessibility.Accessible;
|
|
import javax.accessibility.AccessibleContext;
|
|
import javax.accessibility.AccessibleRole;
|
|
import javax.accessibility.AccessibleSelection;
|
|
import javax.accessibility.AccessibleStateSet;
|
|
import javax.swing.plaf.MenuBarUI;
|
|
|
|
import javax.swing.border.Border;
|
|
|
|
/**
|
|
* JMenuBar is a container for menu's. For a menu bar to be seen on the
|
|
* screen, at least one menu should be added to it. Just like adding
|
|
* components to container, one can use add() to add menu's to the menu bar.
|
|
* Menu's will be displayed in the menu bar in the order they were added.
|
|
* The JMenuBar uses selectionModel to keep track of selected menu index.
|
|
* JMenuBar's selectionModel will fire ChangeEvents to its registered
|
|
* listeners when the selected index changes.
|
|
*/
|
|
public class JMenuBar extends JComponent implements Accessible, MenuElement
|
|
{
|
|
/**
|
|
* Provides accessibility support for <code>JMenuBar</code>.
|
|
*
|
|
* @author Roman Kennke (kennke@aicas.com)
|
|
*/
|
|
protected class AccessibleJMenuBar extends AccessibleJComponent
|
|
implements AccessibleSelection
|
|
{
|
|
|
|
/**
|
|
* Returns the number of selected items in the menu bar. Possible values
|
|
* are <code>0</code> if nothing is selected, or <code>1</code> if one
|
|
* item is selected.
|
|
*
|
|
* @return the number of selected items in the menu bar
|
|
*/
|
|
public int getAccessibleSelectionCount()
|
|
{
|
|
int count = 0;
|
|
if (getSelectionModel().getSelectedIndex() != -1)
|
|
count = 1;
|
|
return count;
|
|
}
|
|
|
|
/**
|
|
* Returns the selected with index <code>i</code> menu, or
|
|
* <code>null</code> if the specified menu is not selected.
|
|
*
|
|
* @param i the index of the menu to return
|
|
*
|
|
* @return the selected with index <code>i</code> menu, or
|
|
* <code>null</code> if the specified menu is not selected
|
|
*/
|
|
public Accessible getAccessibleSelection(int i)
|
|
{
|
|
if (getSelectionModel().getSelectedIndex() != i)
|
|
return null;
|
|
return getMenu(i);
|
|
}
|
|
|
|
/**
|
|
* Returns <code>true</code> if the specified menu is selected,
|
|
* <code>false</code> otherwise.
|
|
*
|
|
* @param i the index of the menu to check
|
|
*
|
|
*@return <code>true</code> if the specified menu is selected,
|
|
* <code>false</code> otherwise
|
|
*/
|
|
public boolean isAccessibleChildSelected(int i)
|
|
{
|
|
return getSelectionModel().getSelectedIndex() == i;
|
|
}
|
|
|
|
/**
|
|
* Selects the menu with index <code>i</code>. If another menu is already
|
|
* selected, this will be deselected.
|
|
*
|
|
* @param i the menu to be selected
|
|
*/
|
|
public void addAccessibleSelection(int i)
|
|
{
|
|
getSelectionModel().setSelectedIndex(i);
|
|
}
|
|
|
|
/**
|
|
* Deselects the menu with index <code>i</code>.
|
|
*
|
|
* @param i the menu index to be deselected
|
|
*/
|
|
public void removeAccessibleSelection(int i)
|
|
{
|
|
if (getSelectionModel().getSelectedIndex() == i)
|
|
getSelectionModel().clearSelection();
|
|
}
|
|
|
|
/**
|
|
* Deselects all possibly selected menus.
|
|
*/
|
|
public void clearAccessibleSelection()
|
|
{
|
|
getSelectionModel().clearSelection();
|
|
}
|
|
|
|
/**
|
|
* In menu bars it is not possible to select all items, so this method
|
|
* does nothing.
|
|
*/
|
|
public void selectAllAccessibleSelection()
|
|
{
|
|
// In menu bars it is not possible to select all items, so this method
|
|
// does nothing.
|
|
}
|
|
|
|
/**
|
|
* Returns the accessible role of <code>JMenuBar</code>, which is
|
|
* {@link AccessibleRole#MENU_BAR}.
|
|
*
|
|
* @return the accessible role of <code>JMenuBar</code>, which is
|
|
* {@link AccessibleRole#MENU_BAR}
|
|
*/
|
|
public AccessibleRole getAccessibleRole()
|
|
{
|
|
return AccessibleRole.MENU_BAR;
|
|
}
|
|
|
|
/**
|
|
* Returns the <code>AccessibleSelection</code> for this object. This
|
|
* method returns <code>this</code>, since the
|
|
* <code>AccessibleJMenuBar</code> manages its selection itself.
|
|
*
|
|
* @return the <code>AccessibleSelection</code> for this object
|
|
*/
|
|
public AccessibleSelection getAccessibleSelection()
|
|
{
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Returns the state of this <code>AccessibleJMenuBar</code>.
|
|
*
|
|
* @return the state of this <code>AccessibleJMenuBar</code>.
|
|
*/
|
|
public AccessibleStateSet getAccessibleStateSet()
|
|
{
|
|
AccessibleStateSet stateSet = super.getAccessibleStateSet();
|
|
// TODO: Figure out what state must be added to the super state set.
|
|
return stateSet;
|
|
}
|
|
}
|
|
|
|
private static final long serialVersionUID = -8191026883931977036L;
|
|
|
|
/** JMenuBar's model. It keeps track of selected menu's index */
|
|
private transient SingleSelectionModel selectionModel;
|
|
|
|
/* borderPainted property indicating if the menuBar's border will be painted*/
|
|
private boolean borderPainted;
|
|
|
|
/* margin between menu bar's border and its menues*/
|
|
private Insets margin;
|
|
|
|
/**
|
|
* Creates a new JMenuBar object.
|
|
*/
|
|
public JMenuBar()
|
|
{
|
|
selectionModel = new DefaultSingleSelectionModel();
|
|
borderPainted = true;
|
|
updateUI();
|
|
}
|
|
|
|
/**
|
|
* Adds menu to the menu bar
|
|
*
|
|
* @param c menu to add
|
|
*
|
|
* @return reference to the added menu
|
|
*/
|
|
public JMenu add(JMenu c)
|
|
{
|
|
c.setAlignmentX(Component.LEFT_ALIGNMENT);
|
|
super.add(c);
|
|
return c;
|
|
}
|
|
|
|
/**
|
|
* This method overrides addNotify() in the Container to register
|
|
* this menu bar with the current keyboard manager.
|
|
*/
|
|
public void addNotify()
|
|
{
|
|
super.addNotify();
|
|
KeyboardManager.getManager().registerJMenuBar(this);
|
|
}
|
|
|
|
public AccessibleContext getAccessibleContext()
|
|
{
|
|
if (accessibleContext == null)
|
|
accessibleContext = new AccessibleJMenuBar();
|
|
return accessibleContext;
|
|
}
|
|
|
|
/**
|
|
* Returns reference to this menu bar
|
|
*
|
|
* @return reference to this menu bar
|
|
*/
|
|
public Component getComponent()
|
|
{
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Returns component at the specified index.
|
|
*
|
|
* @param i index of the component to get
|
|
*
|
|
* @return component at the specified index. Null is returned if
|
|
* component at the specified index doesn't exist.
|
|
* @deprecated Replaced by getComponent(int)
|
|
*/
|
|
public Component getComponentAtIndex(int i)
|
|
{
|
|
return getComponent(i);
|
|
}
|
|
|
|
/**
|
|
* Returns index of the specified component
|
|
*
|
|
* @param c Component to search for
|
|
*
|
|
* @return index of the specified component. -1 is returned if
|
|
* specified component doesnt' exist in the menu bar.
|
|
*/
|
|
public int getComponentIndex(Component c)
|
|
{
|
|
Component[] comps = getComponents();
|
|
|
|
int index = -1;
|
|
|
|
for (int i = 0; i < comps.length; i++)
|
|
{
|
|
if (comps[i].equals(c))
|
|
{
|
|
index = i;
|
|
break;
|
|
}
|
|
}
|
|
|
|
return index;
|
|
}
|
|
|
|
/**
|
|
* This method is not implemented and will throw an {@link Error} if called.
|
|
*
|
|
* @return This method never returns anything, it throws an exception.
|
|
*/
|
|
public JMenu getHelpMenu()
|
|
{
|
|
// the following error matches the behaviour of the reference
|
|
// implementation...
|
|
throw new Error("getHelpMenu() is not implemented");
|
|
}
|
|
|
|
/**
|
|
* Returns the margin between the menu bar's border and its menus. If the
|
|
* margin is <code>null</code>, this method returns
|
|
* <code>new Insets(0, 0, 0, 0)</code>.
|
|
*
|
|
* @return The margin (never <code>null</code>).
|
|
*
|
|
* @see #setMargin(Insets)
|
|
*/
|
|
public Insets getMargin()
|
|
{
|
|
if (margin == null)
|
|
return new Insets(0, 0, 0, 0);
|
|
else
|
|
return margin;
|
|
}
|
|
|
|
/**
|
|
* Return menu at the specified index. If component at the
|
|
* specified index is not a menu, then null is returned.
|
|
*
|
|
* @param index index to look for the menu
|
|
*
|
|
* @return menu at specified index, or null if menu doesn't exist
|
|
* at the specified index.
|
|
*/
|
|
public JMenu getMenu(int index)
|
|
{
|
|
if (getComponentAtIndex(index) instanceof JMenu)
|
|
return (JMenu) getComponentAtIndex(index);
|
|
else
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns number of menu's in this menu bar
|
|
*
|
|
* @return number of menu's in this menu bar
|
|
*/
|
|
public int getMenuCount()
|
|
{
|
|
return getComponentCount();
|
|
}
|
|
|
|
/**
|
|
* Returns selection model for this menu bar. SelectionModel
|
|
* keeps track of the selected menu in the menu bar. Whenever
|
|
* selected property of selectionModel changes, the ChangeEvent
|
|
* will be fired its ChangeListeners.
|
|
*
|
|
* @return selection model for this menu bar.
|
|
*/
|
|
public SingleSelectionModel getSelectionModel()
|
|
{
|
|
return selectionModel;
|
|
}
|
|
|
|
/**
|
|
* Method of MenuElement interface. It returns subcomponents
|
|
* of the menu bar, which are all the menues that it contains.
|
|
*
|
|
* @return MenuElement[] array containing menues in this menu bar
|
|
*/
|
|
public MenuElement[] getSubElements()
|
|
{
|
|
MenuElement[] subElements = new MenuElement[getComponentCount()];
|
|
|
|
int j = 0;
|
|
boolean doResize = false;
|
|
MenuElement menu;
|
|
for (int i = 0; i < getComponentCount(); i++)
|
|
{
|
|
menu = getMenu(i);
|
|
if (menu != null)
|
|
{
|
|
subElements[j++] = (MenuElement) menu;
|
|
}
|
|
else
|
|
doResize = true;
|
|
}
|
|
|
|
if (! doResize)
|
|
return subElements;
|
|
else
|
|
{
|
|
MenuElement[] subElements2 = new MenuElement[j];
|
|
for (int i = 0; i < j; i++)
|
|
subElements2[i] = subElements[i];
|
|
|
|
return subElements2;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Set the "UI" property of the menu bar, which is a look and feel class
|
|
* responsible for handling the menuBar's input events and painting it.
|
|
*
|
|
* @return The current "UI" property
|
|
*/
|
|
public MenuBarUI getUI()
|
|
{
|
|
return (MenuBarUI) ui;
|
|
}
|
|
|
|
/**
|
|
* This method returns a name to identify which look and feel class will be
|
|
* the UI delegate for the menu bar.
|
|
*
|
|
* @return The Look and Feel classID. "MenuBarUI"
|
|
*/
|
|
public String getUIClassID()
|
|
{
|
|
return "MenuBarUI";
|
|
}
|
|
|
|
/**
|
|
* Returns true if menu bar paints its border and false otherwise
|
|
*
|
|
* @return true if menu bar paints its border and false otherwise
|
|
*/
|
|
public boolean isBorderPainted()
|
|
{
|
|
return borderPainted;
|
|
}
|
|
|
|
/**
|
|
* Returns true if some menu in menu bar is selected.
|
|
*
|
|
* @return true if some menu in menu bar is selected and false otherwise
|
|
*/
|
|
public boolean isSelected()
|
|
{
|
|
return selectionModel.isSelected();
|
|
}
|
|
|
|
/**
|
|
* This method does nothing by default. This method is need for the
|
|
* MenuElement interface to be implemented.
|
|
*
|
|
* @param isIncluded true if menuBar is included in the selection
|
|
* and false otherwise
|
|
*/
|
|
public void menuSelectionChanged(boolean isIncluded)
|
|
{
|
|
// Do nothing - needed for implementation of MenuElement interface
|
|
}
|
|
|
|
/**
|
|
* Paints border of the menu bar, if its borderPainted property is set to
|
|
* true.
|
|
*
|
|
* @param g The graphics context with which to paint the border
|
|
*/
|
|
protected void paintBorder(Graphics g)
|
|
{
|
|
if (borderPainted)
|
|
{
|
|
Border border = getBorder();
|
|
if (border != null)
|
|
getBorder().paintBorder(this, g, 0, 0, getSize(null).width,
|
|
getSize(null).height);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* A string that describes this JMenuBar. Normally only used
|
|
* for debugging.
|
|
*
|
|
* @return A string describing this JMenuBar
|
|
*/
|
|
protected String paramString()
|
|
{
|
|
CPStringBuilder sb = new CPStringBuilder();
|
|
sb.append(super.paramString());
|
|
sb.append(",margin=");
|
|
if (getMargin() != null)
|
|
sb.append(getMargin());
|
|
sb.append(",paintBorder=").append(isBorderPainted());
|
|
return sb.toString();
|
|
}
|
|
|
|
/**
|
|
* Process key events forwarded from MenuSelectionManager. This method
|
|
* doesn't do anything. It is here to conform to the MenuElement interface.
|
|
*
|
|
* @param e 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 e, MenuElement[] path,
|
|
MenuSelectionManager manager)
|
|
{
|
|
// Do nothing - needed for implementation of MenuElement interface
|
|
}
|
|
|
|
/**
|
|
* This method overrides JComponent.processKeyBinding to allow the
|
|
* JMenuBar to check all the child components (recursiveley) to see
|
|
* if they'll consume the event.
|
|
*
|
|
* @param ks the KeyStroke for the event
|
|
* @param e the KeyEvent for the event
|
|
* @param condition the focus condition for the binding
|
|
* @param pressed true if the key is pressed
|
|
*/
|
|
protected boolean processKeyBinding(KeyStroke ks, KeyEvent e, int condition,
|
|
boolean pressed)
|
|
{
|
|
// See if the regular JComponent behavior consumes the event
|
|
if (super.processKeyBinding(ks, e, condition, pressed))
|
|
return true;
|
|
|
|
// If not, have to recursively check all the child menu elements to see
|
|
// if they want it
|
|
MenuElement[] children = getSubElements();
|
|
for (int i = 0; i < children.length; i++)
|
|
if (processKeyBindingHelper(children[i], ks, e, condition, pressed))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* This is a helper method to recursively check the children of this
|
|
* JMenuBar to see if they will consume a key event via key bindings.
|
|
* This is used for menu accelerators.
|
|
* @param menuElement the menuElement to check (and check all its children)
|
|
* @param ks the KeyStroke for the event
|
|
* @param e the KeyEvent that may be consumed
|
|
* @param condition the focus condition for the binding
|
|
* @param pressed true if the key was pressed
|
|
* @return true <code>menuElement</code> or one of its children consume
|
|
* the event (processKeyBinding returns true for menuElement or one of
|
|
* its children).
|
|
*/
|
|
static boolean processKeyBindingHelper(MenuElement menuElement, KeyStroke ks,
|
|
KeyEvent e, int condition,
|
|
boolean pressed)
|
|
{
|
|
if (menuElement == null)
|
|
return false;
|
|
|
|
// First check the menuElement itself, if it's a JComponent
|
|
if (menuElement instanceof JComponent
|
|
&& ((JComponent) menuElement).processKeyBinding(ks, e, condition,
|
|
pressed))
|
|
return true;
|
|
|
|
// If that didn't consume it, check all the children recursively
|
|
MenuElement[] children = menuElement.getSubElements();
|
|
for (int i = 0; i < children.length; i++)
|
|
if (processKeyBindingHelper(children[i], ks, e, condition, pressed))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* 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)
|
|
{
|
|
// Do nothing - needed for implementation of MenuElement interface
|
|
}
|
|
|
|
/**
|
|
* This method overrides removeNotify() in the Container to
|
|
* unregister this menu bar from the current keyboard manager.
|
|
*/
|
|
public void removeNotify()
|
|
{
|
|
KeyboardManager.getManager().unregisterJMenuBar(this);
|
|
super.removeNotify();
|
|
}
|
|
|
|
/**
|
|
* Sets painting status of the border. If 'b' is true then menu bar's
|
|
* border will be painted, and it will not be painted otherwise.
|
|
*
|
|
* @param b indicates if menu bar's border should be painted.
|
|
*/
|
|
public void setBorderPainted(boolean b)
|
|
{
|
|
if (b != borderPainted)
|
|
{
|
|
boolean old = borderPainted;
|
|
borderPainted = b;
|
|
firePropertyChange("borderPainted", old, b);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Sets help menu for this menu bar
|
|
*
|
|
* @param menu help menu
|
|
*
|
|
* @specnote The specification states that this method is not yet implemented
|
|
* and should throw an exception.
|
|
*/
|
|
public void setHelpMenu(JMenu menu)
|
|
{
|
|
// We throw an Error here, just as Sun's JDK does.
|
|
throw new Error("setHelpMenu() not yet implemented.");
|
|
}
|
|
|
|
/**
|
|
* Sets the margin between the menu bar's border and its menus (this is a
|
|
* bound property with the name 'margin').
|
|
*
|
|
* @param m the margin (<code>null</code> permitted).
|
|
*
|
|
* @see #getMargin()
|
|
*/
|
|
public void setMargin(Insets m)
|
|
{
|
|
if (m != margin)
|
|
{
|
|
Insets oldMargin = margin;
|
|
margin = m;
|
|
firePropertyChange("margin", oldMargin, margin);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Changes menu bar's selection to the specified menu.
|
|
* This method updates selected index of menu bar's selection model,
|
|
* which results in a model firing change event.
|
|
*
|
|
* @param sel menu to select
|
|
*/
|
|
public void setSelected(Component sel)
|
|
{
|
|
int index = getComponentIndex(sel);
|
|
selectionModel.setSelectedIndex(index);
|
|
}
|
|
|
|
/**
|
|
* Sets menuBar's selection model to the one specified
|
|
*
|
|
* @param model SingleSelectionModel that needs to be set for this menu bar
|
|
*/
|
|
public void setSelectionModel(SingleSelectionModel model)
|
|
{
|
|
if (selectionModel != model)
|
|
{
|
|
SingleSelectionModel oldModel = selectionModel;
|
|
selectionModel = model;
|
|
firePropertyChange("model", oldModel, selectionModel);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Set the "UI" property of the menu bar, which is a look and feel class
|
|
* responsible for handling menuBar's input events and painting it.
|
|
*
|
|
* @param ui The new "UI" property
|
|
*/
|
|
public void setUI(MenuBarUI ui)
|
|
{
|
|
super.setUI(ui);
|
|
}
|
|
|
|
/**
|
|
* Set the "UI" property to a class constructed, via the {@link
|
|
* UIManager}, from the current look and feel.
|
|
*/
|
|
public void updateUI()
|
|
{
|
|
setUI((MenuBarUI) UIManager.getUI(this));
|
|
}
|
|
}
|