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
1423 lines
39 KiB
Java
1423 lines
39 KiB
Java
/* TextLayout.java --
|
|
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 java.awt.font;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.awt.Font;
|
|
import java.awt.Graphics2D;
|
|
import java.awt.Shape;
|
|
import java.awt.geom.AffineTransform;
|
|
import java.awt.geom.Line2D;
|
|
import java.awt.geom.Rectangle2D;
|
|
import java.awt.geom.GeneralPath;
|
|
import java.awt.geom.Point2D;
|
|
import java.text.CharacterIterator;
|
|
import java.text.AttributedCharacterIterator;
|
|
import java.text.Bidi;
|
|
import java.util.ArrayList;
|
|
import java.util.Map;
|
|
|
|
/**
|
|
* @author Sven de Marothy
|
|
*/
|
|
public final class TextLayout implements Cloneable
|
|
{
|
|
/**
|
|
* Holds the layout data that belongs to one run of characters.
|
|
*/
|
|
private class Run
|
|
{
|
|
/**
|
|
* The actual glyph vector.
|
|
*/
|
|
GlyphVector glyphVector;
|
|
|
|
/**
|
|
* The font for this text run.
|
|
*/
|
|
Font font;
|
|
|
|
/**
|
|
* The start of the run.
|
|
*/
|
|
int runStart;
|
|
|
|
/**
|
|
* The end of the run.
|
|
*/
|
|
int runEnd;
|
|
|
|
/**
|
|
* The layout location of the beginning of the run.
|
|
*/
|
|
float location;
|
|
|
|
/**
|
|
* Initializes the Run instance.
|
|
*
|
|
* @param gv the glyph vector
|
|
* @param start the start index of the run
|
|
* @param end the end index of the run
|
|
*/
|
|
Run(GlyphVector gv, Font f, int start, int end)
|
|
{
|
|
glyphVector = gv;
|
|
font = f;
|
|
runStart = start;
|
|
runEnd = end;
|
|
}
|
|
|
|
/**
|
|
* Returns <code>true</code> when this run is left to right,
|
|
* <code>false</code> otherwise.
|
|
*
|
|
* @return <code>true</code> when this run is left to right,
|
|
* <code>false</code> otherwise
|
|
*/
|
|
boolean isLeftToRight()
|
|
{
|
|
return (glyphVector.getLayoutFlags() & GlyphVector.FLAG_RUN_RTL) == 0;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The laid out character runs.
|
|
*/
|
|
private Run[] runs;
|
|
|
|
private FontRenderContext frc;
|
|
private char[] string;
|
|
private int offset;
|
|
private int length;
|
|
private Rectangle2D boundsCache;
|
|
private LineMetrics lm;
|
|
|
|
/**
|
|
* The total advance of this text layout. This is cache for maximum
|
|
* performance.
|
|
*/
|
|
private float totalAdvance = -1F;
|
|
|
|
/**
|
|
* The cached natural bounds.
|
|
*/
|
|
private Rectangle2D naturalBounds;
|
|
|
|
/**
|
|
* Character indices.
|
|
* Fixt index is the glyphvector, second index is the (first) glyph.
|
|
*/
|
|
private int[][] charIndices;
|
|
|
|
/**
|
|
* Base directionality, determined from the first char.
|
|
*/
|
|
private boolean leftToRight;
|
|
|
|
/**
|
|
* Whether this layout contains whitespace or not.
|
|
*/
|
|
private boolean hasWhitespace = false;
|
|
|
|
/**
|
|
* The {@link Bidi} object that is used for reordering and by
|
|
* {@link #getCharacterLevel(int)}.
|
|
*/
|
|
private Bidi bidi;
|
|
|
|
/**
|
|
* Mpas the logical position of each individual character in the original
|
|
* string to its visual position.
|
|
*/
|
|
private int[] logicalToVisual;
|
|
|
|
/**
|
|
* Maps visual positions of a character to its logical position
|
|
* in the original string.
|
|
*/
|
|
private int[] visualToLogical;
|
|
|
|
/**
|
|
* The cached hashCode.
|
|
*/
|
|
private int hash;
|
|
|
|
/**
|
|
* The default caret policy.
|
|
*/
|
|
public static final TextLayout.CaretPolicy DEFAULT_CARET_POLICY =
|
|
new CaretPolicy();
|
|
|
|
/**
|
|
* Constructs a TextLayout.
|
|
*/
|
|
public TextLayout (String str, Font font, FontRenderContext frc)
|
|
{
|
|
this.frc = frc;
|
|
string = str.toCharArray();
|
|
offset = 0;
|
|
length = this.string.length;
|
|
lm = font.getLineMetrics(this.string, offset, length, frc);
|
|
|
|
// Get base direction and whitespace info
|
|
getStringProperties();
|
|
|
|
if (Bidi.requiresBidi(string, offset, offset + length))
|
|
{
|
|
bidi = new Bidi(str, leftToRight ? Bidi.DIRECTION_LEFT_TO_RIGHT
|
|
: Bidi.DIRECTION_RIGHT_TO_LEFT );
|
|
int rc = bidi.getRunCount();
|
|
byte[] table = new byte[ rc ];
|
|
for(int i = 0; i < table.length; i++)
|
|
table[i] = (byte)bidi.getRunLevel(i);
|
|
|
|
runs = new Run[rc];
|
|
for(int i = 0; i < rc; i++)
|
|
{
|
|
int start = bidi.getRunStart(i);
|
|
int end = bidi.getRunLimit(i);
|
|
if(start != end) // no empty runs.
|
|
{
|
|
GlyphVector gv = font.layoutGlyphVector(frc,
|
|
string, start, end,
|
|
((table[i] & 1) == 0) ? Font.LAYOUT_LEFT_TO_RIGHT
|
|
: Font.LAYOUT_RIGHT_TO_LEFT );
|
|
runs[i] = new Run(gv, font, start, end);
|
|
}
|
|
}
|
|
Bidi.reorderVisually( table, 0, runs, 0, runs.length );
|
|
// Clean up null runs.
|
|
ArrayList cleaned = new ArrayList(rc);
|
|
for (int i = 0; i < rc; i++)
|
|
{
|
|
if (runs[i] != null)
|
|
cleaned.add(runs[i]);
|
|
}
|
|
runs = new Run[cleaned.size()];
|
|
runs = (Run[]) cleaned.toArray(runs);
|
|
}
|
|
else
|
|
{
|
|
GlyphVector gv = font.layoutGlyphVector( frc, string, offset, length,
|
|
leftToRight ? Font.LAYOUT_LEFT_TO_RIGHT
|
|
: Font.LAYOUT_RIGHT_TO_LEFT );
|
|
Run run = new Run(gv, font, 0, length);
|
|
runs = new Run[]{ run };
|
|
}
|
|
setCharIndices();
|
|
setupMappings();
|
|
layoutRuns();
|
|
}
|
|
|
|
public TextLayout (String string,
|
|
Map<? extends AttributedCharacterIterator.Attribute, ?> attributes,
|
|
FontRenderContext frc)
|
|
{
|
|
this( string, new Font( attributes ), frc );
|
|
}
|
|
|
|
public TextLayout (AttributedCharacterIterator text, FontRenderContext frc)
|
|
{
|
|
// FIXME: Very rudimentary.
|
|
this(getText(text), getFont(text), frc);
|
|
}
|
|
|
|
/**
|
|
* Package-private constructor to make a textlayout from an existing one.
|
|
* This is used by TextMeasurer for returning sub-layouts, and it
|
|
* saves a lot of time in not having to relayout the text.
|
|
*/
|
|
TextLayout(TextLayout t, int startIndex, int endIndex)
|
|
{
|
|
frc = t.frc;
|
|
boundsCache = null;
|
|
lm = t.lm;
|
|
leftToRight = t.leftToRight;
|
|
|
|
if( endIndex > t.getCharacterCount() )
|
|
endIndex = t.getCharacterCount();
|
|
string = t.string;
|
|
offset = startIndex + offset;
|
|
length = endIndex - startIndex;
|
|
|
|
int startingRun = t.charIndices[startIndex][0];
|
|
int nRuns = 1 + t.charIndices[endIndex - 1][0] - startingRun;
|
|
|
|
runs = new Run[nRuns];
|
|
for( int i = 0; i < nRuns; i++ )
|
|
{
|
|
Run run = t.runs[i + startingRun];
|
|
GlyphVector gv = run.glyphVector;
|
|
Font font = run.font;
|
|
// Copy only the relevant parts of the first and last runs.
|
|
int beginGlyphIndex = (i > 0) ? 0 : t.charIndices[startIndex][1];
|
|
int numEntries = ( i < nRuns - 1) ? gv.getNumGlyphs() :
|
|
1 + t.charIndices[endIndex - 1][1] - beginGlyphIndex;
|
|
|
|
int[] codes = gv.getGlyphCodes(beginGlyphIndex, numEntries, null);
|
|
gv = font.createGlyphVector(frc, codes);
|
|
runs[i] = new Run(gv, font, run.runStart - startIndex,
|
|
run.runEnd - startIndex);
|
|
}
|
|
runs[nRuns - 1].runEnd = endIndex - 1;
|
|
|
|
setCharIndices();
|
|
setupMappings();
|
|
determineWhiteSpace();
|
|
layoutRuns();
|
|
}
|
|
|
|
private void setCharIndices()
|
|
{
|
|
charIndices = new int[ getCharacterCount() ][2];
|
|
int i = 0;
|
|
int currentChar = 0;
|
|
for(int run = 0; run < runs.length; run++)
|
|
{
|
|
currentChar = -1;
|
|
Run current = runs[run];
|
|
GlyphVector gv = current.glyphVector;
|
|
for( int gi = 0; gi < gv.getNumGlyphs(); gi++)
|
|
{
|
|
if( gv.getGlyphCharIndex( gi ) != currentChar )
|
|
{
|
|
charIndices[ i ][0] = run;
|
|
charIndices[ i ][1] = gi;
|
|
currentChar = gv.getGlyphCharIndex( gi );
|
|
i++;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Initializes the logicalToVisual and visualToLogial maps.
|
|
*/
|
|
private void setupMappings()
|
|
{
|
|
int numChars = getCharacterCount();
|
|
logicalToVisual = new int[numChars];
|
|
visualToLogical = new int[numChars];
|
|
int lIndex = 0;
|
|
int vIndex = 0;
|
|
// We scan the runs in visual order and set the mappings accordingly.
|
|
for (int i = 0; i < runs.length; i++)
|
|
{
|
|
Run run = runs[i];
|
|
if (run.isLeftToRight())
|
|
{
|
|
for (lIndex = run.runStart; lIndex < run.runEnd; lIndex++)
|
|
{
|
|
logicalToVisual[lIndex] = vIndex;
|
|
visualToLogical[vIndex] = lIndex;
|
|
vIndex++;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
for (lIndex = run.runEnd - 1; lIndex >= run.runStart; lIndex--)
|
|
{
|
|
logicalToVisual[lIndex] = vIndex;
|
|
visualToLogical[vIndex] = lIndex;
|
|
vIndex++;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private static String getText(AttributedCharacterIterator iter)
|
|
{
|
|
CPStringBuilder sb = new CPStringBuilder();
|
|
int idx = iter.getIndex();
|
|
for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next())
|
|
sb.append(c);
|
|
iter.setIndex( idx );
|
|
return sb.toString();
|
|
}
|
|
|
|
private static Font getFont(AttributedCharacterIterator iter)
|
|
{
|
|
Font f = (Font)iter.getAttribute(TextAttribute.FONT);
|
|
if( f == null )
|
|
{
|
|
int size;
|
|
Float i = (Float)iter.getAttribute(TextAttribute.SIZE);
|
|
if( i != null )
|
|
size = (int)i.floatValue();
|
|
else
|
|
size = 14;
|
|
f = new Font("Dialog", Font.PLAIN, size );
|
|
}
|
|
return f;
|
|
}
|
|
|
|
/**
|
|
* Scan the character run for the first strongly directional character,
|
|
* which in turn defines the base directionality of the whole layout.
|
|
*/
|
|
private void getStringProperties()
|
|
{
|
|
boolean gotDirection = false;
|
|
int i = offset;
|
|
int endOffs = offset + length;
|
|
leftToRight = true;
|
|
while( i < endOffs && !gotDirection )
|
|
switch( Character.getDirectionality(string[i++]) )
|
|
{
|
|
case Character.DIRECTIONALITY_LEFT_TO_RIGHT:
|
|
case Character.DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING:
|
|
case Character.DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE:
|
|
gotDirection = true;
|
|
break;
|
|
|
|
case Character.DIRECTIONALITY_RIGHT_TO_LEFT:
|
|
case Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC:
|
|
case Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING:
|
|
case Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE:
|
|
leftToRight = false;
|
|
gotDirection = true;
|
|
break;
|
|
}
|
|
determineWhiteSpace();
|
|
}
|
|
|
|
private void determineWhiteSpace()
|
|
{
|
|
// Determine if there's whitespace in the thing.
|
|
// Ignore trailing chars.
|
|
int i = offset + length - 1;
|
|
hasWhitespace = false;
|
|
while( i >= offset && Character.isWhitespace( string[i] ) )
|
|
i--;
|
|
// Check the remaining chars
|
|
while( i >= offset )
|
|
if( Character.isWhitespace( string[i--] ) )
|
|
hasWhitespace = true;
|
|
}
|
|
|
|
protected Object clone ()
|
|
{
|
|
return new TextLayout( this, 0, length);
|
|
}
|
|
|
|
public void draw (Graphics2D g2, float x, float y)
|
|
{
|
|
for(int i = 0; i < runs.length; i++)
|
|
{
|
|
Run run = runs[i];
|
|
GlyphVector gv = run.glyphVector;
|
|
g2.drawGlyphVector(gv, x, y);
|
|
Rectangle2D r = gv.getLogicalBounds();
|
|
x += r.getWidth();
|
|
}
|
|
}
|
|
|
|
public boolean equals (Object obj)
|
|
{
|
|
if( !( obj instanceof TextLayout) )
|
|
return false;
|
|
|
|
return equals( (TextLayout) obj );
|
|
}
|
|
|
|
public boolean equals (TextLayout tl)
|
|
{
|
|
if( runs.length != tl.runs.length )
|
|
return false;
|
|
// Compare all glyph vectors.
|
|
for( int i = 0; i < runs.length; i++ )
|
|
if( !runs[i].equals( tl.runs[i] ) )
|
|
return false;
|
|
return true;
|
|
}
|
|
|
|
public float getAdvance ()
|
|
{
|
|
if (totalAdvance == -1F)
|
|
{
|
|
totalAdvance = 0f;
|
|
for(int i = 0; i < runs.length; i++)
|
|
{
|
|
Run run = runs[i];
|
|
GlyphVector gv = run.glyphVector;
|
|
totalAdvance += gv.getLogicalBounds().getWidth();
|
|
}
|
|
}
|
|
return totalAdvance;
|
|
}
|
|
|
|
public float getAscent ()
|
|
{
|
|
return lm.getAscent();
|
|
}
|
|
|
|
public byte getBaseline ()
|
|
{
|
|
return (byte)lm.getBaselineIndex();
|
|
}
|
|
|
|
public float[] getBaselineOffsets ()
|
|
{
|
|
return lm.getBaselineOffsets();
|
|
}
|
|
|
|
public Shape getBlackBoxBounds (int firstEndpoint, int secondEndpoint)
|
|
{
|
|
if( secondEndpoint - firstEndpoint <= 0 )
|
|
return new Rectangle2D.Float(); // Hmm?
|
|
|
|
if( firstEndpoint < 0 || secondEndpoint > getCharacterCount())
|
|
return new Rectangle2D.Float();
|
|
|
|
GeneralPath gp = new GeneralPath();
|
|
|
|
int ri = charIndices[ firstEndpoint ][0];
|
|
int gi = charIndices[ firstEndpoint ][1];
|
|
|
|
double advance = 0;
|
|
|
|
for( int i = 0; i < ri; i++ )
|
|
{
|
|
Run run = runs[i];
|
|
GlyphVector gv = run.glyphVector;
|
|
advance += gv.getLogicalBounds().getWidth();
|
|
}
|
|
|
|
for( int i = ri; i <= charIndices[ secondEndpoint - 1 ][0]; i++ )
|
|
{
|
|
Run run = runs[i];
|
|
GlyphVector gv = run.glyphVector;
|
|
int dg;
|
|
if( i == charIndices[ secondEndpoint - 1 ][0] )
|
|
dg = charIndices[ secondEndpoint - 1][1];
|
|
else
|
|
dg = gv.getNumGlyphs() - 1;
|
|
|
|
for( int j = 0; j <= dg; j++ )
|
|
{
|
|
Rectangle2D r2 = (gv.getGlyphVisualBounds( j )).
|
|
getBounds2D();
|
|
Point2D p = gv.getGlyphPosition( j );
|
|
r2.setRect( advance + r2.getX(), r2.getY(),
|
|
r2.getWidth(), r2.getHeight() );
|
|
gp.append(r2, false);
|
|
}
|
|
|
|
advance += gv.getLogicalBounds().getWidth();
|
|
}
|
|
return gp;
|
|
}
|
|
|
|
public Rectangle2D getBounds()
|
|
{
|
|
if( boundsCache == null )
|
|
boundsCache = getOutline(new AffineTransform()).getBounds();
|
|
return boundsCache;
|
|
}
|
|
|
|
public float[] getCaretInfo (TextHitInfo hit)
|
|
{
|
|
return getCaretInfo(hit, getNaturalBounds());
|
|
}
|
|
|
|
public float[] getCaretInfo (TextHitInfo hit, Rectangle2D bounds)
|
|
{
|
|
float[] info = new float[2];
|
|
int index = hit.getCharIndex();
|
|
boolean leading = hit.isLeadingEdge();
|
|
// For the boundary cases we return the boundary runs.
|
|
Run run;
|
|
|
|
if (index >= length)
|
|
{
|
|
info[0] = getAdvance();
|
|
info[1] = 0;
|
|
}
|
|
else
|
|
{
|
|
if (index < 0)
|
|
{
|
|
run = runs[0];
|
|
index = 0;
|
|
leading = true;
|
|
}
|
|
else
|
|
run = findRunAtIndex(index);
|
|
|
|
int glyphIndex = index - run.runStart;
|
|
Shape glyphBounds = run.glyphVector.getGlyphLogicalBounds(glyphIndex);
|
|
Rectangle2D glyphRect = glyphBounds.getBounds2D();
|
|
if (isVertical())
|
|
{
|
|
if (leading)
|
|
info[0] = (float) glyphRect.getMinY();
|
|
else
|
|
info[0] = (float) glyphRect.getMaxY();
|
|
}
|
|
else
|
|
{
|
|
if (leading)
|
|
info[0] = (float) glyphRect.getMinX();
|
|
else
|
|
info[0] = (float) glyphRect.getMaxX();
|
|
}
|
|
info[0] += run.location;
|
|
info[1] = run.font.getItalicAngle();
|
|
}
|
|
return info;
|
|
}
|
|
|
|
public Shape getCaretShape(TextHitInfo hit)
|
|
{
|
|
return getCaretShape(hit, getBounds());
|
|
}
|
|
|
|
public Shape getCaretShape(TextHitInfo hit, Rectangle2D bounds)
|
|
{
|
|
// TODO: Handle vertical shapes somehow.
|
|
float[] info = getCaretInfo(hit);
|
|
float x1 = info[0];
|
|
float y1 = (float) bounds.getMinY();
|
|
float x2 = info[0];
|
|
float y2 = (float) bounds.getMaxY();
|
|
if (info[1] != 0)
|
|
{
|
|
// Shift x1 and x2 according to the slope.
|
|
x1 -= y1 * info[1];
|
|
x2 -= y2 * info[1];
|
|
}
|
|
GeneralPath path = new GeneralPath(GeneralPath.WIND_EVEN_ODD, 2);
|
|
path.moveTo(x1, y1);
|
|
path.lineTo(x2, y2);
|
|
return path;
|
|
}
|
|
|
|
public Shape[] getCaretShapes(int offset)
|
|
{
|
|
return getCaretShapes(offset, getNaturalBounds());
|
|
}
|
|
|
|
public Shape[] getCaretShapes(int offset, Rectangle2D bounds)
|
|
{
|
|
return getCaretShapes(offset, bounds, DEFAULT_CARET_POLICY);
|
|
}
|
|
|
|
public Shape[] getCaretShapes(int offset, Rectangle2D bounds,
|
|
CaretPolicy policy)
|
|
{
|
|
// The RI returns a 2-size array even when there's only one
|
|
// shape in it.
|
|
Shape[] carets = new Shape[2];
|
|
TextHitInfo hit1 = TextHitInfo.afterOffset(offset);
|
|
int caretHit1 = hitToCaret(hit1);
|
|
TextHitInfo hit2 = hit1.getOtherHit();
|
|
int caretHit2 = hitToCaret(hit2);
|
|
if (caretHit1 == caretHit2)
|
|
{
|
|
carets[0] = getCaretShape(hit1);
|
|
carets[1] = null; // The RI returns null in this seldom case.
|
|
}
|
|
else
|
|
{
|
|
Shape caret1 = getCaretShape(hit1);
|
|
Shape caret2 = getCaretShape(hit2);
|
|
TextHitInfo strong = policy.getStrongCaret(hit1, hit2, this);
|
|
if (strong == hit1)
|
|
{
|
|
carets[0] = caret1;
|
|
carets[1] = caret2;
|
|
}
|
|
else
|
|
{
|
|
carets[0] = caret2;
|
|
carets[1] = caret1;
|
|
}
|
|
}
|
|
return carets;
|
|
}
|
|
|
|
public int getCharacterCount ()
|
|
{
|
|
return length;
|
|
}
|
|
|
|
public byte getCharacterLevel (int index)
|
|
{
|
|
byte level;
|
|
if( bidi == null )
|
|
level = 0;
|
|
else
|
|
level = (byte) bidi.getLevelAt(index);
|
|
return level;
|
|
}
|
|
|
|
public float getDescent ()
|
|
{
|
|
return lm.getDescent();
|
|
}
|
|
|
|
public TextLayout getJustifiedLayout (float justificationWidth)
|
|
{
|
|
TextLayout newLayout = (TextLayout)clone();
|
|
|
|
if( hasWhitespace )
|
|
newLayout.handleJustify( justificationWidth );
|
|
|
|
return newLayout;
|
|
}
|
|
|
|
public float getLeading ()
|
|
{
|
|
return lm.getLeading();
|
|
}
|
|
|
|
public Shape getLogicalHighlightShape (int firstEndpoint, int secondEndpoint)
|
|
{
|
|
return getLogicalHighlightShape( firstEndpoint, secondEndpoint,
|
|
getBounds() );
|
|
}
|
|
|
|
public Shape getLogicalHighlightShape (int firstEndpoint, int secondEndpoint,
|
|
Rectangle2D bounds)
|
|
{
|
|
if( secondEndpoint - firstEndpoint <= 0 )
|
|
return new Rectangle2D.Float(); // Hmm?
|
|
|
|
if( firstEndpoint < 0 || secondEndpoint > getCharacterCount())
|
|
return new Rectangle2D.Float();
|
|
|
|
Rectangle2D r = null;
|
|
int ri = charIndices[ firstEndpoint ][0];
|
|
int gi = charIndices[ firstEndpoint ][1];
|
|
|
|
double advance = 0;
|
|
|
|
for( int i = 0; i < ri; i++ )
|
|
advance += runs[i].glyphVector.getLogicalBounds().getWidth();
|
|
|
|
for( int i = ri; i <= charIndices[ secondEndpoint - 1 ][0]; i++ )
|
|
{
|
|
Run run = runs[i];
|
|
GlyphVector gv = run.glyphVector;
|
|
int dg; // last index in this run to use.
|
|
if( i == charIndices[ secondEndpoint - 1 ][0] )
|
|
dg = charIndices[ secondEndpoint - 1][1];
|
|
else
|
|
dg = gv.getNumGlyphs() - 1;
|
|
|
|
for(; gi <= dg; gi++ )
|
|
{
|
|
Rectangle2D r2 = (gv.getGlyphLogicalBounds( gi )).
|
|
getBounds2D();
|
|
if( r == null )
|
|
r = r2;
|
|
else
|
|
r = r.createUnion(r2);
|
|
}
|
|
gi = 0; // reset glyph index into run for next run.
|
|
|
|
advance += gv.getLogicalBounds().getWidth();
|
|
}
|
|
|
|
return r;
|
|
}
|
|
|
|
public int[] getLogicalRangesForVisualSelection (TextHitInfo firstEndpoint,
|
|
TextHitInfo secondEndpoint)
|
|
{
|
|
// Check parameters.
|
|
checkHitInfo(firstEndpoint);
|
|
checkHitInfo(secondEndpoint);
|
|
|
|
// Convert to visual and order correctly.
|
|
int start = hitToCaret(firstEndpoint);
|
|
int end = hitToCaret(secondEndpoint);
|
|
if (start > end)
|
|
{
|
|
// Swap start and end so that end >= start.
|
|
int temp = start;
|
|
start = end;
|
|
end = temp;
|
|
}
|
|
|
|
// Now walk through the visual indices and mark the included pieces.
|
|
boolean[] include = new boolean[length];
|
|
for (int i = start; i < end; i++)
|
|
{
|
|
include[visualToLogical[i]] = true;
|
|
}
|
|
|
|
// Count included runs.
|
|
int numRuns = 0;
|
|
boolean in = false;
|
|
for (int i = 0; i < length; i++)
|
|
{
|
|
if (include[i] != in) // At each run in/out point we toggle the in var.
|
|
{
|
|
in = ! in;
|
|
if (in) // At each run start we count up.
|
|
numRuns++;
|
|
}
|
|
}
|
|
|
|
// Put together the ranges array.
|
|
int[] ranges = new int[numRuns * 2];
|
|
int index = 0;
|
|
in = false;
|
|
for (int i = 0; i < length; i++)
|
|
{
|
|
if (include[i] != in)
|
|
{
|
|
ranges[index] = i;
|
|
index++;
|
|
in = ! in;
|
|
}
|
|
}
|
|
// If the last run ends at the very end, include that last bit too.
|
|
if (in)
|
|
ranges[index] = length;
|
|
|
|
return ranges;
|
|
}
|
|
|
|
public TextHitInfo getNextLeftHit(int offset)
|
|
{
|
|
return getNextLeftHit(offset, DEFAULT_CARET_POLICY);
|
|
}
|
|
|
|
public TextHitInfo getNextLeftHit(int offset, CaretPolicy policy)
|
|
{
|
|
if (policy == null)
|
|
throw new IllegalArgumentException("Null policy not allowed");
|
|
if (offset < 0 || offset > length)
|
|
throw new IllegalArgumentException("Offset out of bounds");
|
|
|
|
TextHitInfo hit1 = TextHitInfo.afterOffset(offset);
|
|
TextHitInfo hit2 = hit1.getOtherHit();
|
|
|
|
TextHitInfo strong = policy.getStrongCaret(hit1, hit2, this);
|
|
TextHitInfo next = getNextLeftHit(strong);
|
|
TextHitInfo ret = null;
|
|
if (next != null)
|
|
{
|
|
TextHitInfo next2 = getVisualOtherHit(next);
|
|
ret = policy.getStrongCaret(next2, next, this);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
public TextHitInfo getNextLeftHit (TextHitInfo hit)
|
|
{
|
|
checkHitInfo(hit);
|
|
int index = hitToCaret(hit);
|
|
TextHitInfo next = null;
|
|
if (index != 0)
|
|
{
|
|
index--;
|
|
next = caretToHit(index);
|
|
}
|
|
return next;
|
|
}
|
|
|
|
public TextHitInfo getNextRightHit(int offset)
|
|
{
|
|
return getNextRightHit(offset, DEFAULT_CARET_POLICY);
|
|
}
|
|
|
|
public TextHitInfo getNextRightHit(int offset, CaretPolicy policy)
|
|
{
|
|
if (policy == null)
|
|
throw new IllegalArgumentException("Null policy not allowed");
|
|
if (offset < 0 || offset > length)
|
|
throw new IllegalArgumentException("Offset out of bounds");
|
|
|
|
TextHitInfo hit1 = TextHitInfo.afterOffset(offset);
|
|
TextHitInfo hit2 = hit1.getOtherHit();
|
|
|
|
TextHitInfo next = getNextRightHit(policy.getStrongCaret(hit1, hit2, this));
|
|
TextHitInfo ret = null;
|
|
if (next != null)
|
|
{
|
|
TextHitInfo next2 = getVisualOtherHit(next);
|
|
ret = policy.getStrongCaret(next2, next, this);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
public TextHitInfo getNextRightHit(TextHitInfo hit)
|
|
{
|
|
checkHitInfo(hit);
|
|
int index = hitToCaret(hit);
|
|
TextHitInfo next = null;
|
|
if (index < length)
|
|
{
|
|
index++;
|
|
next = caretToHit(index);
|
|
}
|
|
return next;
|
|
}
|
|
|
|
public Shape getOutline (AffineTransform tx)
|
|
{
|
|
float x = 0f;
|
|
GeneralPath gp = new GeneralPath();
|
|
for(int i = 0; i < runs.length; i++)
|
|
{
|
|
GlyphVector gv = runs[i].glyphVector;
|
|
gp.append( gv.getOutline( x, 0f ), false );
|
|
Rectangle2D r = gv.getLogicalBounds();
|
|
x += r.getWidth();
|
|
}
|
|
if( tx != null )
|
|
gp.transform( tx );
|
|
return gp;
|
|
}
|
|
|
|
public float getVisibleAdvance ()
|
|
{
|
|
float totalAdvance = 0f;
|
|
|
|
if( runs.length <= 0 )
|
|
return 0f;
|
|
|
|
// No trailing whitespace
|
|
if( !Character.isWhitespace( string[offset + length - 1]) )
|
|
return getAdvance();
|
|
|
|
// Get length of all runs up to the last
|
|
for(int i = 0; i < runs.length - 1; i++)
|
|
totalAdvance += runs[i].glyphVector.getLogicalBounds().getWidth();
|
|
|
|
int lastRun = runs[runs.length - 1].runStart;
|
|
int j = length - 1;
|
|
while( j >= lastRun && Character.isWhitespace( string[j] ) ) j--;
|
|
|
|
if( j < lastRun )
|
|
return totalAdvance; // entire last run is whitespace
|
|
|
|
int lastNonWSChar = j - lastRun;
|
|
j = 0;
|
|
while( runs[ runs.length - 1 ].glyphVector.getGlyphCharIndex( j )
|
|
<= lastNonWSChar )
|
|
{
|
|
totalAdvance += runs[ runs.length - 1 ].glyphVector
|
|
.getGlyphLogicalBounds( j )
|
|
.getBounds2D().getWidth();
|
|
j ++;
|
|
}
|
|
|
|
return totalAdvance;
|
|
}
|
|
|
|
public Shape getVisualHighlightShape (TextHitInfo firstEndpoint,
|
|
TextHitInfo secondEndpoint)
|
|
{
|
|
return getVisualHighlightShape( firstEndpoint, secondEndpoint,
|
|
getBounds() );
|
|
}
|
|
|
|
public Shape getVisualHighlightShape (TextHitInfo firstEndpoint,
|
|
TextHitInfo secondEndpoint,
|
|
Rectangle2D bounds)
|
|
{
|
|
GeneralPath path = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
|
|
Shape caret1 = getCaretShape(firstEndpoint, bounds);
|
|
path.append(caret1, false);
|
|
Shape caret2 = getCaretShape(secondEndpoint, bounds);
|
|
path.append(caret2, false);
|
|
// Append left (top) bounds to selection if necessary.
|
|
int c1 = hitToCaret(firstEndpoint);
|
|
int c2 = hitToCaret(secondEndpoint);
|
|
if (c1 == 0 || c2 == 0)
|
|
{
|
|
path.append(left(bounds), false);
|
|
}
|
|
// Append right (bottom) bounds if necessary.
|
|
if (c1 == length || c2 == length)
|
|
{
|
|
path.append(right(bounds), false);
|
|
}
|
|
return path.getBounds2D();
|
|
}
|
|
|
|
/**
|
|
* Returns the shape that makes up the left (top) edge of this text layout.
|
|
*
|
|
* @param b the bounds
|
|
*
|
|
* @return the shape that makes up the left (top) edge of this text layout
|
|
*/
|
|
private Shape left(Rectangle2D b)
|
|
{
|
|
GeneralPath left = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
|
|
left.append(getCaretShape(TextHitInfo.beforeOffset(0)), false);
|
|
if (isVertical())
|
|
{
|
|
float y = (float) b.getMinY();
|
|
left.append(new Line2D.Float((float) b.getMinX(), y,
|
|
(float) b.getMaxX(), y), false);
|
|
}
|
|
else
|
|
{
|
|
float x = (float) b.getMinX();
|
|
left.append(new Line2D.Float(x, (float) b.getMinY(),
|
|
x, (float) b.getMaxY()), false);
|
|
}
|
|
return left.getBounds2D();
|
|
}
|
|
|
|
/**
|
|
* Returns the shape that makes up the right (bottom) edge of this text
|
|
* layout.
|
|
*
|
|
* @param b the bounds
|
|
*
|
|
* @return the shape that makes up the right (bottom) edge of this text
|
|
* layout
|
|
*/
|
|
private Shape right(Rectangle2D b)
|
|
{
|
|
GeneralPath right = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
|
|
right.append(getCaretShape(TextHitInfo.afterOffset(length)), false);
|
|
if (isVertical())
|
|
{
|
|
float y = (float) b.getMaxY();
|
|
right.append(new Line2D.Float((float) b.getMinX(), y,
|
|
(float) b.getMaxX(), y), false);
|
|
}
|
|
else
|
|
{
|
|
float x = (float) b.getMaxX();
|
|
right.append(new Line2D.Float(x, (float) b.getMinY(),
|
|
x, (float) b.getMaxY()), false);
|
|
}
|
|
return right.getBounds2D();
|
|
}
|
|
|
|
public TextHitInfo getVisualOtherHit (TextHitInfo hit)
|
|
{
|
|
checkHitInfo(hit);
|
|
int hitIndex = hit.getCharIndex();
|
|
|
|
int index;
|
|
boolean leading;
|
|
if (hitIndex == -1 || hitIndex == length)
|
|
{
|
|
// Boundary case.
|
|
int visual;
|
|
if (isLeftToRight() == (hitIndex == -1))
|
|
visual = 0;
|
|
else
|
|
visual = length - 1;
|
|
index = visualToLogical[visual];
|
|
if (isLeftToRight() == (hitIndex == -1))
|
|
leading = isCharacterLTR(index); // LTR.
|
|
else
|
|
leading = ! isCharacterLTR(index); // RTL.
|
|
}
|
|
else
|
|
{
|
|
// Normal case.
|
|
int visual = logicalToVisual[hitIndex];
|
|
boolean b;
|
|
if (isCharacterLTR(hitIndex) == hit.isLeadingEdge())
|
|
{
|
|
visual--;
|
|
b = false;
|
|
}
|
|
else
|
|
{
|
|
visual++;
|
|
b = true;
|
|
}
|
|
if (visual >= 0 && visual < length)
|
|
{
|
|
index = visualToLogical[visual];
|
|
leading = b == isLeftToRight();
|
|
}
|
|
else
|
|
{
|
|
index = b == isLeftToRight() ? length : -1;
|
|
leading = index == length;
|
|
}
|
|
}
|
|
return leading ? TextHitInfo.leading(index) : TextHitInfo.trailing(index);
|
|
}
|
|
|
|
/**
|
|
* This is a protected method of a <code>final</code> class, meaning
|
|
* it exists only to taunt you.
|
|
*/
|
|
protected void handleJustify (float justificationWidth)
|
|
{
|
|
// We assume that the text has non-trailing whitespace.
|
|
// First get the change in width to insert into the whitespaces.
|
|
double deltaW = justificationWidth - getVisibleAdvance();
|
|
int nglyphs = 0; // # of whitespace chars
|
|
|
|
// determine last non-whitespace char.
|
|
int lastNWS = offset + length - 1;
|
|
while( Character.isWhitespace( string[lastNWS] ) ) lastNWS--;
|
|
|
|
// locations of the glyphs.
|
|
int[] wsglyphs = new int[length * 10];
|
|
for(int run = 0; run < runs.length; run++ )
|
|
{
|
|
Run current = runs[run];
|
|
for(int i = 0; i < current.glyphVector.getNumGlyphs(); i++ )
|
|
{
|
|
int cindex = current.runStart
|
|
+ current.glyphVector.getGlyphCharIndex( i );
|
|
if( Character.isWhitespace( string[cindex] ) )
|
|
// && cindex < lastNWS )
|
|
{
|
|
wsglyphs[ nglyphs * 2 ] = run;
|
|
wsglyphs[ nglyphs * 2 + 1] = i;
|
|
nglyphs++;
|
|
}
|
|
}
|
|
}
|
|
deltaW = deltaW / nglyphs; // Change in width per whitespace glyph
|
|
double w = 0;
|
|
int cws = 0;
|
|
// Shift all characters
|
|
for(int run = 0; run < runs.length; run++ )
|
|
{
|
|
Run current = runs[run];
|
|
for(int i = 0; i < current.glyphVector.getNumGlyphs(); i++ )
|
|
{
|
|
if( wsglyphs[ cws * 2 ] == run && wsglyphs[ cws * 2 + 1 ] == i )
|
|
{
|
|
cws++; // update 'current whitespace'
|
|
w += deltaW; // increment the shift
|
|
}
|
|
Point2D p = current.glyphVector.getGlyphPosition( i );
|
|
p.setLocation( p.getX() + w, p.getY() );
|
|
current.glyphVector.setGlyphPosition( i, p );
|
|
}
|
|
}
|
|
}
|
|
|
|
public TextHitInfo hitTestChar (float x, float y)
|
|
{
|
|
return hitTestChar(x, y, getNaturalBounds());
|
|
}
|
|
|
|
/**
|
|
* Finds the character hit at the specified point. This 'clips' this
|
|
* text layout against the specified <code>bounds</code> rectangle. That
|
|
* means that in the case where a point is outside these bounds, this method
|
|
* returns the leading edge of the first character or the trailing edge of
|
|
* the last character.
|
|
*
|
|
* @param x the X location to test
|
|
* @param y the Y location to test
|
|
* @param bounds the bounds to test against
|
|
*
|
|
* @return the character hit at the specified point
|
|
*/
|
|
public TextHitInfo hitTestChar (float x, float y, Rectangle2D bounds)
|
|
{
|
|
// Check bounds.
|
|
if (isVertical())
|
|
{
|
|
if (y < bounds.getMinY())
|
|
return TextHitInfo.leading(0);
|
|
else if (y > bounds.getMaxY())
|
|
return TextHitInfo.trailing(getCharacterCount() - 1);
|
|
}
|
|
else
|
|
{
|
|
if (x < bounds.getMinX())
|
|
return TextHitInfo.leading(0);
|
|
else if (x > bounds.getMaxX())
|
|
return TextHitInfo.trailing(getCharacterCount() - 1);
|
|
}
|
|
|
|
TextHitInfo hitInfo = null;
|
|
if (isVertical())
|
|
{
|
|
// Search for the run at the location.
|
|
// TODO: Perform binary search for maximum efficiency. However, we
|
|
// need the run location laid out statically to do that.
|
|
int numRuns = runs.length;
|
|
Run hitRun = null;
|
|
for (int i = 0; i < numRuns && hitRun == null; i++)
|
|
{
|
|
Run run = runs[i];
|
|
Rectangle2D lBounds = run.glyphVector.getLogicalBounds();
|
|
if (lBounds.getMinY() + run.location <= y
|
|
&& lBounds.getMaxY() + run.location >= y)
|
|
hitRun = run;
|
|
}
|
|
// Now we have (hopefully) found a run that hits. Now find the
|
|
// right character.
|
|
if (hitRun != null)
|
|
{
|
|
GlyphVector gv = hitRun.glyphVector;
|
|
for (int i = hitRun.runStart;
|
|
i < hitRun.runEnd && hitInfo == null; i++)
|
|
{
|
|
int gi = i - hitRun.runStart;
|
|
Rectangle2D lBounds = gv.getGlyphLogicalBounds(gi)
|
|
.getBounds2D();
|
|
if (lBounds.getMinY() + hitRun.location <= y
|
|
&& lBounds.getMaxY() + hitRun.location >= y)
|
|
{
|
|
// Found hit. Now check if we are leading or trailing.
|
|
boolean leading = true;
|
|
if (lBounds.getCenterY() + hitRun.location <= y)
|
|
leading = false;
|
|
hitInfo = leading ? TextHitInfo.leading(i)
|
|
: TextHitInfo.trailing(i);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// Search for the run at the location.
|
|
// TODO: Perform binary search for maximum efficiency. However, we
|
|
// need the run location laid out statically to do that.
|
|
int numRuns = runs.length;
|
|
Run hitRun = null;
|
|
for (int i = 0; i < numRuns && hitRun == null; i++)
|
|
{
|
|
Run run = runs[i];
|
|
Rectangle2D lBounds = run.glyphVector.getLogicalBounds();
|
|
if (lBounds.getMinX() + run.location <= x
|
|
&& lBounds.getMaxX() + run.location >= x)
|
|
hitRun = run;
|
|
}
|
|
// Now we have (hopefully) found a run that hits. Now find the
|
|
// right character.
|
|
if (hitRun != null)
|
|
{
|
|
GlyphVector gv = hitRun.glyphVector;
|
|
for (int i = hitRun.runStart;
|
|
i < hitRun.runEnd && hitInfo == null; i++)
|
|
{
|
|
int gi = i - hitRun.runStart;
|
|
Rectangle2D lBounds = gv.getGlyphLogicalBounds(gi)
|
|
.getBounds2D();
|
|
if (lBounds.getMinX() + hitRun.location <= x
|
|
&& lBounds.getMaxX() + hitRun.location >= x)
|
|
{
|
|
// Found hit. Now check if we are leading or trailing.
|
|
boolean leading = true;
|
|
if (lBounds.getCenterX() + hitRun.location <= x)
|
|
leading = false;
|
|
hitInfo = leading ? TextHitInfo.leading(i)
|
|
: TextHitInfo.trailing(i);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return hitInfo;
|
|
}
|
|
|
|
public boolean isLeftToRight ()
|
|
{
|
|
return leftToRight;
|
|
}
|
|
|
|
public boolean isVertical ()
|
|
{
|
|
return false; // FIXME: How do you create a vertical layout?
|
|
}
|
|
|
|
public int hashCode ()
|
|
{
|
|
// This is implemented in sync to equals().
|
|
if (hash == 0 && runs.length > 0)
|
|
{
|
|
hash = runs.length;
|
|
for (int i = 0; i < runs.length; i++)
|
|
hash ^= runs[i].glyphVector.hashCode();
|
|
}
|
|
return hash;
|
|
}
|
|
|
|
public String toString ()
|
|
{
|
|
return "TextLayout [string:"+ new String(string, offset, length)
|
|
+" Rendercontext:"+
|
|
frc+"]";
|
|
}
|
|
|
|
/**
|
|
* Returns the natural bounds of that text layout. This is made up
|
|
* of the ascent plus descent and the text advance.
|
|
*
|
|
* @return the natural bounds of that text layout
|
|
*/
|
|
private Rectangle2D getNaturalBounds()
|
|
{
|
|
if (naturalBounds == null)
|
|
naturalBounds = new Rectangle2D.Float(0.0F, -getAscent(), getAdvance(),
|
|
getAscent() + getDescent());
|
|
return naturalBounds;
|
|
}
|
|
|
|
private void checkHitInfo(TextHitInfo hit)
|
|
{
|
|
if (hit == null)
|
|
throw new IllegalArgumentException("Null hit info not allowed");
|
|
int index = hit.getInsertionIndex();
|
|
if (index < 0 || index > length)
|
|
throw new IllegalArgumentException("Hit index out of range");
|
|
}
|
|
|
|
private int hitToCaret(TextHitInfo hit)
|
|
{
|
|
int index = hit.getCharIndex();
|
|
int ret;
|
|
if (index < 0)
|
|
ret = isLeftToRight() ? 0 : length;
|
|
else if (index >= length)
|
|
ret = isLeftToRight() ? length : 0;
|
|
else
|
|
{
|
|
ret = logicalToVisual[index];
|
|
if (hit.isLeadingEdge() != isCharacterLTR(index))
|
|
ret++;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
private TextHitInfo caretToHit(int index)
|
|
{
|
|
TextHitInfo hit;
|
|
if (index == 0 || index == length)
|
|
{
|
|
if ((index == length) == isLeftToRight())
|
|
hit = TextHitInfo.leading(length);
|
|
else
|
|
hit = TextHitInfo.trailing(-1);
|
|
}
|
|
else
|
|
{
|
|
int logical = visualToLogical[index];
|
|
boolean leading = isCharacterLTR(logical); // LTR.
|
|
hit = leading ? TextHitInfo.leading(logical)
|
|
: TextHitInfo.trailing(logical);
|
|
}
|
|
return hit;
|
|
}
|
|
|
|
private boolean isCharacterLTR(int index)
|
|
{
|
|
byte level = getCharacterLevel(index);
|
|
return (level & 1) == 0;
|
|
}
|
|
|
|
/**
|
|
* Finds the run that holds the specified (logical) character index. This
|
|
* returns <code>null</code> when the index is not inside the range.
|
|
*
|
|
* @param index the index of the character to find
|
|
*
|
|
* @return the run that holds the specified character
|
|
*/
|
|
private Run findRunAtIndex(int index)
|
|
{
|
|
Run found = null;
|
|
// TODO: Can we do better than linear searching here?
|
|
for (int i = 0; i < runs.length && found == null; i++)
|
|
{
|
|
Run run = runs[i];
|
|
if (run.runStart <= index && run.runEnd > index)
|
|
found = run;
|
|
}
|
|
return found;
|
|
}
|
|
|
|
/**
|
|
* Computes the layout locations for each run.
|
|
*/
|
|
private void layoutRuns()
|
|
{
|
|
float loc = 0.0F;
|
|
float lastWidth = 0.0F;
|
|
for (int i = 0; i < runs.length; i++)
|
|
{
|
|
runs[i].location = loc;
|
|
Rectangle2D bounds = runs[i].glyphVector.getLogicalBounds();
|
|
loc += isVertical() ? bounds.getHeight() : bounds.getWidth();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Inner class describing a caret policy
|
|
*/
|
|
public static class CaretPolicy
|
|
{
|
|
public CaretPolicy()
|
|
{
|
|
}
|
|
|
|
public TextHitInfo getStrongCaret(TextHitInfo hit1,
|
|
TextHitInfo hit2,
|
|
TextLayout layout)
|
|
{
|
|
byte l1 = layout.getCharacterLevel(hit1.getCharIndex());
|
|
byte l2 = layout.getCharacterLevel(hit2.getCharIndex());
|
|
TextHitInfo strong;
|
|
if (l1 == l2)
|
|
{
|
|
if (hit2.isLeadingEdge() && ! hit1.isLeadingEdge())
|
|
strong = hit2;
|
|
else
|
|
strong = hit1;
|
|
}
|
|
else
|
|
{
|
|
if (l1 < l2)
|
|
strong = hit1;
|
|
else
|
|
strong = hit2;
|
|
}
|
|
return strong;
|
|
}
|
|
}
|
|
}
|
|
|
|
|