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
862 lines
26 KiB
Java
862 lines
26 KiB
Java
/* JProgressBar.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.Graphics;
|
|
import java.beans.PropertyChangeEvent;
|
|
|
|
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.border.Border;
|
|
import javax.swing.event.ChangeEvent;
|
|
import javax.swing.event.ChangeListener;
|
|
import javax.swing.plaf.ProgressBarUI;
|
|
|
|
/**
|
|
* A component that displays a visual indicator of the progress of a task. The
|
|
* component has two modes: determinate and indeterminate. In determinate mode,
|
|
* the <code>JProgressBar</code> fills a percentage of its bar based on its
|
|
* current value. In indeterminate mode, it creates box and bounces it between
|
|
* its bounds.
|
|
* <p>
|
|
* This component has the following properties:
|
|
* </p>
|
|
* <table>
|
|
* <tr><th> Property </th><th> Stored in </th><th> Bound? </th></tr>
|
|
* <tr><td> borderPainted </td><td> progressBar </td><td> yes </td></tr>
|
|
* <tr><td> changeListeners </td><td> progressBar </td><td> no </td></tr>
|
|
* <tr><td> indeterminate </td><td> progressBar </td><td> yes </td></tr>
|
|
* <tr><td> maximum </td><td> model </td><td> no </td></tr>
|
|
* <tr><td> minimum </td><td> model </td><td> no </td></tr>
|
|
* <tr><td> model </td><td> progressBar </td><td> no </td></tr>
|
|
* <tr><td> orientation </td><td> progressBar </td><td> yes </td></tr>
|
|
* <tr><td> percentComplete </td><td> progressBar </td><td> no </td></tr>
|
|
* <tr><td> string </td><td> progressBar </td><td> yes </td></tr>
|
|
* <tr><td> stringPainted </td><td> progressBar </td><td> yes </td></tr>
|
|
* <tr><td> value </td><td> model </td><td> no </td></tr>
|
|
* </table>
|
|
*/
|
|
public class JProgressBar extends JComponent implements SwingConstants,
|
|
Accessible
|
|
{
|
|
/**
|
|
* Provides the accessibility features for the <code>JProgressBar</code>
|
|
* component.
|
|
*/
|
|
protected class AccessibleJProgressBar extends AccessibleJComponent
|
|
implements AccessibleValue
|
|
{
|
|
private static final long serialVersionUID = -2938130009392721813L;
|
|
|
|
/**
|
|
* Creates a new <code>AccessibleJProgressBar</code> instance.
|
|
*/
|
|
protected AccessibleJProgressBar()
|
|
{
|
|
// Nothing to do here.
|
|
}
|
|
|
|
/**
|
|
* Returns a set containing the current state of the {@link JProgressBar}
|
|
* component.
|
|
*
|
|
* @return The accessible state set.
|
|
*/
|
|
public AccessibleStateSet getAccessibleStateSet()
|
|
{
|
|
AccessibleStateSet result = super.getAccessibleStateSet();
|
|
if (orientation == JProgressBar.HORIZONTAL)
|
|
result.add(AccessibleState.HORIZONTAL);
|
|
else if (orientation == JProgressBar.VERTICAL)
|
|
result.add(AccessibleState.VERTICAL);
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Returns the accessible role for the <code>JProgressBar</code> component.
|
|
*
|
|
* @return {@link AccessibleRole#PROGRESS_BAR}.
|
|
*/
|
|
public AccessibleRole getAccessibleRole()
|
|
{
|
|
return AccessibleRole.PROGRESS_BAR;
|
|
}
|
|
|
|
/**
|
|
* Returns an object that provides access to the current, minimum and
|
|
* maximum values.
|
|
*
|
|
* @return The accessible value.
|
|
*/
|
|
public AccessibleValue getAccessibleValue()
|
|
{
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Returns the current value of the {@link JProgressBar} component, as an
|
|
* {@link Integer}.
|
|
*
|
|
* @return The current value of the {@link JProgressBar} component.
|
|
*/
|
|
public Number getCurrentAccessibleValue()
|
|
{
|
|
return new Integer(getValue());
|
|
}
|
|
|
|
/**
|
|
* Sets the current value of the {@link JProgressBar} 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 progress bar 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 JProgressBar} component, as an
|
|
* {@link Integer}.
|
|
*
|
|
* @return The minimum value of the {@link JProgressBar} component.
|
|
*/
|
|
public Number getMinimumAccessibleValue()
|
|
{
|
|
return new Integer(getMinimum());
|
|
}
|
|
|
|
/**
|
|
* Returns the maximum value of the {@link JProgressBar} component, as an
|
|
* {@link Integer}.
|
|
*
|
|
* @return The maximum value of the {@link JProgressBar} component.
|
|
*/
|
|
public Number getMaximumAccessibleValue()
|
|
{
|
|
return new Integer(getMaximum());
|
|
}
|
|
}
|
|
|
|
private static final long serialVersionUID = 1980046021813598781L;
|
|
|
|
/**
|
|
* A flag that determines the mode (<code>true</code> for indeterminate,
|
|
* <code>false</code> for determinate).
|
|
*/
|
|
private transient boolean indeterminate = false;
|
|
|
|
/**
|
|
* The orientation of the <code>JProgressBar</code>
|
|
* ({@link SwingConstants#HORIZONTAL} or {@link SwingConstants#VERTICAL}).
|
|
* Defaults to {@link SwingConstants#HORIZONTAL}.
|
|
* @see #setOrientation(int)
|
|
*/
|
|
protected int orientation;
|
|
|
|
/**
|
|
* A flag the controls whether or not the component's border is painted.
|
|
* The default is <code>true</code>.
|
|
* @see #setBorderPainted(boolean)
|
|
*/
|
|
protected boolean paintBorder = true;
|
|
|
|
/**
|
|
* The model defining the bounds and current value for the progress bar.
|
|
* @see #setModel(BoundedRangeModel)
|
|
*/
|
|
protected BoundedRangeModel model;
|
|
|
|
/**
|
|
* A custom string for display in the progress bar. If this is
|
|
* <code>null</code>, a default string will be generated.
|
|
* @see #setString(String)
|
|
*/
|
|
protected String progressString;
|
|
|
|
/**
|
|
* A flag that controls whether a string is displayed within the progress
|
|
* bar.
|
|
* @see #setStringPainted(boolean)
|
|
*/
|
|
protected boolean paintString = false;
|
|
|
|
/**
|
|
* A single change event reused for all events.
|
|
* @see #fireStateChanged()
|
|
*/
|
|
protected transient ChangeEvent changeEvent;
|
|
|
|
/**
|
|
* The listener that is registered with the model. */
|
|
protected ChangeListener changeListener;
|
|
|
|
/**
|
|
* Creates a new <code>JProgressBar</code> with default attributes. The
|
|
* following defaults are used:
|
|
* <p>
|
|
* <ul>
|
|
* <li><code>value</code>: 0;</li>
|
|
* <li><code>minimum</code>: 0;</li>
|
|
* <li><code>maximum</code>: 100;</li>
|
|
* <li><code>orientation</code>: {@link SwingConstants#HORIZONTAL}.</li>
|
|
* </ul>
|
|
*/
|
|
public JProgressBar()
|
|
{
|
|
this(HORIZONTAL, 0, 100);
|
|
}
|
|
|
|
/**
|
|
* Creates a new <code>JProgressBar</code> with the specified
|
|
* <code>orientation</code>. The following defaults are used:
|
|
* <p>
|
|
* <ul>
|
|
* <li><code>value</code>: 0;</li>
|
|
* <li><code>minimum</code>: 0;</li>
|
|
* <li><code>maximum</code>: 100;</li>
|
|
* </ul>
|
|
*
|
|
* @param orientation the orientation ({@link #HORIZONTAL} or
|
|
* {@link #VERTICAL}).
|
|
*
|
|
* @throws IllegalArgumentException if <code>orientation</code> is not one of
|
|
* the specified values.
|
|
*/
|
|
public JProgressBar(int orientation)
|
|
{
|
|
this(orientation, 0, 100);
|
|
}
|
|
|
|
/**
|
|
* Creates a new <code>JProgressBar</code> with the specified value range.
|
|
* The following defaults are used:
|
|
* <p>
|
|
* <ul>
|
|
* <li><code>value</code>: <code>minimum</code>;</li>
|
|
* <li><code>orientation</code>: {@link SwingConstants#HORIZONTAL}.</li>
|
|
* </ul>
|
|
*
|
|
* @param minimum the lower bound of the value range.
|
|
* @param maximum the upper bound of the value range.
|
|
*/
|
|
public JProgressBar(int minimum, int maximum)
|
|
{
|
|
this(HORIZONTAL, minimum, maximum);
|
|
}
|
|
|
|
/**
|
|
* Creates a new <code>JProgressBar</code> with the specified range and
|
|
* orientation. The following defaults are used:
|
|
* <p>
|
|
* <ul>
|
|
* <li><code>value</code>: <code>minimum</code>;</li>
|
|
* </ul>
|
|
*
|
|
* @param minimum the lower bound of the value range.
|
|
* @param maximum the upper bound of the value range.
|
|
* @param orientation the orientation ({@link #HORIZONTAL} or
|
|
* {@link #VERTICAL}).
|
|
*
|
|
* @throws IllegalArgumentException if <code>orientation</code> is not one of
|
|
* the specified values.
|
|
*/
|
|
public JProgressBar(int orientation, int minimum, int maximum)
|
|
{
|
|
model = new DefaultBoundedRangeModel(minimum, 0, minimum, maximum);
|
|
if (orientation != HORIZONTAL && orientation != VERTICAL)
|
|
throw new IllegalArgumentException(orientation
|
|
+ " is not a legal orientation");
|
|
this.orientation = orientation;
|
|
changeListener = createChangeListener();
|
|
model.addChangeListener(changeListener);
|
|
updateUI();
|
|
}
|
|
|
|
/**
|
|
* Creates a new <code>JProgressBar</code> with the specified model. The
|
|
* following defaults are used:
|
|
* <p>
|
|
* <ul>
|
|
* <li><code>orientation</code>: {@link SwingConstants#HORIZONTAL}.</li>
|
|
* </ul>
|
|
*
|
|
* @param model the model (<code>null</code> not permitted).
|
|
*/
|
|
public JProgressBar(BoundedRangeModel model)
|
|
{
|
|
this.model = model;
|
|
changeListener = createChangeListener();
|
|
if (model != null)
|
|
model.addChangeListener(changeListener);
|
|
updateUI();
|
|
}
|
|
|
|
/**
|
|
* Returns the current value for the <code>JProgressBar</code>. This value
|
|
* is fetched from the model.
|
|
*
|
|
* @return The current value.
|
|
*
|
|
* @see #setValue(int)
|
|
*/
|
|
public int getValue()
|
|
{
|
|
return model.getValue();
|
|
}
|
|
|
|
/**
|
|
* Sets the current value for the <code>JProgressBar</code>. The value is
|
|
* stored in the component's <code>model</code> (see {@link #getModel()}).
|
|
* If the new value is different to the old value, a {@link ChangeEvent} is
|
|
* sent to the model's registered listeners. In turn, this triggers a call
|
|
* to {@link #fireStateChanged()} which will send a <code>ChangeEvent</code>
|
|
* to this component's registered listeners.
|
|
* <p>
|
|
* If <code>value</code> is outside the range <code>minimum</code> to
|
|
* <code>maximum</code>, it will be set to the nearest of those boundary
|
|
* values.
|
|
*
|
|
* @param value the new value.
|
|
*
|
|
* @see #getValue()
|
|
*/
|
|
public void setValue(int value)
|
|
{
|
|
model.setValue(value);
|
|
}
|
|
|
|
/**
|
|
* Paints the component's border, but only if {@link #isBorderPainted()}
|
|
* returns <code>true</code>.
|
|
*
|
|
* @param graphics the graphics object to paint with.
|
|
*
|
|
* @see #setBorderPainted(boolean)
|
|
*/
|
|
protected void paintBorder(Graphics graphics)
|
|
{
|
|
Border border = getBorder();
|
|
if (paintBorder && border != null)
|
|
border.paintBorder(this, graphics, 0, 0, getWidth(), getHeight());
|
|
}
|
|
|
|
/**
|
|
* Returns the orientation of the <code>JProgressBar</code> component, which
|
|
* is either {@link SwingConstants#HORIZONTAL} or
|
|
* {@link SwingConstants#VERTICAL}. The default orientation is
|
|
* <code>HORIZONTAL</code>.
|
|
*
|
|
* @return The orientation.
|
|
*
|
|
* @see #setOrientation(int)
|
|
*/
|
|
public int getOrientation()
|
|
{
|
|
return orientation;
|
|
}
|
|
|
|
/**
|
|
* Sets the orientation for this <code>JProgressBar</code> component and,
|
|
* if the value changes, sends a {@link PropertyChangeEvent} (with the
|
|
* property name <code>"orientation"</code>) to all registered listeners.
|
|
*
|
|
* @param orientation the orientation ({@link #HORIZONTAL} or
|
|
* {@link #VERTICAL}).
|
|
*
|
|
* @throws IllegalArgumentException if <code>orientation</code> is not
|
|
* one of the listed values.
|
|
*
|
|
* @see #getOrientation()
|
|
*/
|
|
public void setOrientation(int orientation)
|
|
{
|
|
if (orientation != VERTICAL && orientation != HORIZONTAL)
|
|
throw new IllegalArgumentException(orientation
|
|
+ " is not a legal orientation");
|
|
if (this.orientation != orientation)
|
|
{
|
|
int oldOrientation = this.orientation;
|
|
this.orientation = orientation;
|
|
firePropertyChange("orientation", oldOrientation, this.orientation);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the flag that controls whether or not the string returned by
|
|
* {@link #getString()} is displayed by the <code>JProgressBar</code>
|
|
* component.
|
|
*
|
|
* @return <code>true</code> if the string should be displayed, and
|
|
* <code>false</code> otherwise.
|
|
*
|
|
* @see #setStringPainted(boolean)
|
|
*/
|
|
public boolean isStringPainted()
|
|
{
|
|
return paintString;
|
|
}
|
|
|
|
/**
|
|
* Sets the flag that controls whether or not the string returned by
|
|
* {@link #getString()} is displayed by the <code>JProgressBar</code>
|
|
* component. If the flag value changes, a {@link PropertyChangeEvent} (with
|
|
* the property name <code>"stringPainted"</code>) is sent to all registered
|
|
* listeners.
|
|
*
|
|
* @param painted the new flag value.
|
|
*
|
|
* @see #isStringPainted()
|
|
* @see #setString(String)
|
|
*/
|
|
public void setStringPainted(boolean painted)
|
|
{
|
|
if (paintString != painted)
|
|
{
|
|
boolean oldPainted = paintString;
|
|
paintString = painted;
|
|
firePropertyChange("stringPainted", oldPainted, paintString);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the string that is painted on the <code>JProgressBar</code> if
|
|
* {@link #isStringPainted()} returns <code>true</code>. If no string has
|
|
* been explicitly set, this method will return a string displaying the
|
|
* value of {@link #getPercentComplete()}.
|
|
*
|
|
* @return The string.
|
|
*
|
|
* @see #setString(String)
|
|
* @see #setStringPainted(boolean)
|
|
*/
|
|
public String getString()
|
|
{
|
|
if (progressString != null)
|
|
return progressString;
|
|
else
|
|
return (int) (getPercentComplete() * 100) + "%";
|
|
}
|
|
|
|
/**
|
|
* Sets the string to display within the progress bar and, if the new value
|
|
* is different to the old value, sends a {@link PropertyChangeEvent} (with
|
|
* the property name <code>"string"</code>) to all registered listeners. If
|
|
* the string is set to <code>null</code>, {@link #getString()} will return
|
|
* a default string.
|
|
*
|
|
* @param string the string (<code>null</code> permitted).
|
|
*
|
|
* @see #getString()
|
|
* @see #setStringPainted(boolean)
|
|
*/
|
|
public void setString(String string)
|
|
{
|
|
if (((string == null || progressString == null) &&
|
|
string != progressString) || (string != null &&
|
|
! string.equals(progressString)))
|
|
{
|
|
String oldString = progressString;
|
|
progressString = string;
|
|
firePropertyChange("string", oldString, progressString);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the current value expressed as a percentage. This is calculated
|
|
* as <code>(value - min) / (max - min)</code>.
|
|
*
|
|
* @return The percentage (a value in the range 0.0 to 1.0).
|
|
*/
|
|
public double getPercentComplete()
|
|
{
|
|
if (getMaximum() == getMinimum())
|
|
return 1.0;
|
|
else
|
|
return (double) (model.getValue() - model.getMinimum())
|
|
/ (model.getMaximum() - model.getMinimum());
|
|
}
|
|
|
|
/**
|
|
* Returns a flag that controls whether or not the component's border is
|
|
* painted. The default value is <code>true</code>.
|
|
*
|
|
* @return <code>true</code> if the component's border should be painted,
|
|
* and <code>false</code> otherwise.
|
|
*
|
|
* @see #setBorderPainted(boolean)
|
|
*/
|
|
public boolean isBorderPainted()
|
|
{
|
|
return paintBorder;
|
|
}
|
|
|
|
/**
|
|
* Sets the flag that controls whether or not the component's border is
|
|
* painted. If the flag value is changed, this method sends a
|
|
* {@link PropertyChangeEvent} (with the property name "borderPainted") to
|
|
* all registered listeners.
|
|
*
|
|
* @param painted the new flag value.
|
|
*
|
|
* @see #isBorderPainted()
|
|
* @see #paintBorder
|
|
*/
|
|
public void setBorderPainted(boolean painted)
|
|
{
|
|
if (painted != paintBorder)
|
|
{
|
|
boolean oldPainted = paintBorder;
|
|
paintBorder = painted;
|
|
firePropertyChange("borderPainted", oldPainted, paintBorder);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the UI delegate for this <code>JProgressBar</code>.
|
|
*
|
|
* @return The UI delegate.
|
|
*/
|
|
public ProgressBarUI getUI()
|
|
{
|
|
return (ProgressBarUI) ui;
|
|
}
|
|
|
|
/**
|
|
* Sets the UI delegate for this component.
|
|
*
|
|
* @param ui the new UI delegate.
|
|
*/
|
|
public void setUI(ProgressBarUI ui)
|
|
{
|
|
super.setUI(ui);
|
|
}
|
|
|
|
/**
|
|
* Sets this <code>JProgressBar</code>'s UI delegate to the default
|
|
* (obtained from the {@link UIManager}) for the current look and feel.
|
|
*/
|
|
public void updateUI()
|
|
{
|
|
setUI((ProgressBarUI) UIManager.getUI(this));
|
|
}
|
|
|
|
/**
|
|
* Returns the suffix (<code>"ProgressBarUI"</code> in this case) used to
|
|
* determine the class name for a UI delegate that can provide the look and
|
|
* feel for a <code>JProgressBar</code>.
|
|
*
|
|
* @return <code>"ProgressBarUI"</code>.
|
|
*/
|
|
public String getUIClassID()
|
|
{
|
|
return "ProgressBarUI";
|
|
}
|
|
|
|
/**
|
|
* Creates a new {@link ChangeListener} that calls
|
|
* {@link #fireStateChanged()} whenever it receives a {@link ChangeEvent}
|
|
* (typically from the component's <code>model</code>). This listener is
|
|
* registered with the progress bar's model, so that changes made to the
|
|
* model directly will automatically result in the progress bar's listeners
|
|
* being notified also.
|
|
*
|
|
* @return A new listener.
|
|
*/
|
|
protected ChangeListener createChangeListener()
|
|
{
|
|
return new ChangeListener()
|
|
{
|
|
public void stateChanged(ChangeEvent ce)
|
|
{
|
|
fireStateChanged();
|
|
}
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Registers a listener with this component so that it will receive
|
|
* notification of component state changes.
|
|
*
|
|
* @param listener the listener.
|
|
*
|
|
* @see #removeChangeListener(ChangeListener)
|
|
*/
|
|
public void addChangeListener(ChangeListener listener)
|
|
{
|
|
listenerList.add(ChangeListener.class, listener);
|
|
}
|
|
|
|
/**
|
|
* Deregisters a listener so that it no longer receives notification of
|
|
* component state changes.
|
|
*
|
|
* @param listener the listener.
|
|
*
|
|
* @see #addChangeListener(ChangeListener)
|
|
*/
|
|
public void removeChangeListener(ChangeListener listener)
|
|
{
|
|
listenerList.remove(ChangeListener.class, listener);
|
|
}
|
|
|
|
/**
|
|
* Returns an array of the listeners that are registered with this component.
|
|
* The array may be empty, but is never <code>null</code>.
|
|
*
|
|
* @return An array of listeners.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public ChangeListener[] getChangeListeners()
|
|
{
|
|
return (ChangeListener[]) listenerList.getListeners(ChangeListener.class);
|
|
}
|
|
|
|
/**
|
|
* Sends a {@link ChangeEvent} to all registered listeners to indicate that
|
|
* the state of the <code>JProgressBar</code> has changed.
|
|
*
|
|
* @see #createChangeListener()
|
|
*/
|
|
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 the model for the <code>JProgressBar</code>.
|
|
*
|
|
* @return The model (never <code>null</code>).
|
|
*
|
|
* @see #setModel(BoundedRangeModel)
|
|
*/
|
|
public BoundedRangeModel getModel()
|
|
{
|
|
return model;
|
|
}
|
|
|
|
/**
|
|
* Sets the model for the <code>JProgressBar</code> and sends a
|
|
* {@link ChangeEvent} to all registered listeners.
|
|
*
|
|
* @param model the model (<code>null</code> not permitted).
|
|
*
|
|
* @see #getModel()
|
|
*/
|
|
public void setModel(BoundedRangeModel model)
|
|
{
|
|
if (model != this.model)
|
|
{
|
|
this.model.removeChangeListener(changeListener);
|
|
this.model = model;
|
|
this.model.addChangeListener(changeListener);
|
|
fireStateChanged();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the minimum value for the <code>JProgressBar</code>. This defines
|
|
* the lower bound for the current value, and is stored in the component's
|
|
* <code>model</code>.
|
|
*
|
|
* @return The minimum value.
|
|
*
|
|
* @see #setMinimum(int)
|
|
*/
|
|
public int getMinimum()
|
|
{
|
|
return model.getMinimum();
|
|
}
|
|
|
|
/**
|
|
* Sets the minimum value for the <code>JProgressBar</code>. The value is
|
|
* stored in the component's <code>model</code> (see {@link #getModel()}).
|
|
* If the new value is different to the old value, a {@link ChangeEvent} is
|
|
* sent to the model's registered listeners. In turn, this triggers a call
|
|
* to {@link #fireStateChanged()} which will send a <code>ChangeEvent</code>
|
|
* to this component's registered listeners.
|
|
*
|
|
* @param minimum the minimum value.
|
|
*
|
|
* @see #getMinimum()
|
|
*/
|
|
public void setMinimum(int minimum)
|
|
{
|
|
model.setMinimum(minimum);
|
|
}
|
|
|
|
/**
|
|
* Returns the maximum value for the <code>JProgressBar</code>. This defines
|
|
* the upper bound for the current value, and is stored in the component's
|
|
* <code>model</code>.
|
|
*
|
|
* @return The maximum value.
|
|
*
|
|
* @see #setMaximum(int)
|
|
*/
|
|
public int getMaximum()
|
|
{
|
|
return model.getMaximum();
|
|
}
|
|
|
|
/**
|
|
* Sets the maximum value for the <code>JProgressBar</code>. The value is
|
|
* stored in the component's <code>model</code> (see {@link #getModel()}).
|
|
* If the new value is different to the old value, a {@link ChangeEvent} is
|
|
* sent to the model's registered listeners. In turn, this triggers a call
|
|
* to {@link #fireStateChanged()} which will send a <code>ChangeEvent</code>
|
|
* to this component's registered listeners.
|
|
*
|
|
* @param maximum the maximum value.
|
|
*
|
|
* @see #getMaximum()
|
|
*/
|
|
public void setMaximum(int maximum)
|
|
{
|
|
model.setMaximum(maximum);
|
|
}
|
|
|
|
/**
|
|
* Returns an implementation-dependent string describing the attributes of
|
|
* this <code>JProgressBar</code>.
|
|
*
|
|
* @return A string describing the attributes of this
|
|
* <code>JProgressBar</code> (never <code>null</code>).
|
|
*/
|
|
protected String paramString()
|
|
{
|
|
String superParamStr = super.paramString();
|
|
CPStringBuilder sb = new CPStringBuilder();
|
|
sb.append(",orientation=");
|
|
if (orientation == HORIZONTAL)
|
|
sb.append("HORIZONTAL");
|
|
else
|
|
sb.append("VERTICAL");
|
|
sb.append(",paintBorder=").append(isBorderPainted());
|
|
sb.append(",paintString=").append(isStringPainted());
|
|
sb.append(",progressString=");
|
|
if (progressString != null)
|
|
sb.append(progressString);
|
|
sb.append(",indeterminateString=").append(isIndeterminate());
|
|
return superParamStr + sb.toString();
|
|
}
|
|
|
|
/**
|
|
* Sets the flag that controls the mode for this <code>JProgressBar</code>
|
|
* (<code>true</code> for indeterminate mode, and <code>false</code> for
|
|
* determinate mode). If the flag value changes, this method sends a
|
|
* {@link PropertyChangeEvent} (with the property name
|
|
* <code>"indeterminate"</code>) to all registered listeners.
|
|
* <p>
|
|
* If the <code>JProgressBar</code> is determinate, it paints a percentage
|
|
* of the bar described by its value. If it is indeterminate, it simply
|
|
* bounces a box between the ends of the bar; the value of the
|
|
* <code>JProgressBar</code> is ignored.
|
|
*
|
|
* @param flag the new flag value.
|
|
*
|
|
* @see #isIndeterminate()
|
|
* @since 1.4
|
|
*/
|
|
public void setIndeterminate(boolean flag)
|
|
{
|
|
if (indeterminate != flag)
|
|
{
|
|
indeterminate = flag;
|
|
firePropertyChange("indeterminate", !flag, indeterminate);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns a flag that indicates the mode for this <code>JProgressBar</code>
|
|
* (<code>true</code> for indeterminate mode, and <code>false</code> for
|
|
* determinate mode).
|
|
*
|
|
* @return A flag indicating the mode for the <code>JProgressBar</code>.
|
|
*
|
|
* @see #setIndeterminate(boolean)
|
|
* @since 1.4
|
|
*/
|
|
public boolean isIndeterminate()
|
|
{
|
|
return indeterminate;
|
|
}
|
|
|
|
/**
|
|
* Returns the object that provides accessibility features for this
|
|
* <code>JProgressBar</code> component.
|
|
*
|
|
* @return The accessible context (an instance of
|
|
* {@link AccessibleJProgressBar}).
|
|
*/
|
|
public AccessibleContext getAccessibleContext()
|
|
{
|
|
if (accessibleContext == null)
|
|
accessibleContext = new AccessibleJProgressBar();
|
|
|
|
return accessibleContext;
|
|
}
|
|
}
|