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
799 lines
21 KiB
Java
799 lines
21 KiB
Java
/* JToolBar.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.Container;
|
|
import java.awt.Dimension;
|
|
import java.awt.Graphics;
|
|
import java.awt.Insets;
|
|
import java.awt.LayoutManager;
|
|
import java.beans.PropertyChangeListener;
|
|
|
|
import javax.accessibility.Accessible;
|
|
import javax.accessibility.AccessibleContext;
|
|
import javax.accessibility.AccessibleRole;
|
|
import javax.accessibility.AccessibleStateSet;
|
|
import javax.swing.plaf.ToolBarUI;
|
|
|
|
/**
|
|
* JToolBar is a component that provides a toolbar to Swing programs. Users
|
|
* can add buttons (or actions that will be represented by JButtons) as well
|
|
* as other components to the JToolBar. JToolBars can be dragged in and out
|
|
* of their parent components. If the JToolBar is dragged out of the parent,
|
|
* then it will be displayed in its own RootPaneContainer. For dragging to
|
|
* work properly, JToolBars need to be placed in a Container that has a
|
|
* BorderLayout. That parent Container cannot have components in the NORTH,
|
|
* EAST, SOUTH, or WEST components (that is not the JToolBar).
|
|
*/
|
|
public class JToolBar extends JComponent implements SwingConstants, Accessible
|
|
{
|
|
/**
|
|
* Provides the accessibility features for the <code>JToolBar</code>
|
|
* component.
|
|
*/
|
|
protected class AccessibleJToolBar extends AccessibleJComponent
|
|
{
|
|
private static final long serialVersionUID = -5516888265903814215L;
|
|
|
|
/**
|
|
* Creates a new <code>AccessibleJToolBar</code> instance.
|
|
*/
|
|
protected AccessibleJToolBar()
|
|
{
|
|
// Nothing to do here.
|
|
}
|
|
|
|
/**
|
|
* Returns a set containing the current state of the {@link JToolBar}
|
|
* component. The current implementation simply calls the superclass.
|
|
*
|
|
* @return The accessible state set.
|
|
*/
|
|
public AccessibleStateSet getAccessibleStateSet()
|
|
{
|
|
// running tests against the reference implementation, I was unable
|
|
// to find any state information that is set specifically by the
|
|
// tool bar...
|
|
return super.getAccessibleStateSet();
|
|
}
|
|
|
|
/**
|
|
* Returns the accessible role for the <code>JToolBar</code> component.
|
|
*
|
|
* @return {@link AccessibleRole#TOOL_BAR}.
|
|
*/
|
|
public AccessibleRole getAccessibleRole()
|
|
{
|
|
return AccessibleRole.TOOL_BAR;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This is the private JToolBar layout manager.
|
|
*/
|
|
private class DefaultToolBarLayout implements LayoutManager
|
|
{
|
|
/**
|
|
* This method is called when a new component is added to the container.
|
|
*
|
|
* @param name The name of the component added.
|
|
* @param comp The component that was added.
|
|
*/
|
|
public void addLayoutComponent(String name, Component comp)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
|
|
/**
|
|
* This method is called to lay out the given container to position and
|
|
* size the child components.
|
|
*
|
|
* @param c The container to lay out.
|
|
*
|
|
* @throws Error DOCUMENT ME!
|
|
*/
|
|
public void layoutContainer(Container c)
|
|
{
|
|
if (! (c instanceof JToolBar))
|
|
throw new Error("DefaultToolBarLayout can only be used on JToolBars.");
|
|
Insets insets = getInsets();
|
|
Insets margin = getMargin();
|
|
int middle;
|
|
if (margin != null)
|
|
{
|
|
insets.left += margin.left;
|
|
insets.top += margin.top;
|
|
insets.bottom += margin.bottom;
|
|
insets.right += margin.right;
|
|
}
|
|
Component[] components = c.getComponents();
|
|
Dimension tdims = c.getSize();
|
|
int start = 0;
|
|
Dimension pref;
|
|
|
|
if (getOrientation() == SwingUtilities.HORIZONTAL)
|
|
{
|
|
start += insets.left;
|
|
for (int i = 0; i < components.length; i++)
|
|
{
|
|
if (components[i] != null && components[i].isVisible())
|
|
{
|
|
pref = components[i].getPreferredSize();
|
|
if (pref != null)
|
|
{
|
|
middle = (tdims.height - pref.height) / 2;
|
|
components[i].setBounds(start, middle, pref.width,
|
|
pref.height);
|
|
start += pref.width;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
start += insets.top;
|
|
for (int i = 0; i < components.length; i++)
|
|
{
|
|
if (components[i] != null && components[i].isVisible())
|
|
{
|
|
pref = components[i].getPreferredSize();
|
|
if (pref != null)
|
|
{
|
|
middle = (tdims.width - pref.width) / 2;
|
|
components[i].setBounds(middle, start, pref.width,
|
|
pref.height);
|
|
start += pref.height;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns the minimum size of the given container given the
|
|
* child components.
|
|
*
|
|
* @param parent The container to measure.
|
|
*
|
|
* @return The minimum size of the given container.
|
|
*/
|
|
public Dimension minimumLayoutSize(Container parent)
|
|
{
|
|
return preferredLayoutSize(parent);
|
|
}
|
|
|
|
/**
|
|
* This method returns the preferred size of the given container given the
|
|
* child components.
|
|
*
|
|
* @param parent The container to measure.
|
|
*
|
|
* @return The preferred size of the given container.
|
|
*/
|
|
public Dimension preferredLayoutSize(Container parent)
|
|
{
|
|
int orientation = getOrientation();
|
|
Component[] components = getComponents();
|
|
|
|
int limit = 0;
|
|
int total = 0;
|
|
Dimension dims;
|
|
|
|
int w = 0;
|
|
int h = 0;
|
|
|
|
if (orientation == SwingConstants.HORIZONTAL)
|
|
{
|
|
for (int i = 0; i < components.length; i++)
|
|
{
|
|
dims = components[i].getPreferredSize();
|
|
if (dims != null)
|
|
{
|
|
if (dims.height > limit)
|
|
limit = dims.height;
|
|
total += dims.width;
|
|
}
|
|
}
|
|
w = total;
|
|
h = limit;
|
|
}
|
|
else
|
|
{
|
|
for (int i = 0; i < components.length; i++)
|
|
{
|
|
dims = components[i].getPreferredSize();
|
|
if (dims != null)
|
|
{
|
|
if (dims.width > limit)
|
|
limit = dims.width;
|
|
total += dims.height;
|
|
}
|
|
}
|
|
w = limit;
|
|
h = total;
|
|
}
|
|
|
|
Insets insets = getInsets();
|
|
w += insets.left + insets.right;
|
|
h += insets.top + insets.bottom;
|
|
|
|
Insets margin = getMargin();
|
|
if (margin != null)
|
|
{
|
|
w += margin.left + margin.right;
|
|
h += margin.top + margin.bottom;
|
|
}
|
|
|
|
return new Dimension(w, h);
|
|
}
|
|
|
|
/**
|
|
* This method is called when the given component is removed from the
|
|
* container.
|
|
*
|
|
* @param comp The component removed.
|
|
*/
|
|
public void removeLayoutComponent(Component comp)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This is an extension of JSeparator used in toolbars. Unlike JSeparator,
|
|
* nothing is painted for this Separator, it is only blank space that
|
|
* separates components.
|
|
*/
|
|
public static class Separator extends JSeparator
|
|
{
|
|
/** DOCUMENT ME! */
|
|
private static final long serialVersionUID = -1656745644823105219L;
|
|
|
|
/**
|
|
* Creates a new Separator object.
|
|
*/
|
|
public Separator()
|
|
{
|
|
super();
|
|
} // Separator()
|
|
|
|
/**
|
|
* Creates a new Separator object with the given size.
|
|
*
|
|
* @param size The size of the separator.
|
|
*/
|
|
public Separator(Dimension size)
|
|
{
|
|
setPreferredSize(size);
|
|
} // Separator()
|
|
|
|
/**
|
|
* This method returns the String ID of the UI class of Separator.
|
|
*
|
|
* @return The UI class' String ID.
|
|
*/
|
|
public String getUIClassID()
|
|
{
|
|
return "ToolBarSeparatorUI";
|
|
} // getUIClassID()
|
|
|
|
/**
|
|
* This method returns the preferred size of the Separator.
|
|
*
|
|
* @return The preferred size of the Separator.
|
|
*/
|
|
public Dimension getPreferredSize()
|
|
{
|
|
return super.getPreferredSize();
|
|
} // getPreferredSize()
|
|
|
|
/**
|
|
* This method returns the maximum size of the Separator.
|
|
*
|
|
* @return The maximum size of the Separator.
|
|
*/
|
|
public Dimension getMaximumSize()
|
|
{
|
|
return super.getPreferredSize();
|
|
} // getMaximumSize()
|
|
|
|
/**
|
|
* This method returns the minimum size of the Separator.
|
|
*
|
|
* @return The minimum size of the Separator.
|
|
*/
|
|
public Dimension getMinimumSize()
|
|
{
|
|
return super.getPreferredSize();
|
|
} // getMinimumSize()
|
|
|
|
/**
|
|
* This method returns the size of the Separator.
|
|
*
|
|
* @return The size of the Separator.
|
|
*/
|
|
public Dimension getSeparatorSize()
|
|
{
|
|
return super.getPreferredSize();
|
|
} // getSeparatorSize()
|
|
|
|
/**
|
|
* This method sets the size of the Separator.
|
|
*
|
|
* @param size The new size of the Separator.
|
|
*/
|
|
public void setSeparatorSize(Dimension size)
|
|
{
|
|
setPreferredSize(size);
|
|
} // setSeparatorSize()
|
|
} // Separator
|
|
|
|
/** DOCUMENT ME! */
|
|
private static final long serialVersionUID = -1269915519555129643L;
|
|
|
|
/** Whether the JToolBar paints its border. */
|
|
private transient boolean paintBorder = true;
|
|
|
|
/** The extra insets around the JToolBar. */
|
|
private transient Insets margin;
|
|
|
|
/** Whether the JToolBar can float (and be dragged around). */
|
|
private transient boolean floatable = true;
|
|
|
|
/** Whether the buttons will have rollover borders. */
|
|
private transient boolean rollover;
|
|
|
|
/** The orientation of the JToolBar. */
|
|
private int orientation = HORIZONTAL;
|
|
|
|
/**
|
|
* This method creates a new JToolBar object with horizontal orientation
|
|
* and no name.
|
|
*/
|
|
public JToolBar()
|
|
{
|
|
this(null, HORIZONTAL);
|
|
} // JToolBar()
|
|
|
|
/**
|
|
* This method creates a new JToolBar with the given orientation and no
|
|
* name.
|
|
*
|
|
* @param orientation JToolBar orientation (HORIZONTAL or VERTICAL)
|
|
*/
|
|
public JToolBar(int orientation)
|
|
{
|
|
this(null, orientation);
|
|
} // JToolBar()
|
|
|
|
/**
|
|
* This method creates a new JToolBar object with the given name and
|
|
* horizontal orientation.
|
|
*
|
|
* @param name Name assigned to undocked tool bar.
|
|
*/
|
|
public JToolBar(String name)
|
|
{
|
|
this(name, HORIZONTAL);
|
|
} // JToolBar()
|
|
|
|
/**
|
|
* This method creates a new JToolBar object with the given name and
|
|
* orientation.
|
|
*
|
|
* @param name Name assigned to undocked tool bar.
|
|
* @param orientation JToolBar orientation (HORIZONTAL or VERTICAL)
|
|
*/
|
|
public JToolBar(String name, int orientation)
|
|
{
|
|
setName(name);
|
|
setOrientation(orientation);
|
|
setLayout(new DefaultToolBarLayout());
|
|
revalidate();
|
|
setOpaque(true);
|
|
updateUI();
|
|
}
|
|
|
|
/**
|
|
* This method adds a new JButton that performs the given Action to the
|
|
* JToolBar.
|
|
*
|
|
* @param action The Action to add to the JToolBar.
|
|
*
|
|
* @return The JButton that wraps the Action.
|
|
*/
|
|
public JButton add(Action action)
|
|
{
|
|
JButton b = createActionComponent(action);
|
|
add(b);
|
|
return b;
|
|
} // add()
|
|
|
|
/**
|
|
* This method paints the border if the borderPainted property is true.
|
|
*
|
|
* @param graphics The graphics object to paint with.
|
|
*/
|
|
protected void paintBorder(Graphics graphics)
|
|
{
|
|
if (paintBorder && isFloatable())
|
|
super.paintBorder(graphics);
|
|
} // paintBorder()
|
|
|
|
/**
|
|
* This method returns the UI class used to paint this JToolBar.
|
|
*
|
|
* @return The UI class for this JToolBar.
|
|
*/
|
|
public ToolBarUI getUI()
|
|
{
|
|
return (ToolBarUI) ui;
|
|
} // getUI()
|
|
|
|
/**
|
|
* This method sets the UI used with the JToolBar.
|
|
*
|
|
* @param ui The UI used with the JToolBar.
|
|
*/
|
|
public void setUI(ToolBarUI ui)
|
|
{
|
|
super.setUI(ui);
|
|
} // setUI()
|
|
|
|
/**
|
|
* This method resets the UI used to the Look and Feel defaults.
|
|
*/
|
|
public void updateUI()
|
|
{
|
|
setUI((ToolBarUI) UIManager.getUI(this));
|
|
}
|
|
|
|
/**
|
|
* This method returns the String identifier for the UI class to the used
|
|
* with the JToolBar.
|
|
*
|
|
* @return The String identifier for the UI class.
|
|
*/
|
|
public String getUIClassID()
|
|
{
|
|
return "ToolBarUI";
|
|
} // getUIClassID()
|
|
|
|
/**
|
|
* This method sets the rollover property for the JToolBar. In rollover
|
|
* mode, JButtons inside the JToolBar will only display their borders when
|
|
* the mouse is moving over them.
|
|
*
|
|
* @param b The new rollover property.
|
|
*/
|
|
public void setRollover(boolean b)
|
|
{
|
|
if (b != rollover)
|
|
{
|
|
rollover = b;
|
|
firePropertyChange("rollover", ! rollover, rollover);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns the rollover property.
|
|
*
|
|
* @return The rollover property.
|
|
*/
|
|
public boolean isRollover()
|
|
{
|
|
return rollover;
|
|
}
|
|
|
|
/**
|
|
* This method returns the index of the given component.
|
|
*
|
|
* @param component The component to find.
|
|
*
|
|
* @return The index of the given component.
|
|
*/
|
|
public int getComponentIndex(Component component)
|
|
{
|
|
Component[] components = getComponents();
|
|
if (components == null)
|
|
return -1;
|
|
|
|
for (int i = 0; i < components.length; i++)
|
|
if (components[i] == component)
|
|
return i;
|
|
|
|
return -1;
|
|
} // getComponentIndex()
|
|
|
|
/**
|
|
* This method returns the component at the given index.
|
|
*
|
|
* @param index The index of the component.
|
|
*
|
|
* @return The component at the given index.
|
|
*/
|
|
public Component getComponentAtIndex(int index)
|
|
{
|
|
return getComponent(index);
|
|
} // getComponentAtIndex()
|
|
|
|
/**
|
|
* This method returns the margin property.
|
|
*
|
|
* @return The margin property.
|
|
*/
|
|
public Insets getMargin()
|
|
{
|
|
return margin;
|
|
} // getMargin()
|
|
|
|
/**
|
|
* This method sets the margin property. The margin property determines the
|
|
* extra space between the children components of the JToolBar and the
|
|
* border.
|
|
*
|
|
* @param margin The margin property.
|
|
*/
|
|
public void setMargin(Insets margin)
|
|
{
|
|
if ((this.margin != null && margin == null)
|
|
|| (this.margin == null && margin != null)
|
|
|| (margin != null && this.margin != null
|
|
&& (margin.left != this.margin.left
|
|
|| margin.right != this.margin.right || margin.top != this.margin.top
|
|
|| margin.bottom != this.margin.bottom)))
|
|
{
|
|
Insets oldMargin = this.margin;
|
|
this.margin = margin;
|
|
firePropertyChange("margin", oldMargin, this.margin);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
} // setMargin()
|
|
|
|
/**
|
|
* This method returns the borderPainted property.
|
|
*
|
|
* @return The borderPainted property.
|
|
*/
|
|
public boolean isBorderPainted()
|
|
{
|
|
return paintBorder;
|
|
} // isBorderPainted()
|
|
|
|
/**
|
|
* This method sets the borderPainted property. If set to false, the border
|
|
* will not be painted.
|
|
*
|
|
* @param painted Whether the border will be painted.
|
|
*/
|
|
public void setBorderPainted(boolean painted)
|
|
{
|
|
if (painted != paintBorder)
|
|
{
|
|
paintBorder = painted;
|
|
firePropertyChange("borderPainted", ! paintBorder,
|
|
paintBorder);
|
|
repaint();
|
|
}
|
|
} // setBorderPainted()
|
|
|
|
/**
|
|
* This method returns the floatable property.
|
|
*
|
|
* @return The floatable property.
|
|
*/
|
|
public boolean isFloatable()
|
|
{
|
|
return floatable;
|
|
} // isFloatable()
|
|
|
|
/**
|
|
* This method sets the floatable property. If set to false, the JToolBar
|
|
* cannot be dragged.
|
|
*
|
|
* @param floatable Whether the JToolBar can be dragged.
|
|
*/
|
|
public void setFloatable(boolean floatable)
|
|
{
|
|
if (floatable != this.floatable)
|
|
{
|
|
this.floatable = floatable;
|
|
firePropertyChange("floatable", ! floatable, floatable);
|
|
}
|
|
} // setFloatable()
|
|
|
|
/**
|
|
* This method returns the orientation of the JToolBar.
|
|
*
|
|
* @return The orientation of the JToolBar.
|
|
*/
|
|
public int getOrientation()
|
|
{
|
|
return orientation;
|
|
} // getOrientation()
|
|
|
|
/**
|
|
* This method sets the layout manager to be used with the JToolBar.
|
|
*
|
|
* @param mgr The Layout Manager used with the JToolBar.
|
|
*/
|
|
public void setLayout(LayoutManager mgr)
|
|
{
|
|
super.setLayout(mgr);
|
|
revalidate();
|
|
repaint();
|
|
} // setLayout()
|
|
|
|
/**
|
|
* This method sets the orientation property for JToolBar.
|
|
*
|
|
* @param orientation The new orientation for JToolBar.
|
|
*
|
|
* @throws IllegalArgumentException If the orientation is not HORIZONTAL or
|
|
* VERTICAL.
|
|
*/
|
|
public void setOrientation(int orientation)
|
|
{
|
|
if (orientation != HORIZONTAL && orientation != VERTICAL)
|
|
throw new IllegalArgumentException(orientation
|
|
+ " is not a legal orientation");
|
|
if (orientation != this.orientation)
|
|
{
|
|
int oldOrientation = this.orientation;
|
|
this.orientation = orientation;
|
|
firePropertyChange("orientation", oldOrientation, this.orientation);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
} // setOrientation()
|
|
|
|
/**
|
|
* This method adds a Separator of default size to the JToolBar.
|
|
*/
|
|
public void addSeparator()
|
|
{
|
|
add(new Separator());
|
|
} // addSeparator()
|
|
|
|
/**
|
|
* This method adds a Separator with the given size to the JToolBar.
|
|
*
|
|
* @param size The size of the Separator.
|
|
*/
|
|
public void addSeparator(Dimension size)
|
|
{
|
|
add(new Separator(size));
|
|
} // addSeparator()
|
|
|
|
/**
|
|
* This method is used to create JButtons which can be added to the JToolBar
|
|
* for the given action.
|
|
*
|
|
* @param action The action to create a JButton for.
|
|
*
|
|
* @return The JButton created from the action.
|
|
*/
|
|
protected JButton createActionComponent(Action action)
|
|
{
|
|
return new JButton(action);
|
|
} // createActionComponent()
|
|
|
|
/**
|
|
* This method creates a pre-configured PropertyChangeListener which updates
|
|
* the control as changes are made to the Action. However, this is no
|
|
* longer the recommended way of adding Actions to Containers. As such,
|
|
* this method returns null.
|
|
*
|
|
* @param button The JButton to configure a PropertyChangeListener for.
|
|
*
|
|
* @return null.
|
|
*/
|
|
protected PropertyChangeListener createActionChangeListener(JButton button)
|
|
{
|
|
// XXX: As specified, this returns null. But seems kind of strange, usually deprecated methods don't just return null, verify!
|
|
return null;
|
|
} // createActionChangeListener()
|
|
|
|
/**
|
|
* This method overrides Container's addImpl method. If a JButton is added,
|
|
* it is disabled.
|
|
*
|
|
* @param component The Component to add.
|
|
* @param constraints The Constraints placed on the component.
|
|
* @param index The index to place the Component at.
|
|
*/
|
|
protected void addImpl(Component component, Object constraints, int index)
|
|
{
|
|
// XXX: Sun says disable button but test cases show otherwise.
|
|
super.addImpl(component, constraints, index);
|
|
|
|
// if we added a Swing Button then adjust this a little
|
|
if (component instanceof AbstractButton)
|
|
{
|
|
AbstractButton b = (AbstractButton) component;
|
|
b.setRolloverEnabled(rollover);
|
|
}
|
|
|
|
} // addImpl()
|
|
|
|
/**
|
|
* Returns a string describing the attributes for the <code>JToolBar</code>
|
|
* component, for use in debugging. The return value is guaranteed to be
|
|
* non-<code>null</code>, but the format of the string may vary between
|
|
* implementations.
|
|
*
|
|
* @return A string describing the attributes of the <code>JToolBar</code>.
|
|
*/
|
|
protected String paramString()
|
|
{
|
|
CPStringBuilder sb = new CPStringBuilder(super.paramString());
|
|
sb.append(",floatable=").append(floatable);
|
|
sb.append(",margin=");
|
|
if (margin != null)
|
|
sb.append(margin);
|
|
sb.append(",orientation=");
|
|
if (orientation == HORIZONTAL)
|
|
sb.append("HORIZONTAL");
|
|
else
|
|
sb.append(VERTICAL);
|
|
sb.append(",paintBorder=").append(paintBorder);
|
|
return sb.toString();
|
|
}
|
|
|
|
/**
|
|
* Returns the object that provides accessibility features for this
|
|
* <code>JToolBar</code> component.
|
|
*
|
|
* @return The accessible context (an instance of {@link AccessibleJToolBar}).
|
|
*/
|
|
public AccessibleContext getAccessibleContext()
|
|
{
|
|
if (accessibleContext == null)
|
|
accessibleContext = new AccessibleJToolBar();
|
|
|
|
return accessibleContext;
|
|
}
|
|
}
|