gmazza      2004/02/25 03:52:32

  Modified:    src/java/org/apache/fop/render AbstractRenderer.java
                        Renderer.java
               src/java/org/apache/fop/render/xml XMLRenderer.java
  Log:
  Changed internal renderInlineXXX() functions from public to protected access.  
Removed need for renderers to specifically implement them in Renderer interface.
  
  Revision  Changes    Path
  1.23      +6 -6      xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
  
  Index: AbstractRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- AbstractRenderer.java     25 Feb 2004 03:32:17 -0000      1.22
  +++ AbstractRenderer.java     25 Feb 2004 11:52:32 -0000      1.23
  @@ -639,12 +639,12 @@
   
   
       /** @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 @@
       }
   
       /** @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 @@
       }
   
       /** @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();
  
  
  
  1.7       +0 -44     xml-fop/src/java/org/apache/fop/render/Renderer.java
  
  Index: Renderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/Renderer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Renderer.java     28 Oct 2003 04:22:14 -0000      1.6
  +++ Renderer.java     25 Feb 2004 11:52:32 -0000      1.7
  @@ -212,55 +212,11 @@
           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);
   
   }
   
  
  
  
  1.17      +6 -6      xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
  
  Index: XMLRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- XMLRenderer.java  25 Feb 2004 03:32:17 -0000      1.16
  +++ XMLRenderer.java  25 Feb 2004 11:52:32 -0000      1.17
  @@ -395,7 +395,7 @@
       /**
        * @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 @@
       /**
        * @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 @@
       /**
        * @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 @@
       /**
        * @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 @@
       /**
        * @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:
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to