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
1145 lines
35 KiB
Java
1145 lines
35 KiB
Java
/* JSlider.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.MenuContainer;
|
|
import java.awt.image.ImageObserver;
|
|
import java.beans.PropertyChangeEvent;
|
|
import java.io.Serializable;
|
|
import java.util.Dictionary;
|
|
import java.util.Enumeration;
|
|
import java.util.Hashtable;
|
|
|
|
import javax.accessibility.Accessible;
|
|
import javax.accessibility.AccessibleContext;
|
|
import javax.accessibility.AccessibleRole;
|
|
import javax.accessibility.AccessibleState;
|
|
import javax.accessibility.AccessibleStateSet;
|
|
import javax.accessibility.AccessibleValue;
|
|
import javax.swing.event.ChangeEvent;
|
|
import javax.swing.event.ChangeListener;
|
|
import javax.swing.plaf.SliderUI;
|
|
import javax.swing.plaf.UIResource;
|
|
|
|
/**
|
|
* A visual component that allows selection of a value within a
|
|
* range by adjusting a thumb in a track. The values for the minimum,
|
|
* maximum, extent and value are stored in a {@link
|
|
* DefaultBoundedRangeModel}.
|
|
* <p>
|
|
* A <code>JSlider</code> component has the following properties:
|
|
* </p>
|
|
*
|
|
* <table>
|
|
* <tr><th> Property </th><th> Stored in </th><th> Bound? </th></tr>
|
|
* <tr><td> extent </td><td> model </td><td> no </td></tr>
|
|
* <tr><td> inverted </td><td> slider </td><td> yes </td></tr>
|
|
* <tr><td> labelTable </td><td> slider </td><td> yes </td></tr>
|
|
* <tr><td> majorTickSpacing </td><td> slider </td><td> yes </td></tr>
|
|
* <tr><td> maximum </td><td> model </td><td> yes </td></tr>
|
|
* <tr><td> minimum </td><td> model </td><td> yes </td></tr>
|
|
* <tr><td> minorTickSpacing </td><td> slider </td><td> yes </td></tr>
|
|
* <tr><td> model </td><td> slider </td><td> yes </td></tr>
|
|
* <tr><td> orientation </td><td> slider </td><td> yes </td></tr>
|
|
* <tr><td> paintLabels </td><td> slider </td><td> yes </td></tr>
|
|
* <tr><td> paintTicks </td><td> slider </td><td> yes </td></tr>
|
|
* <tr><td> snapToTicks </td><td> slider </td><td> yes </td></tr>
|
|
* <tr><td> value </td><td> model </td><td> no </td></tr>
|
|
* <tr><td> valueIsAdjusting </td><td> model </td><td> no </td></tr>
|
|
* </table>
|
|
*
|
|
* <p>
|
|
* The various behavioural aspects of these properties follows:
|
|
* </p>
|
|
*
|
|
* <ul>
|
|
* <li>
|
|
* When a non-bound property stored in the slider changes, the slider fires
|
|
* a {@link ChangeEvent} to its change listeners.
|
|
* </li>
|
|
* <li>
|
|
* When a bound property stored in the slider changes, the slider fires a
|
|
* {@link PropertyChangeEvent} to its property change listeners.
|
|
* </li>
|
|
* <li>
|
|
* If any of the model's properties change, it fires a {@link ChangeEvent} to
|
|
* its listeners, which include the slider.
|
|
* </li>
|
|
* <li>
|
|
* If the slider receives a {@link ChangeEvent} from its model, it will
|
|
* propagate the event to its own change listeners, with the event's "source"
|
|
* property set to refer to the slider, rather than the model.
|
|
* </li>
|
|
* </ul>
|
|
*/
|
|
public class JSlider extends JComponent implements SwingConstants, Accessible,
|
|
ImageObserver,
|
|
MenuContainer, Serializable
|
|
{
|
|
|
|
/**
|
|
* A little testing shows that the reference implementation creates
|
|
* labels from a class named LabelUIResource.
|
|
*/
|
|
private class LabelUIResource
|
|
extends JLabel
|
|
implements UIResource
|
|
{
|
|
LabelUIResource(String text, int align)
|
|
{
|
|
super(text, align);
|
|
setName("Slider.label");
|
|
}
|
|
}
|
|
|
|
private static final long serialVersionUID = -1441275936141218479L;
|
|
|
|
/**
|
|
* Provides the accessibility features for the <code>JSlider</code>
|
|
* component.
|
|
*/
|
|
protected class AccessibleJSlider extends JComponent.AccessibleJComponent
|
|
implements AccessibleValue
|
|
{
|
|
private static final long serialVersionUID = -6301740148041106789L;
|
|
|
|
/**
|
|
* Creates a new <code>AccessibleJSlider</code> instance.
|
|
*/
|
|
protected AccessibleJSlider()
|
|
{
|
|
// Nothing to do here.
|
|
}
|
|
|
|
/**
|
|
* Returns a set containing the current state of the {@link JSlider}
|
|
* component.
|
|
*
|
|
* @return The accessible state set.
|
|
*/
|
|
public AccessibleStateSet getAccessibleStateSet()
|
|
{
|
|
AccessibleStateSet result = super.getAccessibleStateSet();
|
|
if (orientation == JSlider.HORIZONTAL)
|
|
result.add(AccessibleState.HORIZONTAL);
|
|
else if (orientation == JSlider.VERTICAL)
|
|
result.add(AccessibleState.VERTICAL);
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Returns the accessible role for the <code>JSlider</code> component.
|
|
*
|
|
* @return {@link AccessibleRole#SLIDER}.
|
|
*/
|
|
public AccessibleRole getAccessibleRole()
|
|
{
|
|
return AccessibleRole.SLIDER;
|
|
}
|
|
|
|
/**
|
|
* Returns an object that provides access to the current, minimum and
|
|
* maximum values for the {@link JSlider}. Since this class implements
|
|
* {@link AccessibleValue}, it returns itself.
|
|
*
|
|
* @return The accessible value.
|
|
*/
|
|
public AccessibleValue getAccessibleValue()
|
|
{
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Returns the current value of the {@link JSlider} component, as an
|
|
* {@link Integer}.
|
|
*
|
|
* @return The current value of the {@link JSlider} component.
|
|
*/
|
|
public Number getCurrentAccessibleValue()
|
|
{
|
|
return new Integer(getValue());
|
|
}
|
|
|
|
/**
|
|
* Sets the current value of the {@link JSlider} component and sends a
|
|
* {@link PropertyChangeEvent} (with the property name
|
|
* {@link AccessibleContext#ACCESSIBLE_VALUE_PROPERTY}) to all registered
|
|
* listeners. If the supplied value is <code>null</code>, this method
|
|
* does nothing and returns <code>false</code>.
|
|
*
|
|
* @param value the new slider value (<code>null</code> permitted).
|
|
*
|
|
* @return <code>true</code> if the slider value is updated, and
|
|
* <code>false</code> otherwise.
|
|
*/
|
|
public boolean setCurrentAccessibleValue(Number value)
|
|
{
|
|
if (value == null)
|
|
return false;
|
|
Number oldValue = getCurrentAccessibleValue();
|
|
setValue(value.intValue());
|
|
firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue,
|
|
new Integer(getValue()));
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Returns the minimum value of the {@link JSlider} component, as an
|
|
* {@link Integer}.
|
|
*
|
|
* @return The minimum value of the {@link JSlider} component.
|
|
*/
|
|
public Number getMinimumAccessibleValue()
|
|
{
|
|
return new Integer(getMinimum());
|
|
}
|
|
|
|
/**
|
|
* Returns the maximum value of the {@link JSlider} component, as an
|
|
* {@link Integer}.
|
|
*
|
|
* @return The maximum value of the {@link JSlider} component.
|
|
*/
|
|
public Number getMaximumAccessibleValue()
|
|
{
|
|
return new Integer(getMaximum());
|
|
}
|
|
}
|
|
|
|
/** Whether or not this slider paints its ticks. */
|
|
private transient boolean paintTicks;
|
|
|
|
/** Whether or not this slider paints its track. */
|
|
private transient boolean paintTrack = true;
|
|
|
|
/** Whether or not this slider paints its labels. */
|
|
private transient boolean paintLabels;
|
|
|
|
/**
|
|
* A dictionary of (Integer, Component) pairs where each Component is a
|
|
* JLabel and the Integer determines where the label will be painted.
|
|
*/
|
|
private transient Dictionary labelTable;
|
|
|
|
/** The model used to store the slider's range and current value. */
|
|
protected BoundedRangeModel sliderModel;
|
|
|
|
/** The space/distance between major ticks. */
|
|
protected int majorTickSpacing;
|
|
|
|
/** The space/distance between minor ticks. */
|
|
protected int minorTickSpacing;
|
|
|
|
/** Whether the slider snaps its values to ticks. */
|
|
protected boolean snapToTicks;
|
|
|
|
/** The orientation (horizontal or vertical) of the slider. */
|
|
protected int orientation = HORIZONTAL;
|
|
|
|
/** Whether the slider is inverted. */
|
|
private transient boolean isInverted;
|
|
|
|
/**
|
|
* The listener that monitors the slider's model and forwards events to the
|
|
* slider's listeners (see <code>createChangeListener()</code>).
|
|
*/
|
|
protected ChangeListener changeListener;
|
|
|
|
/** The change event that is passed to all listeners of this slider. */
|
|
protected transient ChangeEvent changeEvent;
|
|
|
|
/**
|
|
* Creates a new horizontal <code>JSlider</code> instance with a minimum of
|
|
* 0, a maximum of 100, and a value of 50.
|
|
*/
|
|
public JSlider()
|
|
{
|
|
this(HORIZONTAL, 0, 100, 50);
|
|
}
|
|
|
|
/**
|
|
* Creates a new <code>JSlider</code> instance with the given orientation
|
|
* and a minimum of 0, a maximum of 100, and a value of 50.
|
|
*
|
|
* @param orientation The orientation of the slider ({@link #HORIZONTAL} or
|
|
* {@link #VERTICAL}).
|
|
*
|
|
* @throws IllegalArgumentException if <code>orientation</code> is not one of
|
|
* the specified values.
|
|
*/
|
|
public JSlider(int orientation)
|
|
{
|
|
this(orientation, 0, 100, 50);
|
|
}
|
|
|
|
/**
|
|
* Creates a new horizontal <code>JSlider</code> instance with the given
|
|
* maximum and minimum and a value that is halfway between the minimum and the
|
|
* maximum.
|
|
*
|
|
* @param minimum The minimum value.
|
|
* @param maximum The maximum value.
|
|
*
|
|
* @throws IllegalArgumentException if <code>minimum</code> is greater than
|
|
* <code>maximum</code>.
|
|
*/
|
|
public JSlider(int minimum, int maximum)
|
|
{
|
|
this(HORIZONTAL, minimum, maximum, (maximum + minimum) / 2);
|
|
}
|
|
|
|
/**
|
|
* Creates a new horizontal <code>JSlider</code> instance with the given
|
|
* minimum, maximum, and value.
|
|
*
|
|
* @param minimum The minimum value.
|
|
* @param maximum The maximum value.
|
|
* @param value The initial value.
|
|
*
|
|
* @throws IllegalArgumentException if <code>value</code> is not in the
|
|
* specified range.
|
|
* @throws IllegalArgumentException if <code>minimum</code> is greater than
|
|
* <code>maximum</code>.
|
|
*/
|
|
public JSlider(int minimum, int maximum, int value)
|
|
{
|
|
this(HORIZONTAL, minimum, maximum, value);
|
|
}
|
|
|
|
/**
|
|
* Creates a new <code>JSlider</code> instance with the given orientation,
|
|
* minimum, maximum, and value.
|
|
*
|
|
* @param orientation The orientation of the slider ({@link #HORIZONTAL} or
|
|
* {@link #VERTICAL}).
|
|
* @param minimum The minimum value of the JSlider.
|
|
* @param maximum The maximum value of the JSlider.
|
|
* @param value The initial value of the JSlider.
|
|
*
|
|
* @throws IllegalArgumentException if <code>orientation</code> is not one of
|
|
* the specified values.
|
|
* @throws IllegalArgumentException if <code>value</code> is not in the
|
|
* specified range.
|
|
* @throws IllegalArgumentException if <code>minimum</code> is greater than
|
|
* <code>maximum</code>.
|
|
*/
|
|
public JSlider(int orientation, int minimum, int maximum, int value)
|
|
{
|
|
sliderModel = new DefaultBoundedRangeModel(value, 0, minimum, maximum);
|
|
if (orientation != HORIZONTAL && orientation != VERTICAL)
|
|
throw new IllegalArgumentException(orientation
|
|
+ " is not a legal orientation");
|
|
this.orientation = orientation;
|
|
changeListener = createChangeListener();
|
|
sliderModel.addChangeListener(changeListener);
|
|
updateUI();
|
|
}
|
|
|
|
/**
|
|
* Creates a new horizontal <code>JSlider</code> instance with the given
|
|
* model.
|
|
*
|
|
* @param model The model (<code>null</code> not permitted).
|
|
*
|
|
* @throws NullPointerException if <code>model</code> is <code>null</code>.
|
|
*/
|
|
public JSlider(BoundedRangeModel model)
|
|
{
|
|
sliderModel = model;
|
|
changeListener = createChangeListener();
|
|
sliderModel.addChangeListener(changeListener);
|
|
updateUI();
|
|
}
|
|
|
|
/**
|
|
* Returns the slider's value (from the slider's model).
|
|
*
|
|
* @return The value of the slider.
|
|
*
|
|
* @see #setValue(int)
|
|
*/
|
|
public int getValue()
|
|
{
|
|
return sliderModel.getValue();
|
|
}
|
|
|
|
/**
|
|
* Sets the slider's value and sends a {@link ChangeEvent} to all
|
|
* registered listeners. Note that the model will fire a change event to all
|
|
* of its registered listeners first (with the model as the event source) and
|
|
* then the slider will fire another change event to all of its registered
|
|
* listeners (this time with the slider as the event source).
|
|
*
|
|
* @param value the new value.
|
|
*
|
|
* @see #getValue()
|
|
*/
|
|
public void setValue(int value)
|
|
{
|
|
sliderModel.setValue(value);
|
|
}
|
|
|
|
/**
|
|
* Returns the slider's UI delegate.
|
|
*
|
|
* @return The slider's UI delegate.
|
|
*/
|
|
public SliderUI getUI()
|
|
{
|
|
return (SliderUI) ui;
|
|
}
|
|
|
|
/**
|
|
* Sets the slider's UI delegate.
|
|
*
|
|
* @param ui the UI delegate.
|
|
*/
|
|
public void setUI(SliderUI ui)
|
|
{
|
|
super.setUI(ui);
|
|
}
|
|
|
|
/**
|
|
* Sets this slider's UI delegate to the default (obtained from the
|
|
* {@link UIManager}) for the current look and feel.
|
|
*/
|
|
public void updateUI()
|
|
{
|
|
updateLabelUIs();
|
|
setUI((SliderUI) UIManager.getUI(this));
|
|
}
|
|
|
|
/**
|
|
* Returns the suffix (<code>"SliderUI"</code> in this case) used to
|
|
* determine the class name for a UI delegate that can provide the look and
|
|
* feel for a <code>JSlider</code>.
|
|
*
|
|
* @return <code>"SliderUI"</code>.
|
|
*/
|
|
public String getUIClassID()
|
|
{
|
|
return "SliderUI";
|
|
}
|
|
|
|
/**
|
|
* Creates a {@link ChangeListener} that is added to the slider's model and
|
|
* forwards change events generated by the model to the listeners that are
|
|
* registered with the <code>JSlider</code> (by calling the
|
|
* {@link #fireStateChanged} method).
|
|
*
|
|
* @return A new listener.
|
|
*/
|
|
protected ChangeListener createChangeListener()
|
|
{
|
|
return new ChangeListener()
|
|
{
|
|
public void stateChanged(ChangeEvent ce)
|
|
{
|
|
// No need to trigger a repaint since the UI listens to the model
|
|
// as well. All we need to do is pass on the stateChanged event
|
|
// to our listeners.
|
|
fireStateChanged();
|
|
}
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Registers a listener with the slider so that it will receive
|
|
* {@link ChangeEvent} notifications. Note that change events generated
|
|
* by the slider's model will be forwarded automatically to the slider's
|
|
* listeners.
|
|
*
|
|
* @param listener the listener to register.
|
|
*
|
|
* @see #removeChangeListener(ChangeListener)
|
|
*/
|
|
public void addChangeListener(ChangeListener listener)
|
|
{
|
|
listenerList.add(ChangeListener.class, listener);
|
|
}
|
|
|
|
/**
|
|
* Removes a listener from this slider so that it will no longer receive
|
|
* {@link ChangeEvent} notifications from the slider.
|
|
*
|
|
* @param listener The listener to remove.
|
|
*
|
|
* @see #addChangeListener(ChangeListener)
|
|
*/
|
|
public void removeChangeListener(ChangeListener listener)
|
|
{
|
|
listenerList.remove(ChangeListener.class, listener);
|
|
}
|
|
|
|
/**
|
|
* Sends a {@link ChangeEvent} to all registered listeners, with this slider
|
|
* as the source.
|
|
*/
|
|
protected void fireStateChanged()
|
|
{
|
|
Object[] changeListeners = listenerList.getListenerList();
|
|
if (changeEvent == null)
|
|
changeEvent = new ChangeEvent(this);
|
|
for (int i = changeListeners.length - 2; i >= 0; i -= 2)
|
|
{
|
|
if (changeListeners[i] == ChangeListener.class)
|
|
((ChangeListener) changeListeners[i + 1]).stateChanged(changeEvent);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns an array containing all the {@link ChangeListener} instances
|
|
* registered with this slider. If no listeners are registered, this method
|
|
* returns an empty array.
|
|
*
|
|
* @return An array array containing all the {@link ChangeListener} instances
|
|
* registered with this slider (possibly empty, but never
|
|
* <code>null</code>).
|
|
*/
|
|
public ChangeListener[] getChangeListeners()
|
|
{
|
|
return (ChangeListener[]) listenerList.getListeners(ChangeListener.class);
|
|
}
|
|
|
|
/**
|
|
* Returns the slider's model, which stores the minimum, maximum and current
|
|
* values.
|
|
*
|
|
* @return The slider's model.
|
|
*
|
|
* @see #setModel(BoundedRangeModel)
|
|
*/
|
|
public BoundedRangeModel getModel()
|
|
{
|
|
return sliderModel;
|
|
}
|
|
|
|
/**
|
|
* Sets the slider's model and sends a {@link PropertyChangeEvent} (with the
|
|
* property name "model") to all registered listeners. The change listener
|
|
* that the slider registered with the original model is removed and added
|
|
* to the new model (this ensures that {@link ChangeEvent} notifications
|
|
* generated by the model are automatically forwarded to listeners that are
|
|
* registered with the slider).
|
|
*
|
|
* @param model The model to use with the slider.
|
|
*
|
|
* @see #getModel()
|
|
*/
|
|
public void setModel(BoundedRangeModel model)
|
|
{
|
|
// I didn't do the null pointer check on purpose.
|
|
// If you try it with Sun's, it'll go ahead and set it to null
|
|
// and bork the next time it tries to access the model.
|
|
if (model != sliderModel)
|
|
{
|
|
BoundedRangeModel oldModel = sliderModel;
|
|
sliderModel = model;
|
|
oldModel.removeChangeListener(changeListener);
|
|
sliderModel.addChangeListener(changeListener);
|
|
firePropertyChange("model", oldModel, sliderModel);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the minimum value of the slider (from the slider's model).
|
|
*
|
|
* @return The minimum value of the slider.
|
|
*
|
|
* @see #setMinimum(int)
|
|
*/
|
|
public int getMinimum()
|
|
{
|
|
return sliderModel.getMinimum();
|
|
}
|
|
|
|
/**
|
|
* Sets the minimum value of the slider and fires a
|
|
* {@link PropertyChangeEvent} (with the property name "minimum") to all
|
|
* registered listeners. Note that:
|
|
* <p>
|
|
* <ul>
|
|
* <li>the minimum value is stored in the slider's model (see
|
|
* {@link #getModel()});</li>
|
|
* <li>in addition to the property change event, the slider also fires a
|
|
* {@link ChangeEvent}.</li>
|
|
* </ul>
|
|
*
|
|
* @param minimum The minimum value of the slider.
|
|
*
|
|
* @see #getMinimum()
|
|
*/
|
|
public void setMinimum(int minimum)
|
|
{
|
|
int old = sliderModel.getMinimum();
|
|
sliderModel.setMinimum(minimum);
|
|
if (minimum != old)
|
|
firePropertyChange("minimum", old, minimum);
|
|
}
|
|
|
|
/**
|
|
* Returns the slider's maximum value (obtained from the slider's model).
|
|
*
|
|
* @return The maximum value of the slider.
|
|
*
|
|
* @see #setMaximum(int)
|
|
*/
|
|
public int getMaximum()
|
|
{
|
|
return sliderModel.getMaximum();
|
|
}
|
|
|
|
/**
|
|
* Sets the maximum value of the slider and fires a
|
|
* {@link PropertyChangeEvent} (with the property name "maximum") to all
|
|
* registered listeners. Note that:
|
|
* <p>
|
|
* <ul>
|
|
* <li>the maximum value is stored in the slider's model (see
|
|
* {@link #getModel()});</li>
|
|
* <li>in addition to the property change event, the slider also fires a
|
|
* {@link ChangeEvent}.</li>
|
|
* </ul>
|
|
*
|
|
* @param maximum The maximum value of the slider.
|
|
*
|
|
* @see #getMaximum()
|
|
*/
|
|
public void setMaximum(int maximum)
|
|
{
|
|
int old = sliderModel.getMaximum();
|
|
sliderModel.setMaximum(maximum);
|
|
if (maximum != old)
|
|
firePropertyChange("maximum", old, maximum);
|
|
}
|
|
|
|
/**
|
|
* Returns the <code>valueIsAdjusting</code> flag from the slider's model.
|
|
*
|
|
* @return The <code>valueIsAdjusting</code> flag from the slider's model.
|
|
*
|
|
* @see #setValueIsAdjusting(boolean)
|
|
*/
|
|
public boolean getValueIsAdjusting()
|
|
{
|
|
return sliderModel.getValueIsAdjusting();
|
|
}
|
|
|
|
/**
|
|
* Sets the <code>valueIsAdjusting</code> flag in the slider's model, and
|
|
* sends a {@link ChangeEvent} to all registered listeners.
|
|
*
|
|
* @param adjusting the new flag value.
|
|
*
|
|
* @see #getValueIsAdjusting()
|
|
*/
|
|
public void setValueIsAdjusting(boolean adjusting)
|
|
{
|
|
sliderModel.setValueIsAdjusting(adjusting);
|
|
}
|
|
|
|
/**
|
|
* Returns the slider's extent value, obtained from the slider's model.
|
|
*
|
|
* @return The extent value.
|
|
*
|
|
* @see #setExtent(int)
|
|
*/
|
|
public int getExtent()
|
|
{
|
|
return sliderModel.getExtent();
|
|
}
|
|
|
|
/**
|
|
* Sets the slider's extent value and sends a {@link ChangeEvent} to all
|
|
* registered listeners. Note that the model will fire a change event to all
|
|
* of its registered listeners first (with the model as the event source) and
|
|
* then the slider will fire another change event to all of its registered
|
|
* listeners (this time with the slider as the event source).
|
|
*
|
|
* @param extent The extent value for this slider.
|
|
*
|
|
* @see #getExtent()
|
|
*/
|
|
public void setExtent(int extent)
|
|
{
|
|
sliderModel.setExtent(extent);
|
|
}
|
|
|
|
/**
|
|
* Returns the orientation of the slider, either {@link JSlider#HORIZONTAL}
|
|
* or {@link JSlider#VERTICAL}.
|
|
*
|
|
* @return The orientation of the slider.
|
|
*
|
|
* @see #setOrientation(int)
|
|
*/
|
|
public int getOrientation()
|
|
{
|
|
return orientation;
|
|
}
|
|
|
|
/**
|
|
* Sets the orientation for the slider and sends a
|
|
* {@link PropertyChangeEvent} (with the property name "orientation") to all
|
|
* registered listeners.
|
|
*
|
|
* @param orientation the orientation (one of {@link JSlider#HORIZONTAL} or
|
|
* {@link JSlider#VERTICAL}).
|
|
*
|
|
* @throws IllegalArgumentException if <code>orientation</code> is not one of
|
|
* the permitted values.
|
|
*
|
|
* @see #getOrientation()
|
|
*/
|
|
public void setOrientation(int orientation)
|
|
{
|
|
if (orientation != VERTICAL && orientation != HORIZONTAL)
|
|
throw new IllegalArgumentException(
|
|
"orientation must be one of: VERTICAL, HORIZONTAL");
|
|
if (orientation != this.orientation)
|
|
{
|
|
int oldOrientation = this.orientation;
|
|
this.orientation = orientation;
|
|
firePropertyChange("orientation", oldOrientation, this.orientation);
|
|
revalidate();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the label table for the slider.
|
|
*
|
|
* @return The label table for the slider (possibly <code>null</code>).
|
|
*
|
|
* @see #setLabelTable(Dictionary)
|
|
*/
|
|
public Dictionary getLabelTable()
|
|
{
|
|
return labelTable;
|
|
}
|
|
|
|
/**
|
|
* Sets the table of labels for the slider and sends a
|
|
* {@link PropertyChangeEvent} (with the property name "labelTable") to all
|
|
* registered listeners.
|
|
*
|
|
* @param table the table of labels (<code>null</code> permitted).
|
|
*
|
|
* @see #getLabelTable()
|
|
*/
|
|
public void setLabelTable(Dictionary table)
|
|
{
|
|
if (table != labelTable)
|
|
{
|
|
Dictionary oldTable = labelTable;
|
|
labelTable = table;
|
|
updateLabelUIs();
|
|
firePropertyChange("labelTable", oldTable, labelTable);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Resets the UI delegates for the labels in the <code>labelTable</code> to
|
|
* the default for the current look and feel.
|
|
*/
|
|
protected void updateLabelUIs()
|
|
{
|
|
if (labelTable != null)
|
|
{
|
|
for (Enumeration list = labelTable.elements(); list.hasMoreElements();)
|
|
{
|
|
Object o = list.nextElement();
|
|
if (o instanceof JComponent)
|
|
{
|
|
JComponent jc = (JComponent) o;
|
|
jc.updateUI();
|
|
jc.setSize(jc.getPreferredSize());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Creates a hashtable of <code>(Integer, JLabel)</code> pairs that can be
|
|
* used as a label table for this slider. The labels will start from the
|
|
* slider's minimum and increase by the increment. Each label will have a text
|
|
* string indicating its integer value.
|
|
*
|
|
* @param increment The increment between labels (must be > 0).
|
|
*
|
|
* @return A hashtable containing the labels.
|
|
*
|
|
* @throws IllegalArgumentException if <code>increment</code> is not greater
|
|
* than zero.
|
|
*/
|
|
public Hashtable createStandardLabels(int increment)
|
|
{
|
|
return createStandardLabels(increment, sliderModel.getMinimum());
|
|
}
|
|
|
|
/**
|
|
* Creates a hashtable of <code>(Integer, JLabel)</code> pairs that can be
|
|
* used as a label table for this slider. The labels will start from the
|
|
* given start value and increase by the increment. Each label will have a
|
|
* text string indicating its integer value.
|
|
*
|
|
* @param increment The increment between labels (must be > 0).
|
|
* @param start The value to start from.
|
|
*
|
|
* @return A hashtable with the labels and their keys.
|
|
*
|
|
* @throws IllegalArgumentException if <code>increment</code> is not greater
|
|
* than zero, or <code>start</code> is not within the range of the
|
|
* model.
|
|
*/
|
|
public Hashtable createStandardLabels(int increment, int start)
|
|
{
|
|
if (increment <= 0)
|
|
throw new IllegalArgumentException("Requires 'increment' > 0.");
|
|
if (start < getMinimum() || start > getMaximum())
|
|
throw new IllegalArgumentException("The 'start' value is out of range.");
|
|
Hashtable table = new Hashtable();
|
|
int max = getMaximum();
|
|
for (int i = start; i <= max; i += increment)
|
|
{
|
|
LabelUIResource label = new LabelUIResource(String.valueOf(i),
|
|
JLabel.CENTER);
|
|
table.put(new Integer(i), label);
|
|
}
|
|
return table;
|
|
}
|
|
|
|
/**
|
|
* Returns the flag that controls whether or not the value scale for the
|
|
* slider is inverted (the default value is <code>false</code>).
|
|
*
|
|
* @return The flag that controls whether or not the value scale for the
|
|
* slider is inverted.
|
|
*
|
|
* @see #setInverted(boolean)
|
|
*/
|
|
public boolean getInverted()
|
|
{
|
|
return isInverted;
|
|
}
|
|
|
|
/**
|
|
* Sets the flag that controls whether or not the value scale for the
|
|
* slider is inverted and, if the new flag value is different to the old flag
|
|
* value, sends a {@link PropertyChangeEvent} to all registered listeners.
|
|
* Typically, a horizontal slider will display a scale that increases from
|
|
* left to right, but this is reversed if the 'inverted' flag is set to
|
|
* <code>true</code>. Similarly, a vertical slider will display a scale that
|
|
* increases from bottom to top, and this is reversed if the 'inverted' flag
|
|
* is set to <code>true</code>.
|
|
*
|
|
* @param inverted the new flag value.
|
|
*
|
|
* @see #getInverted()
|
|
*/
|
|
public void setInverted(boolean inverted)
|
|
{
|
|
if (isInverted != inverted)
|
|
{
|
|
boolean oldInverted = isInverted;
|
|
isInverted = inverted;
|
|
firePropertyChange("inverted", oldInverted, isInverted);
|
|
repaint();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the distance between major tick marks along the slider's value
|
|
* scale.
|
|
*
|
|
* @return The amount of units between each major tick mark.
|
|
*
|
|
* @see #setMajorTickSpacing(int)
|
|
*/
|
|
public int getMajorTickSpacing()
|
|
{
|
|
return majorTickSpacing;
|
|
}
|
|
|
|
/**
|
|
* Sets the distance between major tick marks along the slider's value scale,
|
|
* and sends a {@link PropertyChangeEvent} (with the property name
|
|
* "majorTickSpacing") to all registered listeners.
|
|
*
|
|
* @param spacing the distance between major tick marks.
|
|
*
|
|
* @see #getMajorTickSpacing()
|
|
*/
|
|
public void setMajorTickSpacing(int spacing)
|
|
{
|
|
if (majorTickSpacing != spacing)
|
|
{
|
|
int oldSpacing = majorTickSpacing;
|
|
majorTickSpacing = spacing;
|
|
if (labelTable == null && majorTickSpacing > 0 && getPaintLabels())
|
|
setLabelTable(createStandardLabels(majorTickSpacing));
|
|
firePropertyChange("majorTickSpacing", oldSpacing, majorTickSpacing);
|
|
if (getPaintTicks())
|
|
repaint();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the distance between minor tick marks along the slider's value
|
|
* scale.
|
|
*
|
|
* @return The distance between minor tick marks along the slider's value
|
|
* scale.
|
|
*
|
|
* @see #setMinorTickSpacing(int)
|
|
*/
|
|
public int getMinorTickSpacing()
|
|
{
|
|
return minorTickSpacing;
|
|
}
|
|
|
|
/**
|
|
* Sets the distance between minor tick marks along the slider's value scale,
|
|
* and sends a {@link PropertyChangeEvent} (with the property name
|
|
* "minorTickSpacing") to all registered listeners.
|
|
*
|
|
* @param spacing the distance between minor tick marks.
|
|
*
|
|
* @see #getMinorTickSpacing()
|
|
*/
|
|
public void setMinorTickSpacing(int spacing)
|
|
{
|
|
if (minorTickSpacing != spacing)
|
|
{
|
|
int oldSpacing = minorTickSpacing;
|
|
minorTickSpacing = spacing;
|
|
firePropertyChange("minorTickSpacing", oldSpacing, minorTickSpacing);
|
|
if (getPaintTicks())
|
|
repaint();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the flag that controls whether the slider thumb will snap to ticks.
|
|
* Sliders that snap to ticks will automatically move the thumb to the
|
|
* nearest tick mark.
|
|
*
|
|
* @return <code>true</code> if the slider thumb automatically.
|
|
*
|
|
* @see #setSnapToTicks(boolean)
|
|
*/
|
|
public boolean getSnapToTicks()
|
|
{
|
|
return snapToTicks;
|
|
}
|
|
|
|
/**
|
|
* Sets the flag that controls whether the slider thumb will snap to ticks
|
|
* and sends a {@link PropertyChangeEvent} (with the property name
|
|
* 'snapToTicks') to all registered listeners. Sliders that snap to ticks
|
|
* will automatically move the thumb to the nearest tick mark.
|
|
*
|
|
* @param snap the new flag value.
|
|
*
|
|
* @see #getSnapToTicks()
|
|
*/
|
|
public void setSnapToTicks(boolean snap)
|
|
{
|
|
if (snap != snapToTicks)
|
|
{
|
|
snapToTicks = snap;
|
|
firePropertyChange("snapToTicks", !snap, snap);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the flag that controls whether or not tick marks are painted along
|
|
* the slider's value scale.
|
|
*
|
|
* @return <code>true</code> if tick marks should be painted, and
|
|
* <code>false</code> if tick marks should not be painted.
|
|
*
|
|
* @see #setPaintTicks(boolean)
|
|
*/
|
|
public boolean getPaintTicks()
|
|
{
|
|
return paintTicks;
|
|
}
|
|
|
|
/**
|
|
* Sets the flag that controls whether or not tick marks are painted along
|
|
* the slider's value scale, and sends a {@link PropertyChangeEvent} (with
|
|
* the property name "paintTicks") to all registered listeners. In
|
|
* addition to setting this property to <code>true</code>, one or both of the
|
|
* minor tick spacing and major tick spacing attributes must be set to a
|
|
* value greater than 0 in order for ticks to be painted.
|
|
*
|
|
* @param paint Whether ticks will be painted.
|
|
*
|
|
* @see #getPaintTicks()
|
|
*/
|
|
public void setPaintTicks(boolean paint)
|
|
{
|
|
if (paint != paintTicks)
|
|
{
|
|
boolean oldPaintTicks = paintTicks;
|
|
paintTicks = paint;
|
|
firePropertyChange("paintTicks", oldPaintTicks, paintTicks);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the flag that controls whether or not the track is painted.
|
|
*
|
|
* @return Whether the track will be painted.
|
|
*
|
|
* @see #setPaintTrack(boolean)
|
|
*/
|
|
public boolean getPaintTrack()
|
|
{
|
|
return paintTrack;
|
|
}
|
|
|
|
/**
|
|
* Sets the flag that controls whether or not the track is painted, and
|
|
* sends a {@link PropertyChangeEvent} (for the "paintTrack" property) to all
|
|
* registered listeners.
|
|
*
|
|
* @param paint Whether the track will be painted.
|
|
*
|
|
* @see #getPaintTrack()
|
|
*/
|
|
public void setPaintTrack(boolean paint)
|
|
{
|
|
if (paintTrack != paint)
|
|
{
|
|
paintTrack = paint;
|
|
firePropertyChange("paintTrack", !paint, paint);
|
|
repaint();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the flag that controls whether or not labels are painted for the
|
|
* tick marks along the slider.
|
|
*
|
|
* @return Whether labels will be painted.
|
|
*
|
|
* @see #setPaintLabels(boolean)
|
|
*/
|
|
public boolean getPaintLabels()
|
|
{
|
|
return paintLabels;
|
|
}
|
|
|
|
/**
|
|
* Sets the flag that controls whether or not labels are painted for the
|
|
* tick marks along the slider and sends a {@link PropertyChangeEvent} (with
|
|
* the property name "paintLabels") to all registered listeners.
|
|
*
|
|
* @param paint Whether labels will be painted.
|
|
*
|
|
* @see #getPaintLabels()
|
|
*/
|
|
public void setPaintLabels(boolean paint)
|
|
{
|
|
if (paint != paintLabels)
|
|
{
|
|
paintLabels = paint;
|
|
if (paint && majorTickSpacing > 0 && labelTable == null)
|
|
setLabelTable(createStandardLabels(majorTickSpacing));
|
|
firePropertyChange("paintLabels", !paint, paint);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns an implementation-dependent string describing the attributes of
|
|
* this <code>JSlider</code>.
|
|
*
|
|
* @return A string describing the attributes of this <code>JSlider</code>
|
|
* (never <code>null</code>).
|
|
*/
|
|
protected String paramString()
|
|
{
|
|
String superParamStr = super.paramString();
|
|
CPStringBuilder sb = new CPStringBuilder();
|
|
sb.append(",isInverted=").append(getInverted());
|
|
sb.append(",majorTickSpacing=").append(getMajorTickSpacing());
|
|
sb.append(",minorTickSpacing=").append(getMinorTickSpacing());
|
|
sb.append(",orientation=");
|
|
if (orientation == HORIZONTAL)
|
|
sb.append("HORIZONTAL");
|
|
else
|
|
sb.append("VERTICAL");
|
|
sb.append(",paintLabels=").append(getPaintLabels());
|
|
sb.append(",paintTicks=").append(getPaintTicks());
|
|
sb.append(",paintTrack=").append(getPaintTrack());
|
|
sb.append(",snapToTicks=").append(getSnapToTicks());
|
|
|
|
// the following is output by the reference implementation. We don't
|
|
// strictly need to replicate this. Perhaps it has some meaning, but
|
|
// I couldn't determine it yet...
|
|
sb.append(",snapToValue=true");
|
|
|
|
return superParamStr + sb.toString();
|
|
}
|
|
|
|
/**
|
|
* Returns the object that provides accessibility features for this
|
|
* <code>JSlider</code> component.
|
|
*
|
|
* @return The accessible context (an instance of {@link AccessibleJSlider}).
|
|
*/
|
|
public AccessibleContext getAccessibleContext()
|
|
{
|
|
if (accessibleContext == null)
|
|
accessibleContext = new AccessibleJSlider();
|
|
|
|
return accessibleContext;
|
|
}
|
|
}
|