
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
1122 lines
35 KiB
Java
1122 lines
35 KiB
Java
/* JLabel.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.Font;
|
|
import java.awt.FontMetrics;
|
|
import java.awt.Image;
|
|
import java.awt.Insets;
|
|
import java.awt.Point;
|
|
import java.awt.Rectangle;
|
|
import java.awt.Shape;
|
|
import java.awt.event.KeyEvent;
|
|
import java.beans.PropertyChangeEvent;
|
|
|
|
import javax.accessibility.Accessible;
|
|
import javax.accessibility.AccessibleContext;
|
|
import javax.accessibility.AccessibleExtendedComponent;
|
|
import javax.accessibility.AccessibleRole;
|
|
import javax.accessibility.AccessibleText;
|
|
import javax.swing.plaf.LabelUI;
|
|
import javax.swing.plaf.basic.BasicHTML;
|
|
import javax.swing.text.AttributeSet;
|
|
import javax.swing.text.BadLocationException;
|
|
import javax.swing.text.Position;
|
|
import javax.swing.text.SimpleAttributeSet;
|
|
import javax.swing.text.View;
|
|
|
|
/**
|
|
* A component that displays a static text message and/or an icon.
|
|
*/
|
|
public class JLabel extends JComponent implements Accessible, SwingConstants
|
|
{
|
|
|
|
/**
|
|
* Provides the accessibility features for the <code>JLabel</code>
|
|
* component.
|
|
*/
|
|
protected class AccessibleJLabel
|
|
extends JComponent.AccessibleJComponent
|
|
implements AccessibleText, AccessibleExtendedComponent
|
|
{
|
|
|
|
/**
|
|
* Returns the accessible name.
|
|
*
|
|
* @return The accessible name.
|
|
*/
|
|
public String getAccessibleName()
|
|
{
|
|
if (accessibleName != null)
|
|
return accessibleName;
|
|
if (text != null)
|
|
return text;
|
|
else
|
|
return super.getAccessibleName();
|
|
}
|
|
|
|
/**
|
|
* Returns the accessible role for the <code>JLabel</code> component.
|
|
*
|
|
* @return {@link AccessibleRole#LABEL}.
|
|
*/
|
|
public AccessibleRole getAccessibleRole()
|
|
{
|
|
return AccessibleRole.LABEL;
|
|
}
|
|
|
|
/**
|
|
* Returns the selected text. This is null since JLabels
|
|
* are not selectable.
|
|
*
|
|
* @return <code>null</code> because JLabels cannot have selected text
|
|
*/
|
|
public String getSelectedText()
|
|
{
|
|
// We return null here since JLabel's text is not selectable.
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns the start index of the selected text.
|
|
*
|
|
* @return the start index of the selected text
|
|
*/
|
|
public int getSelectionStart()
|
|
{
|
|
// JLabel don't have selected text, so we return -1 here.
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* Returns the end index of the selected text.
|
|
*
|
|
* @return the end index of the selected text
|
|
*/
|
|
public int getSelectionEnd()
|
|
{
|
|
// JLabel don't have selected text, so we return -1 here.
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* Returns an {@link AttributeSet} that reflects the text attributes of
|
|
* the specified character. We return an empty
|
|
* <code>AttributeSet</code> here, because JLabels don't support text
|
|
* attributes (at least not yet).
|
|
*
|
|
* @param index the index of the character
|
|
*
|
|
* @return an {@link AttributeSet} that reflects the text attributes of
|
|
* the specified character
|
|
*/
|
|
public AttributeSet getCharacterAttribute(int index)
|
|
{
|
|
// FIXME: Return null here for simple labels, and query the HTML
|
|
// view for HTML labels.
|
|
return new SimpleAttributeSet();
|
|
}
|
|
|
|
/**
|
|
* Returns the character, word or sentence at the specified index. The
|
|
* <code>part</code> parameter determines what is returned, the character,
|
|
* word or sentence after the index.
|
|
*
|
|
* @param part one of {@link AccessibleText#CHARACTER},
|
|
* {@link AccessibleText#WORD} or
|
|
* {@link AccessibleText#SENTENCE}, specifying what is returned
|
|
* @param index the index
|
|
*
|
|
* @return the character, word or sentence after <code>index</code>
|
|
*/
|
|
public String getAtIndex(int part, int index)
|
|
{
|
|
String result = "";
|
|
int startIndex = -1;
|
|
int endIndex = -1;
|
|
switch(part)
|
|
{
|
|
case AccessibleText.CHARACTER:
|
|
result = String.valueOf(text.charAt(index));
|
|
break;
|
|
case AccessibleText.WORD:
|
|
startIndex = text.lastIndexOf(' ', index);
|
|
endIndex = text.indexOf(' ', startIndex + 1);
|
|
if (endIndex == -1)
|
|
endIndex = startIndex + 1;
|
|
result = text.substring(startIndex + 1, endIndex);
|
|
break;
|
|
case AccessibleText.SENTENCE:
|
|
default:
|
|
startIndex = text.lastIndexOf('.', index);
|
|
endIndex = text.indexOf('.', startIndex + 1);
|
|
if (endIndex == -1)
|
|
endIndex = startIndex + 1;
|
|
result = text.substring(startIndex + 1, endIndex);
|
|
break;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Returns the character, word or sentence after the specified index. The
|
|
* <code>part</code> parameter determines what is returned, the character,
|
|
* word or sentence after the index.
|
|
*
|
|
* @param part one of {@link AccessibleText#CHARACTER},
|
|
* {@link AccessibleText#WORD} or
|
|
* {@link AccessibleText#SENTENCE}, specifying what is returned
|
|
* @param index the index
|
|
*
|
|
* @return the character, word or sentence after <code>index</code>
|
|
*/
|
|
public String getAfterIndex(int part, int index)
|
|
{
|
|
String result = "";
|
|
int startIndex = -1;
|
|
int endIndex = -1;
|
|
switch(part)
|
|
{
|
|
case AccessibleText.CHARACTER:
|
|
result = String.valueOf(text.charAt(index + 1));
|
|
break;
|
|
case AccessibleText.WORD:
|
|
startIndex = text.indexOf(' ', index);
|
|
endIndex = text.indexOf(' ', startIndex + 1);
|
|
if (endIndex == -1)
|
|
endIndex = startIndex + 1;
|
|
result = text.substring(startIndex + 1, endIndex);
|
|
break;
|
|
case AccessibleText.SENTENCE:
|
|
default:
|
|
startIndex = text.indexOf('.', index);
|
|
endIndex = text.indexOf('.', startIndex + 1);
|
|
if (endIndex == -1)
|
|
endIndex = startIndex + 1;
|
|
result = text.substring(startIndex + 1, endIndex);
|
|
break;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Returns the character, word or sentence before the specified index. The
|
|
* <code>part</code> parameter determines what is returned, the character,
|
|
* word or sentence before the index.
|
|
*
|
|
* @param part one of {@link AccessibleText#CHARACTER},
|
|
* {@link AccessibleText#WORD} or
|
|
* {@link AccessibleText#SENTENCE}, specifying what is returned
|
|
* @param index the index
|
|
*
|
|
* @return the character, word or sentence before <code>index</code>
|
|
*/
|
|
public String getBeforeIndex(int part, int index)
|
|
{
|
|
String result = "";
|
|
int startIndex = -1;
|
|
int endIndex = -1;
|
|
switch(part)
|
|
{
|
|
case AccessibleText.CHARACTER:
|
|
result = String.valueOf(text.charAt(index - 1));
|
|
break;
|
|
case AccessibleText.WORD:
|
|
endIndex = text.lastIndexOf(' ', index);
|
|
if (endIndex == -1)
|
|
endIndex = 0;
|
|
startIndex = text.lastIndexOf(' ', endIndex - 1);
|
|
result = text.substring(startIndex + 1, endIndex);
|
|
break;
|
|
case AccessibleText.SENTENCE:
|
|
default:
|
|
endIndex = text.lastIndexOf('.', index);
|
|
if (endIndex == -1)
|
|
endIndex = 0;
|
|
startIndex = text.lastIndexOf('.', endIndex - 1);
|
|
result = text.substring(startIndex + 1, endIndex);
|
|
break;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Returns the caret position. This method returns -1 because JLabel don't
|
|
* have a caret.
|
|
*
|
|
* @return the caret position
|
|
*/
|
|
public int getCaretPosition()
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* Returns the number of characters that are displayed by the JLabel.
|
|
*
|
|
* @return the number of characters that are displayed by the JLabel
|
|
*/
|
|
public int getCharCount()
|
|
{
|
|
// FIXME: Query HTML view for HTML labels.
|
|
return text.length();
|
|
}
|
|
|
|
/**
|
|
* Returns the bounding box of the character at the specified index.
|
|
*
|
|
* @param index the index of the character that we return the
|
|
* bounds for
|
|
*
|
|
* @return the bounding box of the character at the specified index
|
|
*/
|
|
public Rectangle getCharacterBounds(int index)
|
|
{
|
|
Rectangle bounds = null;
|
|
View view = (View) getClientProperty(BasicHTML.propertyKey);
|
|
if (view != null)
|
|
{
|
|
Rectangle textR = getTextRectangle();
|
|
try
|
|
{
|
|
Shape s = view.modelToView(index, textR, Position.Bias.Forward);
|
|
bounds = s.getBounds();
|
|
}
|
|
catch (BadLocationException ex)
|
|
{
|
|
// Can't return something reasonable in this case.
|
|
}
|
|
}
|
|
return bounds;
|
|
}
|
|
|
|
/**
|
|
* Returns the rectangle inside the JLabel, in which the actual text is
|
|
* rendered. This method has been adopted from the Mauve testcase
|
|
* gnu.testlet.javax.swing.JLabel.AccessibleJLabel.getCharacterBounds.
|
|
*
|
|
* @return the rectangle inside the JLabel, in which the actual text is
|
|
* rendered
|
|
*/
|
|
private Rectangle getTextRectangle()
|
|
{
|
|
JLabel l = JLabel.this;
|
|
Rectangle textR = new Rectangle();
|
|
Rectangle iconR = new Rectangle();
|
|
Insets i = l.getInsets();
|
|
int w = l.getWidth();
|
|
int h = l.getHeight();
|
|
Rectangle viewR = new Rectangle(i.left, i.top, w - i.left - i.right,
|
|
h - i.top - i.bottom);
|
|
FontMetrics fm = l.getFontMetrics(l.getFont());
|
|
SwingUtilities.layoutCompoundLabel(l, fm, l.getText(), l.getIcon(),
|
|
l.getVerticalAlignment(),
|
|
l.getHorizontalAlignment(),
|
|
l.getVerticalTextPosition(),
|
|
l.getHorizontalTextPosition(),
|
|
viewR, iconR, textR,
|
|
l.getIconTextGap());
|
|
return textR;
|
|
}
|
|
|
|
/**
|
|
* Returns the index of the character that is located at the specified
|
|
* point.
|
|
*
|
|
* @param point the location that we lookup the character for
|
|
*
|
|
* @return the index of the character that is located at the specified
|
|
* point
|
|
*/
|
|
public int getIndexAtPoint(Point point)
|
|
{
|
|
int index = -1;
|
|
View view = (View) getClientProperty(BasicHTML.propertyKey);
|
|
if (view != null)
|
|
{
|
|
Rectangle r = getTextRectangle();
|
|
index = view.viewToModel(point.x, point.y, r, new Position.Bias[0]);
|
|
}
|
|
return index;
|
|
}
|
|
}
|
|
|
|
private static final long serialVersionUID = 5496508283662221534L;
|
|
|
|
static final String LABEL_PROPERTY = "labeledBy";
|
|
|
|
/**
|
|
* The Component the label will give focus to when its mnemonic is
|
|
* activated.
|
|
*/
|
|
protected Component labelFor;
|
|
|
|
/** The label's text. */
|
|
transient String text;
|
|
|
|
/** Where the label will be positioned horizontally. */
|
|
private transient int horizontalAlignment = LEADING;
|
|
|
|
/** Where the label text will be placed horizontally relative to the icon. */
|
|
private transient int horizontalTextPosition = TRAILING;
|
|
|
|
/** Where the label will be positioned vertically. */
|
|
private transient int verticalAlignment = CENTER;
|
|
|
|
/** Where the label text will be place vertically relative to the icon. */
|
|
private transient int verticalTextPosition = CENTER;
|
|
|
|
/** The icon painted when the label is enabled. */
|
|
private transient Icon icon;
|
|
|
|
/** The icon painted when the label is disabled. */
|
|
private transient Icon disabledIcon;
|
|
|
|
/** The label's mnemnonic key. */
|
|
private transient int displayedMnemonic = KeyEvent.VK_UNDEFINED;
|
|
|
|
/** The index of the mnemonic character in the text. */
|
|
private transient int displayedMnemonicIndex = -1;
|
|
|
|
/** The gap between the icon and the text. */
|
|
private transient int iconTextGap = 4;
|
|
|
|
/**
|
|
* Creates a new vertically centered, horizontally on the leading edge
|
|
* JLabel object with text and no icon.
|
|
*/
|
|
public JLabel()
|
|
{
|
|
this("", null, LEADING);
|
|
}
|
|
|
|
/**
|
|
* Creates a new vertically and horizontally centered
|
|
* JLabel object with no text and the given icon.
|
|
*
|
|
* @param image The icon to use with the label, <code>null</code> permitted.
|
|
*/
|
|
public JLabel(Icon image)
|
|
{
|
|
this(null, image, CENTER);
|
|
}
|
|
|
|
/**
|
|
* Creates a new vertically centered JLabel object with no text and the
|
|
* given icon and horizontal alignment. By default, the text is TRAILING
|
|
* the image.
|
|
*
|
|
* @param image The icon to use with the label, <code>null</code> premitted.
|
|
* @param horizontalAlignment The horizontal alignment of the label, must be
|
|
* either <code>CENTER</code>, <code>LEFT</code>, <code>RIGHT</code>,
|
|
* <code>LEADING</code> or <code>TRAILING</code>.
|
|
*/
|
|
public JLabel(Icon image, int horizontalAlignment)
|
|
{
|
|
this(null, image, horizontalAlignment);
|
|
}
|
|
|
|
/**
|
|
* Creates a new horizontally leading and vertically centered JLabel
|
|
* object with no icon and the given text.
|
|
*
|
|
* @param text The text to use with the label, <code>null</code> permitted.
|
|
*/
|
|
public JLabel(String text)
|
|
{
|
|
this(text, null, LEADING);
|
|
}
|
|
|
|
/**
|
|
* Creates a new vertically centered JLabel object with no icon and the
|
|
* given text and horizontal alignment.
|
|
*
|
|
* @param text The text to use with the label, <code>null</code> permitted.
|
|
* @param horizontalAlignment The horizontal alignment of the label, must be
|
|
* either <code>CENTER</code>, <code>LEFT</code>, <code>RIGHT</code>,
|
|
* <code>LEADING</code> or <code>TRAILING</code>.
|
|
*/
|
|
public JLabel(String text, int horizontalAlignment)
|
|
{
|
|
this(text, null, horizontalAlignment);
|
|
}
|
|
|
|
/**
|
|
* Creates a new vertically centered JLabel object with the given text,
|
|
* icon, and horizontal alignment.
|
|
*
|
|
* @param text The text to use with the label, <code>null</code> permitted.
|
|
* @param icon The icon to use with the label, <code>null</code> premitted.
|
|
* @param horizontalAlignment The horizontal alignment of the label, must be
|
|
* either <code>CENTER</code>, <code>LEFT</code>, <code>RIGHT</code>,
|
|
* <code>LEADING</code> or <code>TRAILING</code>.
|
|
*/
|
|
public JLabel(String text, Icon icon, int horizontalAlignment)
|
|
{
|
|
if (horizontalAlignment != SwingConstants.LEFT
|
|
&& horizontalAlignment != SwingConstants.RIGHT
|
|
&& horizontalAlignment != SwingConstants.CENTER
|
|
&& horizontalAlignment != SwingConstants.LEADING
|
|
&& horizontalAlignment != SwingConstants.TRAILING)
|
|
throw new IllegalArgumentException();
|
|
|
|
this.text = text;
|
|
this.icon = icon;
|
|
this.horizontalAlignment = horizontalAlignment;
|
|
setAlignmentX(0.0F);
|
|
setInheritsPopupMenu(true);
|
|
updateUI();
|
|
}
|
|
|
|
/**
|
|
* Returns the label's UI delegate.
|
|
*
|
|
* @return The label's UI delegate.
|
|
*/
|
|
public LabelUI getUI()
|
|
{
|
|
return (LabelUI) ui;
|
|
}
|
|
|
|
/**
|
|
* Sets the label's UI delegate.
|
|
*
|
|
* @param ui The label's UI delegate (<code>null</code> not permitted).
|
|
*/
|
|
public void setUI(LabelUI ui)
|
|
{
|
|
super.setUI(ui);
|
|
}
|
|
|
|
/**
|
|
* Resets the label's UI delegate to the default UI for the current look and
|
|
* feel.
|
|
*/
|
|
public void updateUI()
|
|
{
|
|
setUI((LabelUI) UIManager.getUI(this));
|
|
}
|
|
|
|
/**
|
|
* Returns a name to identify which look and feel class will be
|
|
* the UI delegate for this label.
|
|
*
|
|
* @return <code>"LabelUI"</code>
|
|
*/
|
|
public String getUIClassID()
|
|
{
|
|
return "LabelUI";
|
|
}
|
|
|
|
/**
|
|
* Returns a string describing the attributes for the <code>JLabel</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>JLabel</code>.
|
|
*/
|
|
protected String paramString()
|
|
{
|
|
CPStringBuilder sb = new CPStringBuilder(super.paramString());
|
|
sb.append(",defaultIcon=");
|
|
if (icon != null)
|
|
sb.append(icon);
|
|
sb.append(",disabledIcon=");
|
|
if (disabledIcon != null)
|
|
sb.append(disabledIcon);
|
|
sb.append(",horizontalAlignment=");
|
|
sb.append(SwingUtilities.convertHorizontalAlignmentCodeToString(
|
|
horizontalAlignment));
|
|
sb.append(",horizontalTextPosition=");
|
|
sb.append(SwingUtilities.convertHorizontalAlignmentCodeToString(
|
|
horizontalTextPosition));
|
|
sb.append(",iconTextGap=").append(iconTextGap);
|
|
sb.append(",labelFor=");
|
|
if (labelFor != null)
|
|
sb.append(labelFor);
|
|
sb.append(",text=");
|
|
if (text != null)
|
|
sb.append(text);
|
|
sb.append(",verticalAlignment=");
|
|
sb.append(SwingUtilities.convertVerticalAlignmentCodeToString(
|
|
verticalAlignment));
|
|
sb.append(",verticalTextPosition=");
|
|
sb.append(SwingUtilities.convertVerticalAlignmentCodeToString(
|
|
verticalTextPosition));
|
|
return sb.toString();
|
|
}
|
|
|
|
/**
|
|
* Returns the text displayed by the label.
|
|
*
|
|
* @return The label text (possibly <code>null</code>).
|
|
*
|
|
* @see #setText(String)
|
|
*/
|
|
public String getText()
|
|
{
|
|
return text;
|
|
}
|
|
|
|
/**
|
|
* Sets the text for the label and sends a {@link PropertyChangeEvent} (with
|
|
* the name 'text') to all registered listeners. This method will also
|
|
* update the <code>displayedMnemonicIndex</code>, if necessary.
|
|
*
|
|
* @param newText The text (<code>null</code> permitted).
|
|
*
|
|
* @see #getText()
|
|
* @see #getDisplayedMnemonicIndex()
|
|
*/
|
|
public void setText(String newText)
|
|
{
|
|
if (text == null && newText == null)
|
|
return;
|
|
if (text != null && text.equals(newText))
|
|
return;
|
|
|
|
String oldText = text;
|
|
text = newText;
|
|
firePropertyChange("text", oldText, newText);
|
|
|
|
if (text != null)
|
|
setDisplayedMnemonicIndex(text.toUpperCase().indexOf(displayedMnemonic));
|
|
else
|
|
setDisplayedMnemonicIndex(-1);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Returns the active icon. The active icon is painted when the label is
|
|
* enabled.
|
|
*
|
|
* @return The active icon.
|
|
*
|
|
* @see #setIcon(Icon)
|
|
* @see #getDisabledIcon()
|
|
*/
|
|
public Icon getIcon()
|
|
{
|
|
return icon;
|
|
}
|
|
|
|
/**
|
|
* Sets the icon for the label (this is a bound property with the name
|
|
* 'icon'). This icon will be displayed when the label is enabled.
|
|
*
|
|
* @param newIcon The icon (<code>null</code> permitted).
|
|
*
|
|
* @see #getIcon()
|
|
* @see #setDisabledIcon(Icon)
|
|
*/
|
|
public void setIcon(Icon newIcon)
|
|
{
|
|
if (icon != newIcon)
|
|
{
|
|
Icon oldIcon = icon;
|
|
icon = newIcon;
|
|
firePropertyChange("icon", oldIcon, newIcon);
|
|
repaint();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the disabled icon. The disabled icon is painted when the label is
|
|
* disabled. If the disabled icon is <code>null</code> and the active icon
|
|
* is an {@link ImageIcon}, this method returns a grayed version of the icon.
|
|
* The grayed version of the icon becomes the <code>disabledIcon</code>.
|
|
*
|
|
* @return The disabled icon.
|
|
*
|
|
* @see #setDisabledIcon(Icon)
|
|
*/
|
|
public Icon getDisabledIcon()
|
|
{
|
|
if (disabledIcon == null && icon instanceof ImageIcon)
|
|
disabledIcon = new ImageIcon(
|
|
GrayFilter.createDisabledImage(((ImageIcon) icon).getImage()));
|
|
|
|
return disabledIcon;
|
|
}
|
|
|
|
/**
|
|
* Sets the icon displayed when the label is disabled (this is a bound
|
|
* property with the name 'disabledIcon').
|
|
*
|
|
* @param newIcon The disabled icon (<code>null</code> permitted).
|
|
*
|
|
* @see #getDisabledIcon()
|
|
*/
|
|
public void setDisabledIcon(Icon newIcon)
|
|
{
|
|
if (disabledIcon != newIcon)
|
|
{
|
|
Icon oldIcon = disabledIcon;
|
|
disabledIcon = newIcon;
|
|
firePropertyChange("disabledIcon", oldIcon, newIcon);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Sets the keycode that will be the label's mnemonic (this is a bound
|
|
* property with the name 'displayedMnemonic'). If the label is used as a
|
|
* label for another component, the label will give focus to that component
|
|
* when the mnemonic is activated.
|
|
*
|
|
* @param mnemonic The keycode to use for the mnemonic.
|
|
*
|
|
* @see #getDisplayedMnemonic()
|
|
*/
|
|
public void setDisplayedMnemonic(int mnemonic)
|
|
{
|
|
if (displayedMnemonic != mnemonic)
|
|
{
|
|
int old = displayedMnemonic;
|
|
displayedMnemonic = mnemonic;
|
|
firePropertyChange("displayedMnemonic", old, displayedMnemonic);
|
|
if (text != null)
|
|
setDisplayedMnemonicIndex(text.toUpperCase().indexOf(mnemonic));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Sets the character that will be the label's mnemonic. If the
|
|
* label is used as a label for another component, the label will give
|
|
* focus to that component when the mnemonic is activated via the keyboard.
|
|
*
|
|
* @param mnemonic The character to use for the mnemonic (this will be
|
|
* converted to the equivalent upper case character).
|
|
*
|
|
* @see #getDisplayedMnemonic()
|
|
*/
|
|
public void setDisplayedMnemonic(char mnemonic)
|
|
{
|
|
setDisplayedMnemonic((int) Character.toUpperCase(mnemonic));
|
|
}
|
|
|
|
/**
|
|
* Returns the keycode that is used for the label's mnemonic.
|
|
*
|
|
* @return The keycode that is used for the label's mnemonic.
|
|
*
|
|
* @see #setDisplayedMnemonic(int)
|
|
*/
|
|
public int getDisplayedMnemonic()
|
|
{
|
|
return displayedMnemonic;
|
|
}
|
|
|
|
/**
|
|
* Sets the index of the character in the text that will be underlined to
|
|
* indicate that it is the mnemonic character for the label. You only need
|
|
* to call this method if you wish to override the automatically calculated
|
|
* character index. For instance, for a label "Find Next" with the mnemonic
|
|
* character 'n', you might wish to underline the second occurrence of 'n'
|
|
* rather than the first (which is the default).
|
|
* <br><br>
|
|
* Note that this method does not validate the character at the specified
|
|
* index to ensure that it matches the key code returned by
|
|
* {@link #getDisplayedMnemonic()}.
|
|
*
|
|
* @param newIndex The index of the character to underline.
|
|
*
|
|
* @throws IllegalArgumentException If index less than -1 or index is greater
|
|
* than or equal to the label length.
|
|
*
|
|
* @see #getDisplayedMnemonicIndex()
|
|
* @since 1.4
|
|
*/
|
|
public void setDisplayedMnemonicIndex(int newIndex)
|
|
throws IllegalArgumentException
|
|
{
|
|
int maxValid = -1;
|
|
if (text != null)
|
|
maxValid = text.length() - 1;
|
|
if (newIndex < -1 || newIndex > maxValid)
|
|
throw new IllegalArgumentException();
|
|
|
|
if (newIndex != displayedMnemonicIndex)
|
|
{
|
|
int oldIndex = displayedMnemonicIndex;
|
|
displayedMnemonicIndex = newIndex;
|
|
firePropertyChange("displayedMnemonicIndex", oldIndex, newIndex);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the index of the character in the label's text that will be
|
|
* underlined (to indicate that it is the mnemonic character), or -1 if no
|
|
* character is to be underlined.
|
|
*
|
|
* @return The index of the character that will be underlined.
|
|
*
|
|
* @see #setDisplayedMnemonicIndex(int)
|
|
* @since 1.4
|
|
*/
|
|
public int getDisplayedMnemonicIndex()
|
|
{
|
|
return displayedMnemonicIndex;
|
|
}
|
|
|
|
/**
|
|
* Checks the specified key to ensure that it is valid as a horizontal
|
|
* alignment, throwing an {@link IllegalArgumentException} if the key is
|
|
* invalid. Valid keys are {@link #LEFT}, {@link #CENTER}, {@link #RIGHT},
|
|
* {@link #LEADING} and {@link #TRAILING}.
|
|
*
|
|
* @param key The key to check.
|
|
* @param message The message of the exception to be thrown if the key is
|
|
* invalid.
|
|
*
|
|
* @return The key if it is valid.
|
|
*
|
|
* @throws IllegalArgumentException If the key is invalid.
|
|
*/
|
|
protected int checkHorizontalKey(int key, String message)
|
|
{
|
|
if (key != LEFT && key != CENTER && key != RIGHT && key != LEADING
|
|
&& key != TRAILING)
|
|
throw new IllegalArgumentException(message);
|
|
else
|
|
return key;
|
|
}
|
|
|
|
/**
|
|
* Checks the specified key to ensure that it is valid as a vertical
|
|
* alignment, throwing an {@link IllegalArgumentException} if the key is
|
|
* invalid. Valid keys are {@link #TOP}, {@link #CENTER} and {@link #BOTTOM}.
|
|
*
|
|
* @param key The key to check.
|
|
* @param message The message of the exception to be thrown if the key is
|
|
* invalid.
|
|
*
|
|
* @return The key if it is valid.
|
|
*
|
|
* @throws IllegalArgumentException If the key is invalid.
|
|
*/
|
|
protected int checkVerticalKey(int key, String message)
|
|
{
|
|
if (key != TOP && key != BOTTOM && key != CENTER)
|
|
throw new IllegalArgumentException(message);
|
|
else
|
|
return key;
|
|
}
|
|
|
|
/**
|
|
* Returns the gap between the icon and the text.
|
|
*
|
|
* @return The gap between the icon and the text.
|
|
*
|
|
* @see #setIconTextGap(int)
|
|
*/
|
|
public int getIconTextGap()
|
|
{
|
|
return iconTextGap;
|
|
}
|
|
|
|
/**
|
|
* Sets the gap between the icon and the text, in the case that both are
|
|
* visible (this is a bound property with the name 'iconTextGap').
|
|
*
|
|
* @param newGap The gap (in pixels).
|
|
*
|
|
* @see #getIconTextGap()
|
|
*/
|
|
public void setIconTextGap(int newGap)
|
|
{
|
|
if (iconTextGap != newGap)
|
|
{
|
|
firePropertyChange("iconTextGap", iconTextGap, newGap);
|
|
iconTextGap = newGap;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the vertical alignment of the label (one of
|
|
* {@link #TOP}, {@link #CENTER} and {@link #BOTTOM}). The default value
|
|
* depends on the installed look and feel, but is usually {@link #CENTER}.
|
|
*
|
|
* @return The vertical alignment.
|
|
*
|
|
* @see #setVerticalAlignment(int)
|
|
*/
|
|
public int getVerticalAlignment()
|
|
{
|
|
return verticalAlignment;
|
|
}
|
|
|
|
/**
|
|
* Sets the vertical alignment for the label (this is a bound property with
|
|
* the name 'verticalAlignment'). The vertical alignment determines where
|
|
* the label (icon and text) will be placed vertically within the component
|
|
* bounds. Valid alignment codes are {@link #TOP}, {@link #CENTER} and
|
|
* {@link #BOTTOM}.
|
|
*
|
|
* @param alignment The vertical alignment of the label.
|
|
*
|
|
* @throws IllegalArgumentException if <code>alignment</code> is not one of
|
|
* the specified values.
|
|
*
|
|
* @see #getVerticalAlignment()
|
|
*/
|
|
public void setVerticalAlignment(int alignment)
|
|
{
|
|
if (alignment == verticalAlignment)
|
|
return;
|
|
|
|
int oldAlignment = verticalAlignment;
|
|
verticalAlignment = checkVerticalKey(alignment, "verticalAlignment");
|
|
firePropertyChange("verticalAlignment", oldAlignment, verticalAlignment);
|
|
}
|
|
|
|
/**
|
|
* Returns the horizontal alignment of the label (one of {@link #LEFT},
|
|
* {@link #CENTER}, {@link #RIGHT}, {@link #LEADING} and {@link #TRAILING}).
|
|
* The default value depends on the installed look and feel, but is usually
|
|
* {@link #LEFT}.
|
|
*
|
|
* @return The horizontal alignment.
|
|
*
|
|
* @see #setHorizontalAlignment(int)
|
|
*/
|
|
public int getHorizontalAlignment()
|
|
{
|
|
return horizontalAlignment;
|
|
}
|
|
|
|
/**
|
|
* Sets the horizontal alignment for the label (this is a bound property with
|
|
* the name 'horizontalAlignment'). The horizontal alignment determines where
|
|
* the label (icon and text) will be placed horizontally within the
|
|
* component bounds. Valid alignment codes are {@link #LEFT},
|
|
* {@link #CENTER}, {@link #RIGHT}, {@link #LEADING} and {@link #TRAILING}.
|
|
*
|
|
* @param alignment The horizontal alignment of the label.
|
|
*
|
|
* @throws IllegalArgumentException if <code>alignment</code> is not one of
|
|
* the specified values.
|
|
*
|
|
* @see #getHorizontalAlignment()
|
|
*/
|
|
public void setHorizontalAlignment(int alignment)
|
|
{
|
|
if (horizontalAlignment == alignment)
|
|
return;
|
|
|
|
int oldAlignment = horizontalAlignment;
|
|
horizontalAlignment = checkHorizontalKey(alignment, "horizontalAlignment");
|
|
firePropertyChange("horizontalAlignment", oldAlignment,
|
|
horizontalAlignment);
|
|
}
|
|
|
|
/**
|
|
* Returns the vertical position of the label's text relative to the icon.
|
|
* This will be one of {@link #TOP}, {@link #CENTER} and {@link #BOTTOM}.
|
|
*
|
|
* @return The vertical position of the label's text relative to the icon.
|
|
*
|
|
* @see #setVerticalTextPosition(int)
|
|
*/
|
|
public int getVerticalTextPosition()
|
|
{
|
|
return verticalTextPosition;
|
|
}
|
|
|
|
/**
|
|
* Sets the vertical position of the label's text relative to the icon (this
|
|
* is a bound property with the name 'verticalTextPosition'). Valid
|
|
* positions are {@link #TOP}, {@link #CENTER} and {@link #BOTTOM}.
|
|
*
|
|
* @param textPosition The vertical text position.
|
|
*
|
|
* @throws IllegalArgumentException if <code>textPosition</code> is not one
|
|
* of the specified values.
|
|
*/
|
|
public void setVerticalTextPosition(int textPosition)
|
|
{
|
|
if (textPosition != verticalTextPosition)
|
|
{
|
|
int oldPos = verticalTextPosition;
|
|
verticalTextPosition = checkVerticalKey(textPosition,
|
|
"verticalTextPosition");
|
|
firePropertyChange("verticalTextPosition", oldPos,
|
|
verticalTextPosition);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the horizontal position of the label's text relative to the icon.
|
|
* This will be one of {@link #LEFT}, {@link #CENTER}, {@link #RIGHT},
|
|
* {@link #LEADING} and {@link #TRAILING}.
|
|
*
|
|
* @return The horizontal position of the label's text relative to the icon.
|
|
*
|
|
* @see #setHorizontalTextPosition(int)
|
|
*/
|
|
public int getHorizontalTextPosition()
|
|
{
|
|
return horizontalTextPosition;
|
|
}
|
|
|
|
/**
|
|
* Sets the horizontal position of the label's text relative to the icon (this
|
|
* is a bound property with the name 'horizontalTextPosition'). Valid
|
|
* positions are {@link #LEFT}, {@link #CENTER}, {@link #RIGHT},
|
|
* {@link #LEADING} and {@link #TRAILING}.
|
|
*
|
|
* @param textPosition The horizontal text position.
|
|
*
|
|
* @throws IllegalArgumentException if <code>textPosition</code> is not one
|
|
* of the specified values.
|
|
*/
|
|
public void setHorizontalTextPosition(int textPosition)
|
|
{
|
|
if (textPosition != horizontalTextPosition)
|
|
{
|
|
int oldPos = horizontalTextPosition;
|
|
horizontalTextPosition = checkHorizontalKey(textPosition,
|
|
"horizontalTextPosition");
|
|
firePropertyChange("horizontalTextPosition", oldPos,
|
|
horizontalTextPosition);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns false if the current icon image (current icon will depend on
|
|
* whether the label is enabled) is not equal to the passed in image.
|
|
*
|
|
* @param img The image to check.
|
|
* @param infoflags The bitwise inclusive OR of ABORT, ALLBITS, ERROR,
|
|
* FRAMEBITS, HEIGHT, PROPERTIES, SOMEBITS, and WIDTH
|
|
* @param x The x position
|
|
* @param y The y position
|
|
* @param w The width
|
|
* @param h The height
|
|
*
|
|
* @return Whether the current icon image is equal to the image given.
|
|
*/
|
|
public boolean imageUpdate(Image img, int infoflags, int x, int y, int w,
|
|
int h)
|
|
{
|
|
Icon currIcon = isEnabled() ? icon : disabledIcon;
|
|
|
|
// XXX: Is this the correct way to check for image equality?
|
|
if (currIcon != null && currIcon instanceof ImageIcon)
|
|
return (((ImageIcon) currIcon).getImage() == img);
|
|
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Returns the component that this <code>JLabel</code> is providing the label
|
|
* for. This component will typically receive the focus when the label's
|
|
* mnemonic key is activated via the keyboard.
|
|
*
|
|
* @return The component (possibly <code>null</code>).
|
|
*/
|
|
public Component getLabelFor()
|
|
{
|
|
return labelFor;
|
|
}
|
|
|
|
/**
|
|
* Sets the component that this <code>JLabel</code> is providing the label
|
|
* for (this is a bound property with the name 'labelFor'). This component
|
|
* will typically receive the focus when the label's mnemonic key is
|
|
* activated via the keyboard.
|
|
*
|
|
* @param c the component (<code>null</code> permitted).
|
|
*
|
|
* @see #getLabelFor()
|
|
*/
|
|
public void setLabelFor(Component c)
|
|
{
|
|
if (c != labelFor)
|
|
{
|
|
Component oldLabelFor = labelFor;
|
|
labelFor = c;
|
|
firePropertyChange("labelFor", oldLabelFor, labelFor);
|
|
|
|
// We put the label into the client properties for the labeled
|
|
// component so that it can be read by the AccessibleJComponent.
|
|
// The other option would be to reserve a default visible field
|
|
// in JComponent, but since this is relatively seldomly used, it
|
|
// would be unnecessary waste of memory to do so.
|
|
if (oldLabelFor instanceof JComponent)
|
|
{
|
|
((JComponent) oldLabelFor).putClientProperty(LABEL_PROPERTY, null);
|
|
}
|
|
|
|
if (labelFor instanceof JComponent)
|
|
{
|
|
((JComponent) labelFor).putClientProperty(LABEL_PROPERTY, this);
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Sets the font for the label (this a bound property with the name 'font').
|
|
*
|
|
* @param f The font (<code>null</code> permitted).
|
|
*/
|
|
public void setFont(Font f)
|
|
{
|
|
super.setFont(f);
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Returns the object that provides accessibility features for this
|
|
* <code>JLabel</code> component.
|
|
*
|
|
* @return The accessible context (an instance of {@link AccessibleJLabel}).
|
|
*/
|
|
public AccessibleContext getAccessibleContext()
|
|
{
|
|
if (accessibleContext == null)
|
|
accessibleContext = new AccessibleJLabel();
|
|
return accessibleContext;
|
|
}
|
|
}
|