[FOray-commit] SF.net SVN: foray:[13024] trunk/foray

[<vic...@us...>]

Revision: 13024
          http://sourceforge.net/p/foray/code/13024
Author:   victormote
Date:     2023-01-06 22:17:08 +0000 (Fri, 06 Jan 2023)
Log Message:
-----------
Conform to aXSL change: Move width-related convenience method from FontUse to Font.

Modified Paths:
--------------
    trunk/foray/foray-content/src/main/java/org/foray/content/TextTokensContent4a.java
    trunk/foray/foray-font/src/main/java/org/foray/font/FontUse4a.java

Modified: trunk/foray/foray-content/src/main/java/org/foray/content/TextTokensContent4a.java
===================================================================
--- trunk/foray/foray-content/src/main/java/org/foray/content/TextTokensContent4a.java	2023-01-06 22:01:05 UTC (rev 13023)
+++ trunk/foray/foray-content/src/main/java/org/foray/content/TextTokensContent4a.java	2023-01-06 22:17:08 UTC (rev 13024)
@@ -120,7 +120,7 @@
         final Orthography orthography = this.content.getOrthography();
         if (leaf instanceof CharSequence) {
             final CharSequence chars = (CharSequence) leaf;
-            return getFontUse().width(chars, fontSize, FontContext.DEFAULT, orthography);
+            return getFontUse().getFont().width(chars, fontSize, FontContext.DEFAULT, orthography);
         }
         return 0;
     }

Modified: trunk/foray/foray-font/src/main/java/org/foray/font/FontUse4a.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/FontUse4a.java	2023-01-06 22:01:05 UTC (rev 13023)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FontUse4a.java	2023-01-06 22:17:08 UTC (rev 13024)
@@ -200,12 +200,6 @@
     }
 
     @Override
-    public int width(final CharSequence chars, final int fontSize, final FontContext fontContext,
-            final Orthography orthography) {
-        return getFont().width(chars, 0, chars.length(), fontSize, 0, 0, fontContext, orthography);
-    }
-
-    @Override
     public Font.Weight nextBolderWeight() {
         final RegisteredFont desc =
                 this.registeredFontDesc.nextBolderFont();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.