You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2021/04/05 10:47:49 UTC
svn commit: r1888381 - in
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff: CFFCharset.java
CFFCharsetCID.java CFFCharsetType1.java EmbeddedCharset.java
Author: lehmi
Date: Mon Apr 5 10:47:49 2021
New Revision: 1888381
URL: http://svn.apache.org/viewvc?rev=1888381&view=rev
Log:
PDFBOX-5143: convert abstract static class into interface
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharset.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharsetCID.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharsetType1.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/EmbeddedCharset.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharset.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharset.java?rev=1888381&r1=1888380&r2=1888381&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharset.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharset.java Mon Apr 5 10:47:49 2021
@@ -19,11 +19,9 @@ package org.apache.fontbox.cff;
/**
* A CFF charset. A charset is an array of SIDs/CIDs for all glyphs in the font.
*
- * todo: split this into two? CFFCharsetType1 and CFFCharsetCID ?
- *
* @author John Hewson
*/
-public abstract class CFFCharset
+public interface CFFCharset
{
/**
* Indicates if the charset belongs to a CID font.
@@ -54,7 +52,7 @@ public abstract class CFFCharset
* @param sid SID
* @return GID
*/
- abstract int getSIDForGID(int sid);
+ public abstract int getSIDForGID(int sid);
/**
* Returns the GID for the given SID. SIDs are internal to the font and are not public.
@@ -62,7 +60,7 @@ public abstract class CFFCharset
* @param sid SID
* @return GID
*/
- abstract int getGIDForSID(int sid);
+ public abstract int getGIDForSID(int sid);
/**
* Returns the GID for a given CID. Returns 0 if the CID is missing.
@@ -79,7 +77,7 @@ public abstract class CFFCharset
* @param name PostScript glyph name
* @return SID
*/
- abstract int getSID(String name);
+ public abstract int getSID(String name);
/**
* Returns the PostScript glyph name for the given GID.
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharsetCID.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharsetCID.java?rev=1888381&r1=1888380&r2=1888381&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharsetCID.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharsetCID.java Mon Apr 5 10:47:49 2021
@@ -24,7 +24,7 @@ import java.util.Map;
*
* @author Valery Bokov
*/
-class CFFCharsetCID extends CFFCharset
+class CFFCharsetCID implements CFFCharset
{
private final Map<Integer, Integer> sidOrCidToGid = new HashMap<>(250);
@@ -51,13 +51,13 @@ class CFFCharsetCID extends CFFCharset
}
@Override
- int getSIDForGID(int sid)
+ public int getSIDForGID(int sid)
{
throw new IllegalStateException("Not a Type 1-equivalent font");
}
@Override
- int getGIDForSID(int sid)
+ public int getGIDForSID(int sid)
{
throw new IllegalStateException("Not a Type 1-equivalent font");
}
@@ -74,7 +74,7 @@ class CFFCharsetCID extends CFFCharset
}
@Override
- int getSID(String name)
+ public int getSID(String name)
{
throw new IllegalStateException("Not a Type 1-equivalent font");
}
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharsetType1.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharsetType1.java?rev=1888381&r1=1888380&r2=1888381&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharsetType1.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFCharsetType1.java Mon Apr 5 10:47:49 2021
@@ -24,7 +24,7 @@ import java.util.Map;
*
* @author Valery Bokov
*/
-class CFFCharsetType1 extends CFFCharset
+class CFFCharsetType1 implements CFFCharset
{
private final Map<Integer, Integer> sidOrCidToGid = new HashMap<>(250);
private final Map<Integer, Integer> gidToSid = new HashMap<>(250);
@@ -55,7 +55,7 @@ class CFFCharsetType1 extends CFFCharset
}
@Override
- int getSIDForGID(int sid)
+ public int getSIDForGID(int sid)
{
Integer gid = gidToSid.get(sid);
if (gid == null)
@@ -66,7 +66,7 @@ class CFFCharsetType1 extends CFFCharset
}
@Override
- int getGIDForSID(int sid)
+ public int getGIDForSID(int sid)
{
Integer gid = sidOrCidToGid.get(sid);
if (gid == null)
@@ -83,7 +83,7 @@ class CFFCharsetType1 extends CFFCharset
}
@Override
- int getSID(String name)
+ public int getSID(String name)
{
Integer sid = nameToSid.get(name);
if (sid == null)
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/EmbeddedCharset.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/EmbeddedCharset.java?rev=1888381&r1=1888380&r2=1888381&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/EmbeddedCharset.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/EmbeddedCharset.java Mon Apr 5 10:47:49 2021
@@ -20,7 +20,7 @@ package org.apache.fontbox.cff;
* Class representing an embedded CFF charset.
*
*/
-class EmbeddedCharset extends CFFCharset
+class EmbeddedCharset implements CFFCharset
{
private final CFFCharset charset;
@@ -54,13 +54,13 @@ class EmbeddedCharset extends CFFCharset
}
@Override
- int getSIDForGID(int sid)
+ public int getSIDForGID(int sid)
{
return charset.getSIDForGID(sid);
}
@Override
- int getGIDForSID(int sid)
+ public int getGIDForSID(int sid)
{
return charset.getGIDForSID(sid);
}
@@ -72,7 +72,7 @@ class EmbeddedCharset extends CFFCharset
}
@Override
- int getSID(String name)
+ public int getSID(String name)
{
return charset.getSID(name);
}