Changed internal renderInlineXXX() functions from public to protected access. Removed need for renderers to specifically implement them in Renderer interface.

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

3 files changed, 12 insertions, 56 deletions

diff --git a/src/java/org/apache/fop/render/AbstractRenderer.java b/src/java/org/apache/fop/render/AbstractRenderer.java
index cfa2758d1..47bc1402b 100644
--- a/src/java/org/apache/fop/render/AbstractRenderer.java
+++ b/src/java/org/apache/fop/render/AbstractRenderer.java
@@ -639,12 +639,12 @@ public abstract class AbstractRenderer extends AbstractLogEnabled
 
 
     /** @see org.apache.fop.render.Renderer */
-    public void renderCharacter(Character ch) {
+    protected void renderCharacter(Character ch) {
         currentBlockIPPosition += ch.getWidth();
     }
 
     /** @see org.apache.fop.render.Renderer */
-    public void renderInlineSpace(Space space) {
+    protected void renderInlineSpace(Space space) {
         // an inline space moves the inline progression position
         // for the current block by the width or height of the space
         // it may also have styling (only on this object) that needs
@@ -653,17 +653,17 @@ public abstract class AbstractRenderer extends AbstractLogEnabled
     }
 
     /** @see org.apache.fop.render.Renderer */
-    public void renderLeader(Leader area) {
+    protected void renderLeader(Leader area) {
         currentBlockIPPosition += area.getWidth();
     }
 
     /** @see org.apache.fop.render.Renderer */
-    public void renderText(TextArea text) {
+    protected void renderText(TextArea text) {
         currentBlockIPPosition += text.getWidth();
     }
 
     /** @see org.apache.fop.render.Renderer */
-    public void renderInlineParent(InlineParent ip) {
+    protected void renderInlineParent(InlineParent ip) {
         int saveIP = currentBlockIPPosition;
         Iterator iter = ip.getChildAreas().iterator();
         while (iter.hasNext()) {
@@ -673,7 +673,7 @@ public abstract class AbstractRenderer extends AbstractLogEnabled
     }
 
     /** @see org.apache.fop.render.Renderer */
-    public void renderViewport(Viewport viewport) {
+    protected void renderViewport(Viewport viewport) {
         Area content = viewport.getContent();
         int saveBP = currentBPPosition;
         currentBPPosition += viewport.getOffset();
diff --git a/src/java/org/apache/fop/render/Renderer.java b/src/java/org/apache/fop/render/Renderer.java
index d9d439458..0ff20734f 100644
--- a/src/java/org/apache/fop/render/Renderer.java
+++ b/src/java/org/apache/fop/render/Renderer.java
@@ -212,55 +212,11 @@ public interface Renderer {
         throws IOException, FOPException;
 
     /**
-     * Tells the renderer to render an inline viewport. It sets up clipping as
-     * necessary.
-     *
-     * @param viewport  The viewport area
-     */
-    void renderViewport(Viewport viewport);
-
-    /**
      * Tells the renderer to render an inline container.
      *
      * @param cont  The inline container area
      */
     void renderContainer(Container cont);
 
-    /**
-     * Tells the renderer to render an inline text area
-     *
-     * @param area  The text area
-     */
-    void renderText(TextArea area);
-
-    /**
-     * Tells the renderer to render an inline parent area.
-     *
-     * @param ip  The inline parent area
-     */
-    void renderInlineParent(InlineParent ip);
-
-    /**
-     * Tells the renderer to render an inline character.
-     *
-     * @param ch  The inline character
-     */
-    void renderCharacter(
-            org.apache.fop.area.inline.Character ch);
-
-    /**
-     * Tells the renderer to render an inline space.
-     *
-     * @param space  The inline space
-     */
-    void renderInlineSpace(Space space);
-
-    /**
-     * Tells the renderer to render an inline leader area.
-     *
-     * @param area  The inline leader area.
-     */
-    void renderLeader(Leader area);
-
 }
 
diff --git a/src/java/org/apache/fop/render/xml/XMLRenderer.java b/src/java/org/apache/fop/render/xml/XMLRenderer.java
index 0950e5dad..2519ed957 100644
--- a/src/java/org/apache/fop/render/xml/XMLRenderer.java
+++ b/src/java/org/apache/fop/render/xml/XMLRenderer.java
@@ -395,7 +395,7 @@ public class XMLRenderer extends AbstractRenderer {
     /**
      * @see org.apache.fop.render.Renderer#renderViewport(Viewport)
      */
-    public void renderViewport(Viewport viewport) {
+    protected void renderViewport(Viewport viewport) {
         writeStartTag("<viewport>");
         super.renderViewport(viewport);
         writeEndTag("</viewport>");
@@ -435,7 +435,7 @@ public class XMLRenderer extends AbstractRenderer {
     /**
      * @see org.apache.fop.render.Renderer#renderCharacter(Character)
      */
-    public void renderCharacter(org.apache.fop.area.inline.Character ch) {
+    protected void renderCharacter(org.apache.fop.area.inline.Character ch) {
         String prop = "";
         Map map = ch.getTraits();
         if (map != null) {
@@ -447,14 +447,14 @@ public class XMLRenderer extends AbstractRenderer {
     /**
      * @see org.apache.fop.render.Renderer#renderInlineSpace(Space)
      */
-    public void renderInlineSpace(Space space) {
+    protected void renderInlineSpace(Space space) {
         writeElement("<space width=\"" + space.getWidth() + "\"/>");
     }
 
     /**
      * @see org.apache.fop.render.Renderer#renderText(TextArea)
      */
-    public void renderText(TextArea text) {
+    protected void renderText(TextArea text) {
         String prop = "";
         Map map = text.getTraits();
         if (map != null) {
@@ -468,7 +468,7 @@ public class XMLRenderer extends AbstractRenderer {
     /**
      * @see org.apache.fop.render.Renderer#renderInlineParent(InlineParent)
      */
-    public void renderInlineParent(InlineParent ip) {
+    protected void renderInlineParent(InlineParent ip) {
         String prop = "";
         Map map = ip.getTraits();
         if (map != null) {
@@ -482,7 +482,7 @@ public class XMLRenderer extends AbstractRenderer {
     /**
      * @see org.apache.fop.render.Renderer#renderLeader(Leader)
      */
-    public void renderLeader(Leader area) {
+    protected void renderLeader(Leader area) {
         String style = "solid";
         switch (area.getRuleStyle()) {
             case RuleStyle.DOTTED: