Renamed DIRECTORY_TABLE into TABLE_DIRECTORY

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript@1344787 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fonts/truetype/TTFFile.java b/src/java/org/apache/fop/fonts/truetype/TTFFile.java
index 1ec4120a6409812284a7505697ad91c7dc48df37..a1d012aa3062954e6660a800a77f244923a743b7 100644 (file)
--- a/src/java/org/apache/fop/fonts/truetype/TTFFile.java
+++ b/src/java/org/apache/fop/fonts/truetype/TTFFile.java
@@ -1058,7 +1058,7 @@ public class TTFFile {
             String tableName = pd[i].read(fontFile);
             dirTabs.put(TTFTableName.getValue(tableName), pd[i]);
         }
-        dirTabs.put(TTFTableName.DIRECTORY_TABLE,
+        dirTabs.put(TTFTableName.TABLE_DIRECTORY,
                 new TTFDirTabEntry(0L, fontFile.getCurrentPos()));
         log.debug("dir tables: " + dirTabs.keySet());
     }

diff --git a/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java b/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java
index 5e8fbb3794c7c2df26638d9f1d6304a961fa781a..00cb45f5ac0908da93c090459eb416e53c36ffd0 100644 (file)
--- a/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java
+++ b/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java
@@ -146,7 +146,7 @@ public class TTFSubSetFile extends TTFFile {
         if (hasPrep()) {
             writeTableName(TTFTableName.PREP);
         }
-        newDirTabs.put(TTFTableName.DIRECTORY_TABLE, new TTFDirTabEntry(0, currentPos));
+        newDirTabs.put(TTFTableName.TABLE_DIRECTORY, new TTFDirTabEntry(0, currentPos));
     }
 
     private void writeTableName(TTFTableName tableName) {

diff --git a/src/java/org/apache/fop/fonts/truetype/TTFTableName.java b/src/java/org/apache/fop/fonts/truetype/TTFTableName.java
index cf66954b64d332b24c816f54fa0d2b114c712647..e5ad63128097acc1a36b24a43e599e9614540b0f 100644 (file)
--- a/src/java/org/apache/fop/fonts/truetype/TTFTableName.java
+++ b/src/java/org/apache/fop/fonts/truetype/TTFTableName.java
@@ -27,7 +27,7 @@ package org.apache.fop.fonts.truetype;
 public final class TTFTableName {
 
     /** The first table in a TrueType font file containing metadata about other tables. */
-    public static final TTFTableName DIRECTORY_TABLE = new TTFTableName("dirTable");
+    public static final TTFTableName TABLE_DIRECTORY = new TTFTableName("tableDirectory");
 
     /** Embedded bitmap data. */
     public static final TTFTableName EBDT = new TTFTableName("EBDT");

diff --git a/test/java/org/apache/fop/fonts/truetype/TTFTableNameTestCase.java b/test/java/org/apache/fop/fonts/truetype/TTFTableNameTestCase.java
index 0a2eec54463ccaf0649a5d4cf40b9e76397f9d74..b9066dc2dc3158377c7ac123f5548b3d6eb4668d 100644 (file)
--- a/test/java/org/apache/fop/fonts/truetype/TTFTableNameTestCase.java
+++ b/test/java/org/apache/fop/fonts/truetype/TTFTableNameTestCase.java
@@ -37,7 +37,7 @@ public class TTFTableNameTestCase {
      */
     @Test
     public void testGetName() throws IllegalAccessException {
-        assertEquals("dirTable", TTFTableName.DIRECTORY_TABLE.getName());
+        assertEquals("tableDirectory", TTFTableName.TABLE_DIRECTORY.getName());
         assertEquals("EBDT", TTFTableName.EBDT.getName());
         assertEquals("EBLC", TTFTableName.EBLC.getName());
         assertEquals("EBSC", TTFTableName.EBSC.getName());