svn commit: r1907927 - in /pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf: GlyphSubstitutionTable.java model/Language.java table/common/LangSysRecord.java table/common/ScriptRecord.java

[ti...@apache.org]

Author: tilman
Date: Wed Mar  1 07:21:55 2023
New Revision: 1907927

URL: http://svn.apache.org/viewvc?rev=1907927&view=rev
Log:
PDFBOX-4892: remove unused types, as suggested by Andreas Lehmkühler

Removed:
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/table/common/LangSysRecord.java
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/table/common/ScriptRecord.java
Modified:
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphSubstitutionTable.java
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/model/Language.java

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphSubstitutionTable.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphSubstitutionTable.java?rev=1907927&r1=1907926&r2=1907927&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphSubstitutionTable.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphSubstitutionTable.java Wed Mar  1 07:21:55 2023
@@ -38,13 +38,11 @@ import org.apache.fontbox.ttf.table.comm
 import org.apache.fontbox.ttf.table.common.FeatureListTable;
 import org.apache.fontbox.ttf.table.common.FeatureRecord;
 import org.apache.fontbox.ttf.table.common.FeatureTable;
-import org.apache.fontbox.ttf.table.common.LangSysRecord;
 import org.apache.fontbox.ttf.table.common.LangSysTable;
 import org.apache.fontbox.ttf.table.common.LookupListTable;
 import org.apache.fontbox.ttf.table.common.LookupSubTable;
 import org.apache.fontbox.ttf.table.common.LookupTable;
 import org.apache.fontbox.ttf.table.common.RangeRecord;
-import org.apache.fontbox.ttf.table.common.ScriptRecord;
 import org.apache.fontbox.ttf.table.common.ScriptTable;
 import org.apache.fontbox.ttf.table.gsub.LigatureSetTable;
 import org.apache.fontbox.ttf.table.gsub.LigatureTable;
@@ -125,8 +123,7 @@ public class GlyphSubstitutionTable exte
         for (int i = 0; i < scriptCount; i++)
         {
             ScriptTable scriptTable = readScriptTable(data, offset + scriptOffsets[i]);
-            ScriptRecord scriptRecord = new ScriptRecord(scriptTags[i], scriptTable);
-            resultScriptList.put(scriptRecord.getScriptTag(), scriptRecord.getScriptTable());
+            resultScriptList.put(scriptTags[i], scriptTable);
         }
         return Collections.unmodifiableMap(resultScriptList);
     }
@@ -162,8 +159,7 @@ public class GlyphSubstitutionTable exte
         for (int i = 0; i < langSysCount; i++)
         {
             LangSysTable langSysTable = readLangSysTable(data, offset + langSysOffsets[i]);
-            LangSysRecord langSysRecord = new LangSysRecord(langSysTags[i], langSysTable);
-            langSysTables.put(langSysRecord.getLangSysTag(), langSysRecord.getLangSysTable());
+            langSysTables.put(langSysTags[i], langSysTable);
         }
         return new ScriptTable(defaultLangSysTable, Collections.unmodifiableMap(langSysTables));
     }

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/model/Language.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/model/Language.java?rev=1907927&r1=1907926&r2=1907927&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/model/Language.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/model/Language.java Wed Mar  1 07:21:55 2023
@@ -19,7 +19,6 @@ package org.apache.fontbox.ttf.model;
 
 import org.apache.fontbox.ttf.gsub.GsubWorker;
 import org.apache.fontbox.ttf.gsub.GsubWorkerFactory;
-import org.apache.fontbox.ttf.table.common.ScriptRecord;
 
 /**
  * Enumerates the languages supported for GSUB operation. In order to support a new language, you
@@ -53,7 +52,7 @@ public enum Language
     /**
      * ScriptNames form the basis of identification of the language. This method gets the ScriptNames that the given
      * Language supports, in the order of preference, Index 0 being the most preferred. These names should match the
-     * {@link ScriptRecord} in the GSUB system.
+     * script record in the GSUB system.
      * 
      * @return an array containing all supported languages
      */