foray-commit Mailing List for FOray (Page 18)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 13451
          http://sourceforge.net/p/foray/code/13451
Author:   victormote
Date:     2025-04-20 21:10:48 +0000 (Sun, 20 Apr 2025)
Log Message:
-----------
Hide parse handling logic by pushing it into private inner classes.

Modified Paths:
--------------
    trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableBase.java
    trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java
    trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableOs2.java
    trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePclt.java

Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableBase.java
===================================================================

--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableBase.java	2025-04-20 20:01:46 UTC (rev 13450)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableBase.java	2025-04-20 21:10:48 UTC (rev 13451)
@@ -28,7 +28,9 @@
 
 package org.foray.font.format.ttf;
 
-import org.foray.common.RandomAccessInput;
+import org.foray.common.primitive.PrimitiveFerry;
+import org.foray.font.FontParserConsumer;
+import org.foray.font.format.ttf.parse.TtfTableBaseParser;
 
 import java.io.IOException;
 
@@ -39,6 +41,38 @@
 public class TtfTableBase extends TtfTable {
 
     /**
+     * The handler of events from the parser.
+     */
+    private final class ParserConsumer implements FontParserConsumer {
+
+        /** The client being built from the parser results. */
+        private TtfTableBase client;
+
+        /**
+         * Constructor.
+         * @param client The client being built from the parser results.
+         */
+        private ParserConsumer(final TtfTableBase client) {
+            this.client = client;
+        }
+
+        @Override
+        public void objectField(final String fieldName, final Object value) {
+        }
+
+        @Override
+        public void primitiveField(final String fieldName, final PrimitiveFerry value) {
+            switch (fieldName) {
+            case "majorVersion":       client.majorVersion = (byte) value.getInt(); break;
+            }
+        }
+
+    }
+
+    /** The major verions of this table. */
+    private byte majorVersion;
+
+    /**
      * Constructor.
      * @param offsetRecord The parent table directory entry.
      */
@@ -48,15 +82,16 @@
 
     /**
      * Parse the table from the table content.
-     * @param offsetRecord The parent offset table record.
-     * @param raInput The input which is being parsed.
+     * @param dirEntry The parent table directory entry.
+     * @param input The input which is being parsed.
      * @return The parsed instance.
      * @throws IOException For I/O Error.
      */
-    public static TtfTableBase parse(final TtfOffsetTableRecord offsetRecord, final RandomAccessInput raInput)
+    public static TtfTableBase parse(final TtfOffsetTableRecord dirEntry, final TtfRandomAccessInput input)
             throws IOException {
-        raInput.seek(offsetRecord.getOffset());
-        final TtfTableBase table = new TtfTableBase(offsetRecord);
+        final TtfTableBase table = new TtfTableBase(dirEntry);
+        final TtfTableBaseParser parser = new TtfTableBaseParser();
+        parser.parse(input, dirEntry.getOffset(), dirEntry.getLength(), table.new ParserConsumer(table));
         return table;
     }
 
@@ -65,4 +100,12 @@
         return "BASE";
     }
 
+    /**
+     * Returns the major version of this table.
+     * @return The major version of this table.
+     */
+    public int getMajorVersion() {
+        return this.majorVersion;
+    }
+
 }

Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java	2025-04-20 20:01:46 UTC (rev 13450)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java	2025-04-20 21:10:48 UTC (rev 13451)
@@ -41,8 +41,47 @@
 /**
  * Class representing a TTF "head" table.
  */
-public class TtfTableHead extends TtfTable implements FontParserConsumer {
+public class TtfTableHead extends TtfTable {
 
+    /**
+     * The handler of events from the parser.
+     */
+    private final class ParserConsumer implements FontParserConsumer {
+
+        /** The client being built from the parser results. */
+        private TtfTableHead client;
+
+        /**
+         * Constructor.
+         * @param client The client being built from the parser results.
+         */
+        private ParserConsumer(final TtfTableHead client) {
+            this.client = client;
+        }
+
+        @Override
+        public void objectField(final String fieldName, final Object value) {
+            switch (fieldName) {
+            case "boundingBox": {
+                final short[] boundingBoxArray = (short[]) value;
+                client.boundingBox = new BoundingBoxShort(boundingBoxArray);
+                break;
+            }
+            }
+        }
+
+        @Override
+        public void primitiveField(final String fieldName, final PrimitiveFerry value) {
+            switch (fieldName) {
+            case "unitsPerEm":       client.unitsPerEm = value.getInt(); break;
+            case "indexToLocFormat": client.indexToLocFormat = value.getShort(); break;
+            }
+        }
+
+    }
+
+
+
     /** Constant for the offset to the "checkSumAdjustment" in this table. */
     public static final byte CHECK_SUM_ADJUSTMENT_OFFSET = 8;
 
@@ -80,7 +119,7 @@
             throws IOException {
         final TtfTableHead head = new TtfTableHead(dirEntry);
         final TtfTableHeadParser parser = new TtfTableHeadParser();
-        parser.parse(input, dirEntry.getOffset(), dirEntry.getLength(), head);
+        parser.parse(input, dirEntry.getOffset(), dirEntry.getLength(), head.new ParserConsumer(head));
         return head;
     }
 
@@ -113,23 +152,4 @@
         return this.boundingBox;
     }
 
-    @Override
-    public void objectField(final String fieldName, final Object value) {
-        switch (fieldName) {
-        case "boundingBox": {
-            final short[] boundingBoxArray = (short[]) value;
-            this.boundingBox = new BoundingBoxShort(boundingBoxArray);
-            break;
-        }
-        }
-    }
-
-    @Override
-    public void primitiveField(final String fieldName, final PrimitiveFerry value) {
-        switch (fieldName) {
-        case "unitsPerEm": this.unitsPerEm = value.getInt(); break;
-        case "indexToLocFormat": this.indexToLocFormat = value.getShort(); break;
-        }
-    }
-
 }

Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableOs2.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableOs2.java	2025-04-20 20:01:46 UTC (rev 13450)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableOs2.java	2025-04-20 21:10:48 UTC (rev 13451)
@@ -40,8 +40,47 @@
 /**
  * Class representing a TTF "OS/2" (OS/2 and Windows metrics) table.
  */
-public class TtfTableOs2 extends TtfTable implements FontParserConsumer {
+public class TtfTableOs2 extends TtfTable {
 
+    /**
+     * The handler of events from the parser.
+     */
+    private final class ParserConsumer implements FontParserConsumer {
+
+        /** The client being built from the parser results. */
+        private TtfTableOs2 client;
+
+        /**
+         * Constructor.
+         * @param client The client being built from the parser results.
+         */
+        private ParserConsumer(final TtfTableOs2 client) {
+            this.client = client;
+        }
+
+        @Override
+        public void objectField(final String fieldName, final Object value) {
+            switch (fieldName) {
+            case "panose": client.panose = Panose4a.forceInstance((@Unsigned byte[]) value);
+            }
+        }
+
+        @Override
+        public void primitiveField(final String fieldName, final PrimitiveFerry value) {
+            switch (fieldName) {
+            case "version":             client.version = (byte) value.getShort(); break;
+            case "fstype":              client.fsType = value.getInt(); break;
+            case "yStrikeoutSize":      client.yStrikeoutSize = value.getShort(); break;
+            case "yStrikeoutPosition":  client.yStrikeoutPosition = value.getShort(); break;
+            case "sTypoAscender":       client.sTypoAscender = value.getShort(); break;
+            case "sTypoDescender":      client.sTypoDescender = value.getShort(); break;
+            case "sxHeight":            client.sxHeight = value.getShort(); break;
+            case "sCapHeight":          client.sCapHeight = value.getShort(); break;
+            }
+        }
+
+    }
+
     /** The version number of this table. */
     private byte version;
 
@@ -88,7 +127,7 @@
             throws IOException {
         final TtfTableOs2 os2 = new TtfTableOs2(dirEntry);
         final TtfTableOs2Parser parser = new TtfTableOs2Parser();
-        parser.parse(input, dirEntry.getOffset(), dirEntry.getLength(), os2);
+        parser.parse(input, dirEntry.getOffset(), dirEntry.getLength(), os2.new ParserConsumer(os2));
         return os2;
     }
 
@@ -175,25 +214,4 @@
         return this.sCapHeight;
     }
 
-    @Override
-    public void objectField(final String fieldName, final Object value) {
-        switch (fieldName) {
-        case "panose": this.panose = Panose4a.forceInstance((@Unsigned byte[]) value);
-        }
-    }
-
-    @Override
-    public void primitiveField(final String fieldName, final PrimitiveFerry value) {
-        switch (fieldName) {
-        case "version":             this.version = (byte) value.getShort(); break;
-        case "fstype":              this.fsType = value.getInt(); break;
-        case "yStrikeoutSize":      this.yStrikeoutSize = value.getShort(); break;
-        case "yStrikeoutPosition":  this.yStrikeoutPosition = value.getShort(); break;
-        case "sTypoAscender":       this.sTypoAscender = value.getShort(); break;
-        case "sTypoDescender":      this.sTypoDescender = value.getShort(); break;
-        case "sxHeight":            this.sxHeight = value.getShort(); break;
-        case "sCapHeight":          this.sCapHeight = value.getShort(); break;
-        }
-    }
-
 }

Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePclt.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePclt.java	2025-04-20 20:01:46 UTC (rev 13450)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePclt.java	2025-04-20 21:10:48 UTC (rev 13451)
@@ -37,8 +37,39 @@
 /**
  * Class representing a TTF "PCLT" (PCL 5) table.
  */
-public class TtfTablePclt extends TtfTable implements FontParserConsumer {
+public class TtfTablePclt extends TtfTable {
 
+    /**
+     * The handler of events from the parser.
+     */
+    private final class ParserConsumer implements FontParserConsumer {
+
+        /** The client being built from the parser results. */
+        private TtfTablePclt client;
+
+        /**
+         * Constructor.
+         * @param client The client being built from the parser results.
+         */
+        private ParserConsumer(final TtfTablePclt client) {
+            this.client = client;
+        }
+
+        @Override
+        public void objectField(final String fieldName, final Object value) {
+        }
+
+        @Override
+        public void primitiveField(final String fieldName, final PrimitiveFerry value) {
+            switch (fieldName) {
+            case "xHeight":     client.xHeight = value.getInt(); break;
+            case "capHeight":   client.capHeight = value.getInt(); break;
+            case "serifStyle":  client.serifStyle = value.getShort(); break;
+            }
+        }
+
+    }
+
     /** The size, in bytes, of the "typeface" field. */
     public static final byte TYPEFACE_CHARS = 16;
 
@@ -83,7 +114,7 @@
             throws IOException {
         final TtfTablePclt pclt = new TtfTablePclt(dirEntry);
         final TtfTablePcltParser parser = new TtfTablePcltParser();
-        parser.parse(input, dirEntry.getOffset(), dirEntry.getLength(), pclt);
+        parser.parse(input, dirEntry.getOffset(), dirEntry.getLength(), pclt.new ParserConsumer(pclt));
         return pclt;
     }
 
@@ -120,18 +151,4 @@
         return this.xHeight;
     }
 
-    @Override
-    public void objectField(final String fieldName, final Object value) {
-    }
-
-    @Override
-    public void primitiveField(final String fieldName, final PrimitiveFerry value) {
-        switch (fieldName) {
-        case "xHeight": this.xHeight = value.getInt(); break;
-        case "capHeight": this.capHeight = value.getInt(); break;
-
-        case "serifStyle": this.serifStyle = value.getShort(); break;
-        }
-    }
-
 }

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





2006	Jan	Feb	Mar (139)	Apr (98)	May (250)	Jun (394)	Jul (84)	Aug (13)	Sep (420)	Oct (186)	Nov (1)	Dec (3)
2007	Jan (108)	Feb (202)	Mar (291)	Apr (247)	May (374)	Jun (227)	Jul (231)	Aug (60)	Sep (31)	Oct (45)	Nov (18)	Dec
2008	Jan (38)	Feb (71)	Mar (142)	Apr	May (59)	Jun (6)	Jul (10)	Aug	Sep	Oct	Nov	Dec
2009	Jan (12)	Feb (4)	Mar (88)	Apr (121)	May (17)	Jun (30)	Jul	Aug (5)	Sep	Oct (1)	Nov	Dec
2010	Jan (11)	Feb (76)	Mar (11)	Apr	May (11)	Jun	Jul	Aug (44)	Sep (14)	Oct (7)	Nov	Dec
2011	Jan	Feb	Mar	Apr	May (9)	Jun	Jul	Aug	Sep	Oct (10)	Nov	Dec
2012	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (4)	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (168)
2017	Jan (77)	Feb (11)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr (6)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb (88)	Mar (118)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2020	Jan	Feb	Mar	Apr	May (6)	Jun	Jul	Aug	Sep	Oct	Nov	Dec (141)
2021	Jan (170)	Feb (20)	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct (62)	Nov (189)	Dec (162)
2022	Jan (201)	Feb (118)	Mar (8)	Apr	May (2)	Jun (47)	Jul (19)	Aug (14)	Sep (3)	Oct	Nov (28)	Dec (235)
2023	Jan (112)	Feb (23)	Mar (2)	Apr (2)	May	Jun (1)	Jul	Aug (70)	Sep (92)	Oct (20)	Nov (1)	Dec (1)
2024	Jan	Feb	Mar (1)	Apr (1)	May (14)	Jun (11)	Jul (1)	Aug	Sep	Oct	Nov	Dec
2025	Jan (10)	Feb (29)	Mar	Apr (162)	May (245)	Jun (83)	Jul	Aug (1)	Sep	Oct	Nov	Dec

foray-commit Mailing List for FOray (Page 18)

Modular XSL-FO Implementation for Java.

foray-commit — FOray repository commit log messages