From fae8882d2261a48ae2b158ff631fe696d511b98b Mon Sep 17 00:00:00 2001 From: Vincent Hennebert Date: Thu, 31 May 2012 15:55:34 +0000 Subject: [PATCH] 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 --- src/java/org/apache/fop/fonts/truetype/TTFFile.java | 2 +- src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java | 2 +- src/java/org/apache/fop/fonts/truetype/TTFTableName.java | 2 +- .../org/apache/fop/fonts/truetype/TTFTableNameTestCase.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/org/apache/fop/fonts/truetype/TTFFile.java b/src/java/org/apache/fop/fonts/truetype/TTFFile.java index 1ec4120a6..a1d012aa3 100644 --- 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 5e8fbb379..00cb45f5a 100644 --- 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 cf66954b6..e5ad63128 100644 --- 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 0a2eec544..b9066dc2d 100644 --- 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()); -- 2.39.5