
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
770 lines
20 KiB
Java
770 lines
20 KiB
Java
/* XFontPeer.java -- The font peer for X
|
|
Copyright (C) 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 gnu.java.awt.peer.x;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.awt.AWTError;
|
|
import java.awt.Font;
|
|
import java.awt.FontMetrics;
|
|
import java.awt.GraphicsDevice;
|
|
import java.awt.GraphicsEnvironment;
|
|
import java.awt.font.FontRenderContext;
|
|
import java.awt.font.GlyphVector;
|
|
import java.awt.font.LineMetrics;
|
|
import java.awt.font.TextAttribute;
|
|
import java.awt.geom.Rectangle2D;
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.text.CharacterIterator;
|
|
import java.util.HashMap;
|
|
import java.util.Iterator;
|
|
import java.util.Locale;
|
|
import java.util.Map;
|
|
import java.util.Properties;
|
|
|
|
import gnu.java.awt.peer.ClasspathFontPeer;
|
|
import gnu.x11.Display;
|
|
import gnu.x11.Fontable;
|
|
|
|
/**
|
|
* The bridge from AWT to X fonts.
|
|
*
|
|
* @author Roman Kennke (kennke@aicas.com)
|
|
*/
|
|
public class XFontPeer
|
|
extends ClasspathFontPeer
|
|
{
|
|
|
|
/**
|
|
* The font mapping as specified in the file fonts.properties.
|
|
*/
|
|
private static Properties fontProperties;
|
|
static
|
|
{
|
|
fontProperties = new Properties();
|
|
InputStream in = XFontPeer.class.getResourceAsStream("xfonts.properties");
|
|
try
|
|
{
|
|
fontProperties.load(in);
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The FontMetrics implementation for XFontPeer.
|
|
*/
|
|
private class XFontMetrics
|
|
extends FontMetrics
|
|
{
|
|
/**
|
|
* The ascent of the font.
|
|
*/
|
|
int ascent;
|
|
|
|
/**
|
|
* The descent of the font.
|
|
*/
|
|
int descent;
|
|
|
|
/**
|
|
* The maximum of the character advances.
|
|
*/
|
|
private int maxAdvance;
|
|
|
|
/**
|
|
* The internal leading.
|
|
*/
|
|
int leading;
|
|
|
|
/**
|
|
* Cached string metrics. This caches string metrics locally so that the
|
|
* server doesn't have to be asked each time.
|
|
*/
|
|
private HashMap metricsCache;
|
|
|
|
/**
|
|
* The widths of the characters indexed by the characters themselves.
|
|
*/
|
|
private int[] charWidths;
|
|
|
|
/**
|
|
* Creates a new XFontMetrics for the specified font.
|
|
*
|
|
* @param font the font
|
|
*/
|
|
protected XFontMetrics(Font font)
|
|
{
|
|
super(font);
|
|
metricsCache = new HashMap();
|
|
Fontable.FontInfo info = getXFont().info();
|
|
ascent = info.font_ascent();
|
|
descent = info.font_descent();
|
|
maxAdvance = info.max_bounds().character_width();
|
|
leading = 0; // TODO: Not provided by X. Possible not needed.
|
|
|
|
if (info.min_byte1() == 0 && info.max_byte1() == 0)
|
|
readCharWidthsLinear(info);
|
|
else
|
|
readCharWidthsNonLinear(info);
|
|
}
|
|
|
|
/**
|
|
* Reads the character widths when specified in a linear fashion. That is
|
|
* when the min-byte1 and max-byte2 fields are both zero in the X protocol.
|
|
*
|
|
* @param info the font info reply
|
|
*/
|
|
private void readCharWidthsLinear(Fontable.FontInfo info)
|
|
{
|
|
int startIndex = info.min_char_or_byte2();
|
|
int endIndex = info.max_char_or_byte2();
|
|
charWidths = new int[endIndex + 1];
|
|
// All the characters before startIndex are zero width.
|
|
for (int i = 0; i < startIndex; i++)
|
|
{
|
|
charWidths[i] = 0;
|
|
}
|
|
// All the other character info is fetched from the font info.
|
|
int index = startIndex;
|
|
Fontable.FontInfo.CharInfo[] charInfos = info.char_infos();
|
|
for (Fontable.FontInfo.CharInfo charInfo : charInfos)
|
|
{
|
|
charWidths[index] = charInfo.character_width();
|
|
index++;
|
|
}
|
|
}
|
|
|
|
private void readCharWidthsNonLinear(Fontable.FontInfo info)
|
|
{
|
|
// TODO: Implement.
|
|
throw new UnsupportedOperationException("Not yet implemented");
|
|
}
|
|
|
|
/**
|
|
* Returns the ascent of the font.
|
|
*
|
|
* @return the ascent of the font
|
|
*/
|
|
public int getAscent()
|
|
{
|
|
return ascent;
|
|
}
|
|
|
|
/**
|
|
* Returns the descent of the font.
|
|
*
|
|
* @return the descent of the font
|
|
*/
|
|
public int getDescent()
|
|
{
|
|
return descent;
|
|
}
|
|
|
|
/**
|
|
* Returns the overall height of the font. This is the distance from
|
|
* baseline to baseline (usually ascent + descent + leading).
|
|
*
|
|
* @return the overall height of the font
|
|
*/
|
|
public int getHeight()
|
|
{
|
|
return ascent + descent;
|
|
}
|
|
|
|
/**
|
|
* Returns the leading of the font.
|
|
*
|
|
* @return the leading of the font
|
|
*/
|
|
public int getLeading()
|
|
{
|
|
return leading;
|
|
}
|
|
|
|
/**
|
|
* Returns the maximum advance for this font.
|
|
*
|
|
* @return the maximum advance for this font
|
|
*/
|
|
public int getMaxAdvance()
|
|
{
|
|
return maxAdvance;
|
|
}
|
|
|
|
/**
|
|
* Determines the width of the specified character <code>c</code>.
|
|
*
|
|
* @param c the character
|
|
*
|
|
* @return the width of the character
|
|
*/
|
|
public int charWidth(char c)
|
|
{
|
|
int width;
|
|
if (c > charWidths.length)
|
|
width = charWidths['?'];
|
|
else
|
|
width = charWidths[c];
|
|
return width;
|
|
}
|
|
|
|
/**
|
|
* Determines the overall width of the specified string.
|
|
*
|
|
* @param c the char buffer holding the string
|
|
* @param offset the starting offset of the string in the buffer
|
|
* @param length the number of characters in the string buffer
|
|
*
|
|
* @return the overall width of the specified string
|
|
*/
|
|
public int charsWidth(char[] c, int offset, int length)
|
|
{
|
|
int width = 0;
|
|
if (c.length > 0 && length > 0)
|
|
{
|
|
String s = new String(c, offset, length);
|
|
width = stringWidth(s);
|
|
}
|
|
return width;
|
|
}
|
|
|
|
/**
|
|
* Determines the overall width of the specified string.
|
|
*
|
|
* @param s the string
|
|
*
|
|
* @return the overall width of the specified string
|
|
*/
|
|
public int stringWidth(String s)
|
|
{
|
|
int width = 0;
|
|
if (s.length() > 0)
|
|
{
|
|
if (metricsCache.containsKey(s))
|
|
{
|
|
width = ((Integer) metricsCache.get(s)).intValue();
|
|
}
|
|
else
|
|
{
|
|
Fontable.TextExtentInfo extents = getXFont().text_extent(s);
|
|
/*
|
|
System.err.println("string: '" + s + "' : ");
|
|
System.err.println("ascent: " + extents.getAscent());
|
|
System.err.println("descent: " + extents.getDescent());
|
|
System.err.println("overall ascent: " + extents.getOverallAscent());
|
|
System.err.println("overall descent: " + extents.getOverallDescent());
|
|
System.err.println("overall width: " + extents.getOverallWidth());
|
|
System.err.println("overall left: " + extents.getOverallLeft());
|
|
System.err.println("overall right: " + extents.getOverallRight());
|
|
*/
|
|
width = extents.overall_width(); // + extents.overall_left();
|
|
//System.err.println("String: " + s + ", width: " + width);
|
|
metricsCache.put(s, new Integer(width));
|
|
}
|
|
}
|
|
//System.err.print("stringWidth: '" + s + "': ");
|
|
//System.err.println(width);
|
|
return width;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The LineMetrics implementation for the XFontPeer.
|
|
*/
|
|
private class XLineMetrics
|
|
extends LineMetrics
|
|
{
|
|
|
|
/**
|
|
* Returns the ascent of the font.
|
|
*
|
|
* @return the ascent of the font
|
|
*/
|
|
public float getAscent()
|
|
{
|
|
return fontMetrics.ascent;
|
|
}
|
|
|
|
public int getBaselineIndex()
|
|
{
|
|
// FIXME: Implement this.
|
|
throw new UnsupportedOperationException();
|
|
}
|
|
|
|
public float[] getBaselineOffsets()
|
|
{
|
|
// FIXME: Implement this.
|
|
throw new UnsupportedOperationException();
|
|
}
|
|
|
|
/**
|
|
* Returns the descent of the font.
|
|
*
|
|
* @return the descent of the font
|
|
*/
|
|
public float getDescent()
|
|
{
|
|
return fontMetrics.descent;
|
|
}
|
|
|
|
/**
|
|
* Returns the overall height of the font. This is the distance from
|
|
* baseline to baseline (usually ascent + descent + leading).
|
|
*
|
|
* @return the overall height of the font
|
|
*/
|
|
public float getHeight()
|
|
{
|
|
return fontMetrics.ascent + fontMetrics.descent;
|
|
}
|
|
|
|
/**
|
|
* Returns the leading of the font.
|
|
*
|
|
* @return the leading of the font
|
|
*/
|
|
public float getLeading()
|
|
{
|
|
return fontMetrics.leading;
|
|
}
|
|
|
|
public int getNumChars()
|
|
{
|
|
// FIXME: Implement this.
|
|
throw new UnsupportedOperationException();
|
|
}
|
|
|
|
public float getStrikethroughOffset()
|
|
{
|
|
return 0.F; // TODO: Provided by X??
|
|
}
|
|
|
|
public float getStrikethroughThickness()
|
|
{
|
|
return 1.F; // TODO: Provided by X??
|
|
}
|
|
|
|
public float getUnderlineOffset()
|
|
{
|
|
return 0.F; // TODO: Provided by X??
|
|
}
|
|
|
|
public float getUnderlineThickness()
|
|
{
|
|
return 1.F; // TODO: Provided by X??
|
|
}
|
|
|
|
}
|
|
|
|
/**
|
|
* The X font.
|
|
*/
|
|
private gnu.x11.Font xfont;
|
|
|
|
private String name;
|
|
|
|
private int style;
|
|
|
|
private int size;
|
|
|
|
/**
|
|
* The font metrics for this font.
|
|
*/
|
|
XFontMetrics fontMetrics;
|
|
|
|
/**
|
|
* Creates a new XFontPeer for the specified font name, style and size.
|
|
*
|
|
* @param name the font name
|
|
* @param style the font style (bold / italic / normal)
|
|
* @param size the size of the font
|
|
*/
|
|
public XFontPeer(String name, int style, int size)
|
|
{
|
|
super(name, style, size);
|
|
this.name = name;
|
|
this.style = style;
|
|
this.size = size;
|
|
}
|
|
|
|
/**
|
|
* Creates a new XFontPeer for the specified font name and style
|
|
* attributes.
|
|
*
|
|
* @param name the font name
|
|
* @param atts the font attributes
|
|
*/
|
|
public XFontPeer(String name, Map atts)
|
|
{
|
|
super(name, atts);
|
|
String family = name;
|
|
if (family == null || family.equals(""))
|
|
family = (String) atts.get(TextAttribute.FAMILY);
|
|
if (family == null)
|
|
family = "SansSerif";
|
|
|
|
int size = 12;
|
|
Float sizeFl = (Float) atts.get(TextAttribute.SIZE);
|
|
if (sizeFl != null)
|
|
size = sizeFl.intValue();
|
|
|
|
int style = 0;
|
|
// Detect italic attribute.
|
|
Float posture = (Float) atts.get(TextAttribute.POSTURE);
|
|
if (posture != null && !posture.equals(TextAttribute.POSTURE_REGULAR))
|
|
style |= Font.ITALIC;
|
|
|
|
// Detect bold attribute.
|
|
Float weight = (Float) atts.get(TextAttribute.WEIGHT);
|
|
if (weight != null && weight.compareTo(TextAttribute.WEIGHT_REGULAR) > 0)
|
|
style |= Font.BOLD;
|
|
|
|
this.name = name;
|
|
this.style = style;
|
|
this.size = size;
|
|
}
|
|
|
|
/**
|
|
* Initializes the font peer with the specified attributes. This method is
|
|
* called from both constructors.
|
|
*
|
|
* @param name the font name
|
|
* @param style the font style
|
|
* @param size the font size
|
|
*/
|
|
private void init(String name, int style, int size)
|
|
{
|
|
if (name == null)
|
|
{
|
|
name = "SansSerif";
|
|
}
|
|
GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
|
|
GraphicsDevice dev = env.getDefaultScreenDevice();
|
|
if (dev instanceof XGraphicsDevice)
|
|
{
|
|
Display display = ((XGraphicsDevice) dev).getDisplay();
|
|
String fontDescr = encodeFont(name, style, size);
|
|
if (XToolkit.DEBUG)
|
|
System.err.println("XLFD font description: " + fontDescr);
|
|
xfont = new gnu.x11.Font(display, fontDescr);
|
|
}
|
|
else
|
|
{
|
|
throw new AWTError("Local GraphicsEnvironment is not XWindowGraphicsEnvironment");
|
|
}
|
|
}
|
|
|
|
public boolean canDisplay(Font font, int c)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
public int canDisplayUpTo(Font font, CharacterIterator i, int start, int limit)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
public String getSubFamilyName(Font font, Locale locale)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
public String getPostScriptName(Font font)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
public int getNumGlyphs(Font font)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
public int getMissingGlyphCode(Font font)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
public byte getBaselineFor(Font font, char c)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
public String getGlyphName(Font font, int glyphIndex)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
public GlyphVector createGlyphVector(Font font, FontRenderContext frc,
|
|
CharacterIterator ci)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
public GlyphVector createGlyphVector(Font font, FontRenderContext ctx,
|
|
int[] glyphCodes)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
public GlyphVector layoutGlyphVector(Font font, FontRenderContext frc,
|
|
char[] chars, int start, int limit,
|
|
int flags)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
/**
|
|
* Returns the font metrics for the specified font.
|
|
*
|
|
* @param font the font for which to fetch the font metrics
|
|
*
|
|
* @return the font metrics for the specified font
|
|
*/
|
|
public FontMetrics getFontMetrics(Font font)
|
|
{
|
|
if (font.getPeer() != this)
|
|
throw new AWTError("The specified font has a different peer than this");
|
|
|
|
if (fontMetrics == null)
|
|
fontMetrics = new XFontMetrics(font);
|
|
return fontMetrics;
|
|
}
|
|
|
|
/**
|
|
* Frees the font in the X server.
|
|
*/
|
|
protected void finalize()
|
|
{
|
|
if (xfont != null)
|
|
xfont.close();
|
|
}
|
|
|
|
public boolean hasUniformLineMetrics(Font font)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
/**
|
|
* Returns the line metrics for this font and the specified string and
|
|
* font render context.
|
|
*/
|
|
public LineMetrics getLineMetrics(Font font, CharacterIterator ci, int begin,
|
|
int limit, FontRenderContext rc)
|
|
{
|
|
return new XLineMetrics();
|
|
}
|
|
|
|
public Rectangle2D getMaxCharBounds(Font font, FontRenderContext rc)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
public Rectangle2D getStringBounds(Font font, CharacterIterator ci,
|
|
int begin, int limit, FontRenderContext frc)
|
|
{
|
|
// TODO: Implement this.
|
|
throw new UnsupportedOperationException("Not yet implemented.");
|
|
}
|
|
|
|
/**
|
|
* Encodes a font name + style + size specification into a X logical font
|
|
* description (XLFD) as described here:
|
|
*
|
|
* http://www.meretrx.com/e93/docs/xlfd.html
|
|
*
|
|
* This is implemented to look up the font description in the
|
|
* fonts.properties of this package.
|
|
*
|
|
* @param name the font name
|
|
* @param atts the text attributes
|
|
*
|
|
* @return the encoded font description
|
|
*/
|
|
static String encodeFont(String name, Map atts)
|
|
{
|
|
String family = name;
|
|
if (family == null || family.equals(""))
|
|
family = (String) atts.get(TextAttribute.FAMILY);
|
|
if (family == null)
|
|
family = "SansSerif";
|
|
|
|
int size = 12;
|
|
Float sizeFl = (Float) atts.get(TextAttribute.SIZE);
|
|
if (sizeFl != null)
|
|
size = sizeFl.intValue();
|
|
|
|
int style = 0;
|
|
// Detect italic attribute.
|
|
Float posture = (Float) atts.get(TextAttribute.POSTURE);
|
|
if (posture != null && !posture.equals(TextAttribute.POSTURE_REGULAR))
|
|
style |= Font.ITALIC;
|
|
|
|
// Detect bold attribute.
|
|
Float weight = (Float) atts.get(TextAttribute.WEIGHT);
|
|
if (weight != null && weight.compareTo(TextAttribute.WEIGHT_REGULAR) > 0)
|
|
style |= Font.BOLD;
|
|
|
|
return encodeFont(family, style, size);
|
|
}
|
|
|
|
/**
|
|
* Encodes a font name + style + size specification into a X logical font
|
|
* description (XLFD) as described here:
|
|
*
|
|
* http://www.meretrx.com/e93/docs/xlfd.html
|
|
*
|
|
* This is implemented to look up the font description in the
|
|
* fonts.properties of this package.
|
|
*
|
|
* @param name the font name
|
|
* @param style the font style
|
|
* @param size the font size
|
|
*
|
|
* @return the encoded font description
|
|
*/
|
|
static String encodeFont(String name, int style, int size)
|
|
{
|
|
CPStringBuilder key = new CPStringBuilder();
|
|
key.append(validName(name));
|
|
key.append('.');
|
|
switch (style)
|
|
{
|
|
case Font.BOLD:
|
|
key.append("bold");
|
|
break;
|
|
case Font.ITALIC:
|
|
key.append("italic");
|
|
break;
|
|
case (Font.BOLD | Font.ITALIC):
|
|
key.append("bolditalic");
|
|
break;
|
|
case Font.PLAIN:
|
|
default:
|
|
key.append("plain");
|
|
|
|
}
|
|
|
|
String protoType = fontProperties.getProperty(key.toString());
|
|
int s = validSize(size);
|
|
return protoType.replaceFirst("%d", String.valueOf(s));
|
|
}
|
|
|
|
/**
|
|
* Checks the specified font name for a valid font name. If the font name
|
|
* is not known, then this returns 'sansserif' as fallback.
|
|
*
|
|
* @param name the font name to check
|
|
*
|
|
* @return a valid font name
|
|
*/
|
|
static String validName(String name)
|
|
{
|
|
String retVal;
|
|
if (name.equalsIgnoreCase("sansserif")
|
|
|| name.equalsIgnoreCase("serif")
|
|
|| name.equalsIgnoreCase("monospaced")
|
|
|| name.equalsIgnoreCase("dialog")
|
|
|| name.equalsIgnoreCase("dialoginput"))
|
|
{
|
|
retVal = name.toLowerCase();
|
|
}
|
|
else
|
|
{
|
|
retVal = "sansserif";
|
|
}
|
|
return retVal;
|
|
}
|
|
|
|
/**
|
|
* Translates an arbitrary point size to a size that is typically available
|
|
* on an X server. These are the sizes 8, 10, 12, 14, 18 and 24.
|
|
*
|
|
* @param size the queried size
|
|
* @return the real available size
|
|
*/
|
|
private static final int validSize(int size)
|
|
{
|
|
int val;
|
|
if (size <= 9)
|
|
val = 8;
|
|
else if (size <= 11)
|
|
val = 10;
|
|
else if (size <= 13)
|
|
val = 12;
|
|
else if (size <= 17)
|
|
val = 14;
|
|
else if (size <= 23)
|
|
val = 18;
|
|
else
|
|
val = 24;
|
|
return val;
|
|
}
|
|
|
|
/**
|
|
* Returns the X Font reference. This lazily loads the font when first
|
|
* requested.
|
|
*
|
|
* @return the X Font reference
|
|
*/
|
|
gnu.x11.Font getXFont()
|
|
{
|
|
if (xfont == null)
|
|
{
|
|
init(name, style, size);
|
|
}
|
|
return xfont;
|
|
}
|
|
}
|