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
949 lines
26 KiB
Java
949 lines
26 KiB
Java
/* UIManager.java --
|
|
Copyright (C) 2002, 2003, 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.Color;
|
|
import java.awt.Dimension;
|
|
import java.awt.Font;
|
|
import java.awt.Insets;
|
|
import java.beans.PropertyChangeListener;
|
|
import java.beans.PropertyChangeSupport;
|
|
import java.io.Serializable;
|
|
import java.util.Enumeration;
|
|
import java.util.Locale;
|
|
|
|
import javax.swing.border.Border;
|
|
import javax.swing.plaf.ComponentUI;
|
|
import javax.swing.plaf.metal.MetalLookAndFeel;
|
|
|
|
/**
|
|
* Manages the current {@link LookAndFeel} and any auxiliary {@link LookAndFeel}
|
|
* instances.
|
|
*/
|
|
public class UIManager implements Serializable
|
|
{
|
|
/**
|
|
* Represents the basic information about a {@link LookAndFeel} (LAF), so
|
|
* that a list of installed LAFs can be presented without actually loading
|
|
* the LAF class(es).
|
|
*/
|
|
public static class LookAndFeelInfo
|
|
{
|
|
String name, clazz;
|
|
|
|
/**
|
|
* Creates a new instance.
|
|
*
|
|
* @param name the look and feel name.
|
|
* @param clazz the look and feel class name.
|
|
*/
|
|
public LookAndFeelInfo(String name,
|
|
String clazz)
|
|
{
|
|
this.name = name;
|
|
this.clazz = clazz;
|
|
}
|
|
|
|
/**
|
|
* Returns the name of the look and feel.
|
|
*
|
|
* @return The name of the look and feel.
|
|
*/
|
|
public String getName()
|
|
{
|
|
return name;
|
|
}
|
|
|
|
/**
|
|
* Returns the fully qualified class name for the {@link LookAndFeel}.
|
|
*
|
|
* @return The fully qualified class name for the {@link LookAndFeel}.
|
|
*/
|
|
public String getClassName()
|
|
{
|
|
return clazz;
|
|
}
|
|
|
|
/**
|
|
* Returns a String representation of the LookAndFeelInfo object.
|
|
*
|
|
* @return a String representation of the LookAndFeelInfo object
|
|
*/
|
|
public String toString()
|
|
{
|
|
CPStringBuilder s = new CPStringBuilder();
|
|
s.append(getClass().getName());
|
|
s.append('[');
|
|
s.append(getName());
|
|
s.append(' ');
|
|
s.append(getClassName());
|
|
s.append(']');
|
|
return s.toString();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* A UIDefaults subclass that multiplexes between itself and a 'fallback'
|
|
* UIDefaults instance. This is used to protect the L&F UIDefaults from beeing
|
|
* overwritten by applications.
|
|
*/
|
|
private static class MultiplexUIDefaults
|
|
extends UIDefaults
|
|
{
|
|
private class MultiplexEnumeration
|
|
implements Enumeration
|
|
{
|
|
Enumeration[] enums;
|
|
int i;
|
|
MultiplexEnumeration(Enumeration e1, Enumeration e2)
|
|
{
|
|
enums = new Enumeration[]{ e1, e2 };
|
|
i = 0;
|
|
}
|
|
|
|
public boolean hasMoreElements()
|
|
{
|
|
return enums[i].hasMoreElements() || i < enums.length - 1;
|
|
}
|
|
|
|
public Object nextElement()
|
|
{
|
|
Object val = enums[i].nextElement();
|
|
if (! enums[i].hasMoreElements() && i < enums.length - 1)
|
|
i++;
|
|
return val;
|
|
}
|
|
|
|
}
|
|
|
|
UIDefaults fallback;
|
|
|
|
/**
|
|
* Creates a new <code>MultiplexUIDefaults</code> instance with
|
|
* <code>d</code> as the fallback defaults.
|
|
*
|
|
* @param d the fallback defaults (<code>null</code> not permitted).
|
|
*/
|
|
MultiplexUIDefaults(UIDefaults d)
|
|
{
|
|
if (d == null)
|
|
throw new NullPointerException();
|
|
fallback = d;
|
|
}
|
|
|
|
public Object get(Object key)
|
|
{
|
|
Object val = super.get(key);
|
|
if (val == null)
|
|
val = fallback.get(key);
|
|
return val;
|
|
}
|
|
|
|
public Object get(Object key, Locale l)
|
|
{
|
|
Object val = super.get(key, l);
|
|
if (val == null)
|
|
val = fallback.get(key, l);
|
|
return val;
|
|
}
|
|
|
|
public Object remove(Object key)
|
|
{
|
|
Object val = super.remove(key);
|
|
if (val == null)
|
|
val = fallback.remove(key);
|
|
return val;
|
|
}
|
|
|
|
public int size()
|
|
{
|
|
return super.size() + fallback.size();
|
|
}
|
|
|
|
public Enumeration keys()
|
|
{
|
|
return new MultiplexEnumeration(super.keys(), fallback.keys());
|
|
}
|
|
|
|
public Enumeration elements()
|
|
{
|
|
return new MultiplexEnumeration(super.elements(), fallback.elements());
|
|
}
|
|
}
|
|
|
|
private static final long serialVersionUID = -5547433830339189365L;
|
|
|
|
/** The installed look and feel(s). */
|
|
static LookAndFeelInfo [] installed = {
|
|
new LookAndFeelInfo("Metal", "javax.swing.plaf.metal.MetalLookAndFeel"),
|
|
new LookAndFeelInfo("GNU", "gnu.javax.swing.plaf.gnu.GNULookAndFeel")
|
|
};
|
|
|
|
/** The installed auxiliary look and feels. */
|
|
static LookAndFeel[] auxLookAndFeels;
|
|
|
|
/** The current look and feel. */
|
|
static LookAndFeel currentLookAndFeel;
|
|
|
|
static MultiplexUIDefaults currentUIDefaults;
|
|
|
|
static UIDefaults lookAndFeelDefaults;
|
|
|
|
/** Property change listener mechanism. */
|
|
static PropertyChangeSupport listeners
|
|
= new PropertyChangeSupport(UIManager.class);
|
|
|
|
static
|
|
{
|
|
String defaultlaf = System.getProperty("swing.defaultlaf");
|
|
try
|
|
{
|
|
if (defaultlaf != null)
|
|
{
|
|
setLookAndFeel(defaultlaf);
|
|
}
|
|
else
|
|
{
|
|
setLookAndFeel(new MetalLookAndFeel());
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
System.err.println("cannot initialize Look and Feel: " + defaultlaf);
|
|
System.err.println("error: " + ex.toString());
|
|
ex.printStackTrace();
|
|
System.err.println("falling back to Metal Look and Feel");
|
|
try
|
|
{
|
|
setLookAndFeel(new MetalLookAndFeel());
|
|
}
|
|
catch (Exception ex2)
|
|
{
|
|
throw (Error) new AssertionError("There must be no problem installing"
|
|
+ " the MetalLookAndFeel.")
|
|
.initCause(ex2);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Creates a new instance of the <code>UIManager</code>. There is no need
|
|
* to construct an instance of this class, since all methods are static.
|
|
*/
|
|
public UIManager()
|
|
{
|
|
// Do nothing here.
|
|
}
|
|
|
|
/**
|
|
* Add a <code>PropertyChangeListener</code> to the listener list.
|
|
*
|
|
* @param listener the listener to add
|
|
*/
|
|
public static void addPropertyChangeListener(PropertyChangeListener listener)
|
|
{
|
|
listeners.addPropertyChangeListener(listener);
|
|
}
|
|
|
|
/**
|
|
* Remove a <code>PropertyChangeListener</code> from the listener list.
|
|
*
|
|
* @param listener the listener to remove
|
|
*/
|
|
public static void removePropertyChangeListener(PropertyChangeListener
|
|
listener)
|
|
{
|
|
listeners.removePropertyChangeListener(listener);
|
|
}
|
|
|
|
/**
|
|
* Returns an array of all added <code>PropertyChangeListener</code> objects.
|
|
*
|
|
* @return an array of listeners
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static PropertyChangeListener[] getPropertyChangeListeners()
|
|
{
|
|
return listeners.getPropertyChangeListeners();
|
|
}
|
|
|
|
/**
|
|
* Add a {@link LookAndFeel} to the list of auxiliary look and feels.
|
|
*
|
|
* @param laf the auxiliary look and feel (<code>null</code> not permitted).
|
|
*
|
|
* @throws NullPointerException if <code>laf</code> is <code>null</code>.
|
|
*
|
|
* @see #getAuxiliaryLookAndFeels()
|
|
*/
|
|
public static void addAuxiliaryLookAndFeel(LookAndFeel laf)
|
|
{
|
|
if (laf == null)
|
|
throw new NullPointerException("Null 'laf' argument.");
|
|
if (auxLookAndFeels == null)
|
|
{
|
|
auxLookAndFeels = new LookAndFeel[1];
|
|
auxLookAndFeels[0] = laf;
|
|
return;
|
|
}
|
|
|
|
LookAndFeel[] temp = new LookAndFeel[auxLookAndFeels.length + 1];
|
|
System.arraycopy(auxLookAndFeels, 0, temp, 0, auxLookAndFeels.length);
|
|
auxLookAndFeels = temp;
|
|
auxLookAndFeels[auxLookAndFeels.length - 1] = laf;
|
|
}
|
|
|
|
/**
|
|
* Removes a {@link LookAndFeel} (LAF) from the list of auxiliary LAFs.
|
|
*
|
|
* @param laf the LAF to remove.
|
|
*
|
|
* @return <code>true</code> if the LAF was removed, and <code>false</code>
|
|
* otherwise.
|
|
*/
|
|
public static boolean removeAuxiliaryLookAndFeel(LookAndFeel laf)
|
|
{
|
|
if (auxLookAndFeels == null)
|
|
return false;
|
|
int count = auxLookAndFeels.length;
|
|
if (count == 1 && auxLookAndFeels[0] == laf)
|
|
{
|
|
auxLookAndFeels = null;
|
|
return true;
|
|
}
|
|
for (int i = 0; i < count; i++)
|
|
{
|
|
if (auxLookAndFeels[i] == laf)
|
|
{
|
|
LookAndFeel[] temp = new LookAndFeel[auxLookAndFeels.length - 1];
|
|
if (i == 0)
|
|
{
|
|
System.arraycopy(auxLookAndFeels, 1, temp, 0, count - 1);
|
|
}
|
|
else if (i == count - 1)
|
|
{
|
|
System.arraycopy(auxLookAndFeels, 0, temp, 0, count - 1);
|
|
}
|
|
else
|
|
{
|
|
System.arraycopy(auxLookAndFeels, 0, temp, 0, i);
|
|
System.arraycopy(auxLookAndFeels, i + 1, temp, i,
|
|
count - i - 1);
|
|
}
|
|
auxLookAndFeels = temp;
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Returns an array (possibly <code>null</code>) containing the auxiliary
|
|
* {@link LookAndFeel}s that are in use. These are used by the
|
|
* {@link javax.swing.plaf.multi.MultiLookAndFeel} class.
|
|
*
|
|
* @return The auxiliary look and feels (possibly <code>null</code>).
|
|
*
|
|
* @see #addAuxiliaryLookAndFeel(LookAndFeel)
|
|
*/
|
|
public static LookAndFeel[] getAuxiliaryLookAndFeels()
|
|
{
|
|
return auxLookAndFeels;
|
|
}
|
|
|
|
/**
|
|
* Returns an object from the {@link UIDefaults} table for the current
|
|
* {@link LookAndFeel}.
|
|
*
|
|
* @param key the key.
|
|
*
|
|
* @return The object.
|
|
*/
|
|
public static Object get(Object key)
|
|
{
|
|
return getDefaults().get(key);
|
|
}
|
|
|
|
/**
|
|
* Returns an object from the {@link UIDefaults} table for the current
|
|
* {@link LookAndFeel}.
|
|
*
|
|
* @param key the key.
|
|
*
|
|
* @return The object.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static Object get(Object key, Locale locale)
|
|
{
|
|
return getDefaults().get(key, locale);
|
|
}
|
|
|
|
/**
|
|
* Returns a boolean value from the defaults table. If there is no value
|
|
* for the specified key, or the value is not an instance of {@link Boolean},
|
|
* this method returns <code>false</code>.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
*
|
|
* @return The boolean value associated with the specified key.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static boolean getBoolean(Object key)
|
|
{
|
|
Object value = get(key);
|
|
if (value instanceof Boolean)
|
|
return ((Boolean) value).booleanValue();
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Returns a boolean value from the defaults table. If there is no value
|
|
* for the specified key, or the value is not an instance of {@link Boolean},
|
|
* this method returns <code>false</code>.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
* @param locale the locale.
|
|
*
|
|
* @return The boolean value associated with the specified key.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static boolean getBoolean(Object key, Locale locale)
|
|
{
|
|
Object value = get(key, locale);
|
|
if (value instanceof Boolean)
|
|
return ((Boolean) value).booleanValue();
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Returns a border from the defaults table.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
*
|
|
* @return The border associated with the given key, or <code>null</code>.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
*/
|
|
public static Border getBorder(Object key)
|
|
{
|
|
Object value = get(key);
|
|
if (value instanceof Border)
|
|
return (Border) value;
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns a border from the defaults table.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
* @param locale the locale.
|
|
*
|
|
* @return The border associated with the given key, or <code>null</code>.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static Border getBorder(Object key, Locale locale)
|
|
{
|
|
Object value = get(key, locale);
|
|
if (value instanceof Border)
|
|
return (Border) value;
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns a drawing color from the defaults table.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
*
|
|
* @return The color associated with the given key, or <code>null</code>.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
*/
|
|
public static Color getColor(Object key)
|
|
{
|
|
Object value = get(key);
|
|
if (value instanceof Color)
|
|
return (Color) value;
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns a drawing color from the defaults table.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
* @param locale the locale.
|
|
*
|
|
* @return The color associated with the given key, or <code>null</code>.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static Color getColor(Object key, Locale locale)
|
|
{
|
|
Object value = get(key, locale);
|
|
if (value instanceof Color)
|
|
return (Color) value;
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* The fully qualified class name of the cross platform (Metal) look and feel.
|
|
* This string can be passed to Class.forName()
|
|
*
|
|
* @return <code>"javax.swing.plaf.metal.MetalLookAndFeel"</code>
|
|
*/
|
|
public static String getCrossPlatformLookAndFeelClassName()
|
|
{
|
|
return "javax.swing.plaf.metal.MetalLookAndFeel";
|
|
}
|
|
|
|
/**
|
|
* Returns the default values for this look and feel.
|
|
*
|
|
* @return The {@link UIDefaults} for the current {@link LookAndFeel}.
|
|
*/
|
|
public static UIDefaults getDefaults()
|
|
{
|
|
if (currentUIDefaults == null)
|
|
currentUIDefaults = new MultiplexUIDefaults(new UIDefaults());
|
|
return currentUIDefaults;
|
|
}
|
|
|
|
/**
|
|
* Returns a dimension from the defaults table.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
*
|
|
* @return The color associated with the given key, or <code>null</code>.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
*/
|
|
public static Dimension getDimension(Object key)
|
|
{
|
|
Object value = get(key);
|
|
if (value instanceof Dimension)
|
|
return (Dimension) value;
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns a dimension from the defaults table.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
* @param locale the locale.
|
|
*
|
|
* @return The color associated with the given key, or <code>null</code>.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
* @since 1.4
|
|
*/
|
|
public static Dimension getDimension(Object key, Locale locale)
|
|
{
|
|
Object value = get(key, locale);
|
|
if (value instanceof Dimension)
|
|
return (Dimension) value;
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Retrieves a font from the defaults table of the current
|
|
* LookAndFeel.
|
|
*
|
|
* @param key an Object that specifies the font. Typically,
|
|
* this is a String such as
|
|
* <code>TitledBorder.font</code>.
|
|
*
|
|
* @return The font associated with the given key, or <code>null</code>.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
*/
|
|
public static Font getFont(Object key)
|
|
{
|
|
Object value = get(key);
|
|
if (value instanceof Font)
|
|
return (Font) value;
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Retrieves a font from the defaults table of the current
|
|
* LookAndFeel.
|
|
*
|
|
* @param key an Object that specifies the font. Typically,
|
|
* this is a String such as
|
|
* <code>TitledBorder.font</code>.
|
|
* @param locale the locale.
|
|
*
|
|
* @return The font associated with the given key, or <code>null</code>.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static Font getFont(Object key, Locale locale)
|
|
{
|
|
Object value = get(key, locale);
|
|
if (value instanceof Font)
|
|
return (Font) value;
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns an icon from the defaults table.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
*
|
|
* @return The icon associated with the given key, or <code>null</code>.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
*/
|
|
public static Icon getIcon(Object key)
|
|
{
|
|
Object value = get(key);
|
|
if (value instanceof Icon)
|
|
return (Icon) value;
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns an icon from the defaults table.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
* @param locale the locale.
|
|
*
|
|
* @return The icon associated with the given key, or <code>null</code>.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
* @since 1.4
|
|
*/
|
|
public static Icon getIcon(Object key, Locale locale)
|
|
{
|
|
Object value = get(key, locale);
|
|
if (value instanceof Icon)
|
|
return (Icon) value;
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns an Insets object from the defaults table.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
*
|
|
* @return The insets associated with the given key, or <code>null</code>.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
*/
|
|
public static Insets getInsets(Object key)
|
|
{
|
|
Object o = get(key);
|
|
if (o instanceof Insets)
|
|
return (Insets) o;
|
|
else
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns an Insets object from the defaults table.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
* @param locale the locale.
|
|
*
|
|
* @return The insets associated with the given key, or <code>null</code>.
|
|
*
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
* @since 1.4
|
|
*/
|
|
public static Insets getInsets(Object key, Locale locale)
|
|
{
|
|
Object o = get(key, locale);
|
|
if (o instanceof Insets)
|
|
return (Insets) o;
|
|
else
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns an array containing information about the {@link LookAndFeel}s
|
|
* that are installed.
|
|
*
|
|
* @return A list of the look and feels that are available (installed).
|
|
*/
|
|
public static LookAndFeelInfo[] getInstalledLookAndFeels()
|
|
{
|
|
return installed;
|
|
}
|
|
|
|
/**
|
|
* Returns the integer value of the {@link Integer} associated with the
|
|
* given key. If there is no value, or the value is not an instance of
|
|
* {@link Integer}, this method returns 0.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
*
|
|
* @return The integer value associated with the given key, or 0.
|
|
*/
|
|
public static int getInt(Object key)
|
|
{
|
|
Object x = get(key);
|
|
if (x instanceof Integer)
|
|
return ((Integer) x).intValue();
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Returns the integer value of the {@link Integer} associated with the
|
|
* given key. If there is no value, or the value is not an instance of
|
|
* {@link Integer}, this method returns 0.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
* @param locale the locale.
|
|
*
|
|
* @return The integer value associated with the given key, or 0.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static int getInt(Object key, Locale locale)
|
|
{
|
|
Object x = get(key, locale);
|
|
if (x instanceof Integer)
|
|
return ((Integer) x).intValue();
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* Returns the current look and feel (which may be <code>null</code>).
|
|
*
|
|
* @return The current look and feel.
|
|
*
|
|
* @see #setLookAndFeel(LookAndFeel)
|
|
*/
|
|
public static LookAndFeel getLookAndFeel()
|
|
{
|
|
return currentLookAndFeel;
|
|
}
|
|
|
|
/**
|
|
* Returns the <code>UIDefaults</code> table of the currently active
|
|
* look and feel.
|
|
*
|
|
* @return The {@link UIDefaults} for the current {@link LookAndFeel}.
|
|
*/
|
|
public static UIDefaults getLookAndFeelDefaults()
|
|
{
|
|
return lookAndFeelDefaults;
|
|
}
|
|
|
|
/**
|
|
* Returns the {@link String} associated with the given key. If the value
|
|
* is not a {@link String}, this method returns <code>null</code>.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
*
|
|
* @return The string associated with the given key, or <code>null</code>.
|
|
*/
|
|
public static String getString(Object key)
|
|
{
|
|
Object s = get(key);
|
|
if (s instanceof String)
|
|
return (String) s;
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns the {@link String} associated with the given key. If the value
|
|
* is not a {@link String}, this method returns <code>null</code>.
|
|
*
|
|
* @param key the key (<code>null</code> not permitted).
|
|
* @param locale the locale.
|
|
*
|
|
* @return The string associated with the given key, or <code>null</code>.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static String getString(Object key, Locale locale)
|
|
{
|
|
Object s = get(key, locale);
|
|
if (s instanceof String)
|
|
return (String) s;
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns the name of the {@link LookAndFeel} class that implements the
|
|
* native systems look and feel if there is one, otherwise the name
|
|
* of the default cross platform LookAndFeel class.
|
|
*
|
|
* @return The fully qualified class name for the system look and feel.
|
|
*
|
|
* @see #getCrossPlatformLookAndFeelClassName()
|
|
*/
|
|
public static String getSystemLookAndFeelClassName()
|
|
{
|
|
return getCrossPlatformLookAndFeelClassName();
|
|
}
|
|
|
|
/**
|
|
* Returns UI delegate from the current {@link LookAndFeel} that renders the
|
|
* target component.
|
|
*
|
|
* @param target the target component.
|
|
*/
|
|
public static ComponentUI getUI(JComponent target)
|
|
{
|
|
return getDefaults().getUI(target);
|
|
}
|
|
|
|
/**
|
|
* Creates a new look and feel and adds it to the current array.
|
|
*
|
|
* @param name the look and feel name.
|
|
* @param className the fully qualified name of the class that implements the
|
|
* look and feel.
|
|
*/
|
|
public static void installLookAndFeel(String name, String className)
|
|
{
|
|
installLookAndFeel(new LookAndFeelInfo(name, className));
|
|
}
|
|
|
|
/**
|
|
* Adds the specified look and feel to the current array and then calls
|
|
* setInstalledLookAndFeels(javax.swing.UIManager.LookAndFeelInfo[]).
|
|
*/
|
|
public static void installLookAndFeel(LookAndFeelInfo info)
|
|
{
|
|
LookAndFeelInfo[] newInstalled = new LookAndFeelInfo[installed.length + 1];
|
|
System.arraycopy(installed, 0, newInstalled, 0, installed.length);
|
|
newInstalled[newInstalled.length - 1] = info;
|
|
setInstalledLookAndFeels(newInstalled);
|
|
}
|
|
|
|
/**
|
|
* Stores an object in the defaults table.
|
|
*
|
|
* @param key the key.
|
|
* @param value the value.
|
|
*/
|
|
public static Object put(Object key, Object value)
|
|
{
|
|
return getDefaults().put(key, value);
|
|
}
|
|
|
|
/**
|
|
* Replaces the current array of installed LookAndFeelInfos.
|
|
*/
|
|
public static void setInstalledLookAndFeels(UIManager.LookAndFeelInfo[] infos)
|
|
{
|
|
installed = infos;
|
|
}
|
|
|
|
/**
|
|
* Sets the current {@link LookAndFeel}.
|
|
*
|
|
* @param newLookAndFeel the new look and feel (<code>null</code> permitted).
|
|
*
|
|
* @throws UnsupportedLookAndFeelException if the look and feel is not
|
|
* supported on the current platform.
|
|
*
|
|
* @see LookAndFeel#isSupportedLookAndFeel()
|
|
*/
|
|
public static void setLookAndFeel(LookAndFeel newLookAndFeel)
|
|
throws UnsupportedLookAndFeelException
|
|
{
|
|
if (newLookAndFeel != null && ! newLookAndFeel.isSupportedLookAndFeel())
|
|
throw new UnsupportedLookAndFeelException(newLookAndFeel.getName()
|
|
+ " not supported on this platform");
|
|
LookAndFeel oldLookAndFeel = currentLookAndFeel;
|
|
if (oldLookAndFeel != null)
|
|
oldLookAndFeel.uninitialize();
|
|
|
|
// Set the current default look and feel using a LookAndFeel object.
|
|
currentLookAndFeel = newLookAndFeel;
|
|
if (newLookAndFeel != null)
|
|
{
|
|
newLookAndFeel.initialize();
|
|
lookAndFeelDefaults = newLookAndFeel.getDefaults();
|
|
if (currentUIDefaults == null)
|
|
currentUIDefaults =
|
|
new MultiplexUIDefaults(lookAndFeelDefaults);
|
|
else
|
|
currentUIDefaults.fallback = lookAndFeelDefaults;
|
|
}
|
|
else
|
|
{
|
|
currentUIDefaults = null;
|
|
}
|
|
listeners.firePropertyChange("lookAndFeel", oldLookAndFeel, newLookAndFeel);
|
|
//revalidate();
|
|
//repaint();
|
|
}
|
|
|
|
/**
|
|
* Set the current default look and feel using a class name.
|
|
*
|
|
* @param className the look and feel class name.
|
|
*
|
|
* @throws UnsupportedLookAndFeelException if the look and feel is not
|
|
* supported on the current platform.
|
|
*
|
|
* @see LookAndFeel#isSupportedLookAndFeel()
|
|
*/
|
|
public static void setLookAndFeel(String className)
|
|
throws ClassNotFoundException, InstantiationException, IllegalAccessException,
|
|
UnsupportedLookAndFeelException
|
|
{
|
|
Class c = Class.forName(className, true,
|
|
Thread.currentThread().getContextClassLoader());
|
|
LookAndFeel a = (LookAndFeel) c.newInstance(); // throws class-cast-exception
|
|
setLookAndFeel(a);
|
|
}
|
|
}
|