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

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

Revision: 12772
          http://sourceforge.net/p/foray/code/12772
Author:   victormote
Date:     2022-12-03 20:53:53 +0000 (Sat, 03 Dec 2022)
Log Message:
-----------
Remove unneeded parameter.

Modified Paths:
--------------
    trunk/foray/foray-app/src/main/java/org/foray/app/ForaySpecific.java
    trunk/foray/foray-app/src/test/java/org/foray/app/area/AbstractAreaTreeTest.java
    trunk/foray/foray-font/src/main/java/org/foray/font/FontServer4a.java
    trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFontContent.java
    trunk/foray/foray-font/src/test/java/org/foray/font/FontServer4aTests.java

Modified: trunk/foray/foray-app/src/main/java/org/foray/app/ForaySpecific.java
===================================================================
--- trunk/foray/foray-app/src/main/java/org/foray/app/ForaySpecific.java	2022-12-03 18:53:18 UTC (rev 12771)
+++ trunk/foray/foray-app/src/main/java/org/foray/app/ForaySpecific.java	2022-12-03 20:53:53 UTC (rev 12772)
@@ -135,7 +135,7 @@
             InputStream inputStream = null;
             try {
                 inputStream = fontConfigURL.openStream();
-                forayFontServer.setup(inputStream, null);
+                forayFontServer.setup(inputStream);
             } catch (final IOException e) {
                 throw new ForayException(e);
             } catch (final FontException e) {

Modified: trunk/foray/foray-app/src/test/java/org/foray/app/area/AbstractAreaTreeTest.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/area/AbstractAreaTreeTest.java	2022-12-03 18:53:18 UTC (rev 12771)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/area/AbstractAreaTreeTest.java	2022-12-03 20:53:53 UTC (rev 12772)
@@ -65,7 +65,7 @@
      */
     protected FontServer4a getFontServer() throws FontException {
         final FontServer4a fontServer = new FontServer4a();
-        fontServer.setup(null, null);
+//        fontServer.setup(null, null);
         return fontServer;
     }
 

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	2022-12-03 18:53:18 UTC (rev 12771)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FontServer4a.java	2022-12-03 20:53:53 UTC (rev 12772)
@@ -347,20 +347,11 @@
     /**
      * Registers the FreeStanding fonts that are available based on font
      * configuration file and options.
-     *
      * @param fontConfigFile The URL for the font configuration file that should
      * be used during setup.
-     * @param fontConfigOptions An optional Map of font configuration options.
-     * Implementations that do not wish to use this should simply ignore it.
-     * Clients that do not wish to use it should pass null.
-     * This can be used for any purpose, but is intended primarily to allow
-     * an implementation to allow keys to be embedded in font configuration
-     * files, and then to replace those keys with the mapped value during
-     * parsing.
      * @throws FontException on font configuration error.
      */
-    public void setup(final InputStream fontConfigFile,
-            final Map<String, String> fontConfigOptions) throws FontException {
+    public void setup(final InputStream fontConfigFile) throws FontException {
         if (this.setupCompleted) {
             return;
         }

Modified: trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFontContent.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFontContent.java	2022-12-03 18:53:18 UTC (rev 12771)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFontContent.java	2022-12-03 20:53:53 UTC (rev 12772)
@@ -63,10 +63,8 @@
  *
  * <p>The main purpose for keeping {@link RegisteredFont} separate from {@link RegisteredFontContent} is so that the
  * latter can be reused without duplication of parsing.
- * A secondary benefit is that it adds clarity to the notion that the former is user-oriented and the latter is
- * system-oriented.
- * has font-content to be It is tempting to question why this separate class is needed. It is good to not
- * parse the font until it is known to be necessary.</p>
+ * A secondary benefit is that it adds clarity to the notion that the former is user-facing and the latter is
+ * system-facing.</p>
  */
 public class RegisteredFontContent implements FontParserClient {
 

Modified: trunk/foray/foray-font/src/test/java/org/foray/font/FontServer4aTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/FontServer4aTests.java	2022-12-03 18:53:18 UTC (rev 12771)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/FontServer4aTests.java	2022-12-03 20:53:53 UTC (rev 12772)
@@ -65,7 +65,7 @@
             } catch (final FileNotFoundException e) {
                 throw new FontException(e);
             }
-            fontServer.setup(fontConfigInputStream, null);
+            fontServer.setup(fontConfigInputStream);
             FontServer4aTests.fontServer = fontServer;
         }
         return FontServer4aTests.fontServer;

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