[FOray-commit] SF.net SVN: foray:[11866] trunk/foray/foray-font/src/main/java/org/foray/ font/FontS

Revision: 11866
          http://sourceforge.net/p/foray/code/11866
Author:   victormote
Date:     2021-01-27 15:14:42 +0000 (Wed, 27 Jan 2021)
Log Message:
-----------
Based on aXSL change, return a list of Font4a instead of Font.

Modified Paths:
--------------
    trunk/foray/foray-font/src/main/java/org/foray/font/FontServer4a.java

Modified: trunk/foray/foray-font/src/main/java/org/foray/font/FontServer4a.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/FontServer4a.java	2021-01-26 13:20:09 UTC (rev 11865)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FontServer4a.java	2021-01-27 15:14:42 UTC (rev 11866)
@@ -854,8 +854,7 @@
     }
 
     @Override
-    public List<org.axsl.font.Font> getAllFonts(final boolean freeStandingFonts,
-            final boolean systemFonts) {
+    public List<Font4a> getAllFonts(final boolean freeStandingFonts, final boolean systemFonts) {
         final List<Font4a> fontList = new ArrayList<Font4a>();
         for (RegisteredFontFamily family : this.fontFamilies.values()) {
             final List<RegisteredFontDesc> rfdList
@@ -878,12 +877,9 @@
         if (fontList.size() < 1) {
             return null;
         }
-        final List<org.axsl.font.Font> returnList
-                = new ArrayList<org.axsl.font.Font>();
+        final List<Font4a> returnList = new ArrayList<Font4a>();
         for (int i = 0; i < fontList.size(); i++) {
-            final org.axsl.font.FontUse fontUse =
-                (org.axsl.font.FontUse) fontList.get(i);
-            final org.axsl.font.Font font = fontUse.getFont();
+            final Font4a font = fontList.get(i);
             boolean duplicateFound = false;
             for (int j = 0; j < returnList.size() && ! duplicateFound; j++) {
                 if (font == returnList.get(j)) {

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