svn commit: r1657730 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering: CIDType0Glyph2D.java Glyph2D.java PageDrawer.java TTFGlyph2D.java Type1Glyph2D.java font/

[ja...@apache.org]

Author: jahewson
Date: Fri Feb  6 00:53:53 2015
New Revision: 1657730

URL: http://svn.apache.org/r1657730
Log:
PDFBOX-2669: Make internal PageDrawer font classes package-private

Added:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/CIDType0Glyph2D.java
      - copied, changed from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/CIDType0Glyph2D.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/Glyph2D.java
      - copied, changed from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/Glyph2D.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TTFGlyph2D.java
      - copied, changed from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/TTFGlyph2D.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/Type1Glyph2D.java
      - copied, changed from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/Type1Glyph2D.java
Removed:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/
Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java

Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/CIDType0Glyph2D.java (from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/CIDType0Glyph2D.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/CIDType0Glyph2D.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/CIDType0Glyph2D.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/CIDType0Glyph2D.java&r1=1657665&r2=1657730&rev=1657730&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/CIDType0Glyph2D.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/CIDType0Glyph2D.java Fri Feb  6 00:53:53 2015
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pdfbox.rendering.font;
+package org.apache.pdfbox.rendering;
 
 import java.awt.geom.GeneralPath;
 import java.io.IOException;
@@ -30,7 +30,7 @@ import org.apache.pdfbox.pdmodel.font.PD
  *
  * @author John Hewson
  */
-public class CIDType0Glyph2D implements Glyph2D
+final class CIDType0Glyph2D implements Glyph2D
 {
     private static final Log LOG = LogFactory.getLog(CIDType0Glyph2D.class);
 

Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/Glyph2D.java (from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/Glyph2D.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/Glyph2D.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/Glyph2D.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/Glyph2D.java&r1=1657665&r2=1657730&rev=1657730&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/Glyph2D.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/Glyph2D.java Fri Feb  6 00:53:53 2015
@@ -17,7 +17,7 @@
 
  */
 
-package org.apache.pdfbox.rendering.font;
+package org.apache.pdfbox.rendering;
 
 import java.awt.geom.GeneralPath;
 import java.io.IOException;
@@ -26,7 +26,7 @@ import java.io.IOException;
  * This interface is implemented by several font specific classes which is called to get the
  * general path of a single glyph of the represented font most likely to render it.
  */
-public interface Glyph2D
+interface Glyph2D
 {
     /**
      * Returns the path describing the glyph for the given character code.

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1657730&r1=1657729&r2=1657730&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Fri Feb  6 00:53:53 2015
@@ -47,10 +47,6 @@ import org.apache.pdfbox.pdmodel.graphic
 import org.apache.pdfbox.pdmodel.graphics.pattern.PDAbstractPattern;
 import org.apache.pdfbox.pdmodel.graphics.pattern.PDShadingPattern;
 import org.apache.pdfbox.pdmodel.graphics.state.RenderingMode;
-import org.apache.pdfbox.rendering.font.CIDType0Glyph2D;
-import org.apache.pdfbox.rendering.font.Glyph2D;
-import org.apache.pdfbox.rendering.font.TTFGlyph2D;
-import org.apache.pdfbox.rendering.font.Type1Glyph2D;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.font.PDFont;

Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TTFGlyph2D.java (from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/TTFGlyph2D.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TTFGlyph2D.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TTFGlyph2D.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/TTFGlyph2D.java&r1=1657665&r2=1657730&rev=1657730&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/TTFGlyph2D.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TTFGlyph2D.java Fri Feb  6 00:53:53 2015
@@ -16,7 +16,7 @@
    limitations under the License.
 
  */
-package org.apache.pdfbox.rendering.font;
+package org.apache.pdfbox.rendering;
 
 import java.awt.geom.AffineTransform;
 import java.awt.geom.GeneralPath;
@@ -37,7 +37,7 @@ import org.apache.pdfbox.pdmodel.font.PD
 /**
  * This class provides a glyph to GeneralPath conversion for TrueType fonts.
  */
-public class TTFGlyph2D implements Glyph2D
+final class TTFGlyph2D implements Glyph2D
 {
     private static final Log LOG = LogFactory.getLog(TTFGlyph2D.class);
 

Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/Type1Glyph2D.java (from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/Type1Glyph2D.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/Type1Glyph2D.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/Type1Glyph2D.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/Type1Glyph2D.java&r1=1657665&r2=1657730&rev=1657730&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/Type1Glyph2D.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/Type1Glyph2D.java Fri Feb  6 00:53:53 2015
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pdfbox.rendering.font;
+package org.apache.pdfbox.rendering;
 
 import java.awt.geom.GeneralPath;
 import java.io.IOException;
@@ -27,7 +27,7 @@ import org.apache.pdfbox.pdmodel.font.PD
 /**
  * Glyph to GeneralPath conversion for Type 1 PFB and CFF, and TrueType fonts with a 'post' table.
  */
-public class Type1Glyph2D implements Glyph2D
+final class Type1Glyph2D implements Glyph2D
 {
     private static final Log LOG = LogFactory.getLog(Type1Glyph2D.class);