You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2019/12/07 15:09:27 UTC
svn commit: r1870988 - in /pdfbox/branches/issue4569:
fontbox/src/main/java/org/apache/fontbox/ttf/
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/
Author: tilman
Date: Sat Dec 7 15:09:27 2019
New Revision: 1870988
URL: http://svn.apache.org/viewvc?rev=1870988&view=rev
Log:
PDFBOX-4071: remove abstract declaration that have an abstract or interface super
Modified:
pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java
pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java
pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java
Modified: pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java?rev=1870988&r1=1870987&r2=1870988&view=diff
==============================================================================
--- pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java (original)
+++ pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/ttf/TTFDataStream.java Sat Dec 7 15:09:27 2019
@@ -231,14 +231,6 @@ abstract class TTFDataStream implements
}
/**
- * Close the underlying resources.
- *
- * @throws IOException If there is an error closing the resources.
- */
- @Override
- public abstract void close() throws IOException;
-
- /**
* Seek into the datasource.
*
* @param pos The position to seek to.
Modified: pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java?rev=1870988&r1=1870987&r2=1870988&view=diff
==============================================================================
--- pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java (original)
+++ pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java Sat Dec 7 15:09:27 2019
@@ -200,9 +200,6 @@ public abstract class PDCIDFont implemen
return fontDescriptor;
}
- @Override
- public abstract Matrix getFontMatrix();
-
/**
* Returns the Type 0 font which is the parent of this font.
*
@@ -213,9 +210,6 @@ public abstract class PDCIDFont implemen
return parent;
}
- @Override
- public abstract BoundingBox getBoundingBox() throws IOException;
-
/**
* This will get the default width. The default value for the default width is 1000.
*
@@ -294,9 +288,6 @@ public abstract class PDCIDFont implemen
}
@Override
- public abstract float getHeight(int code) throws IOException;
-
- @Override
public float getWidth(int code) throws IOException
{
// these widths are supposed to be consistent with the actual widths given in the CIDFont
@@ -306,12 +297,6 @@ public abstract class PDCIDFont implemen
}
@Override
- public abstract float getWidthFromFont(int code) throws IOException;
-
- @Override
- public abstract boolean isEmbedded();
-
- @Override
// todo: this method is highly suspicious, the average glyph width is not usually a good metric
public float getAverageFontWidth()
{
Modified: pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=1870988&r1=1870987&r2=1870988&view=diff
==============================================================================
--- pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java (original)
+++ pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java Sat Dec 7 15:09:27 2019
@@ -29,7 +29,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fontbox.afm.FontMetrics;
import org.apache.fontbox.cmap.CMap;
-import org.apache.fontbox.util.BoundingBox;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -313,15 +312,6 @@ public abstract class PDFont implements
* @return width in 1/1000 text space
*/
protected abstract float getStandard14Width(int code);
-
- @Override
- public abstract float getWidthFromFont(int code) throws IOException;
-
- @Override
- public abstract boolean isEmbedded();
-
- @Override
- public abstract float getHeight(int code) throws IOException;
/**
* Encodes the given string for use in a PDF content stream.
@@ -504,12 +494,6 @@ public abstract class PDFont implements
return dict.getNameAsString(COSName.SUBTYPE);
}
- @Override
- public abstract String getName();
-
- @Override
- public abstract BoundingBox getBoundingBox() throws IOException;
-
/**
* The widths of the characters. This will be null for the standard 14 fonts.
*
@@ -623,9 +607,6 @@ public abstract class PDFont implements
* Returns true if this font will be subset when embedded.
*/
public abstract boolean willBeSubset();
-
- @Override
- public abstract boolean isDamaged();
@Override
public boolean equals(Object other)
Modified: pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java?rev=1870988&r1=1870987&r2=1870988&view=diff
==============================================================================
--- pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java (original)
+++ pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java Sat Dec 7 15:09:27 2019
@@ -77,15 +77,6 @@ public abstract class PDAbstractAppearan
this.document = document;
}
- @Override
- public abstract void generateNormalAppearance();
-
- @Override
- public abstract void generateRolloverAppearance();
-
- @Override
- public abstract void generateDownAppearance();
-
PDAnnotation getAnnotation()
{
return annotation;