arved       01/06/10 10:02:41

  Modified:    src/org/apache/fop/image ImageArea.java
  Log:
  SGK/AHS: inling of images
  
  Revision  Changes    Path
  1.8       +42 -3     xml-fop/src/org/apache/fop/image/ImageArea.java
  
  Index: ImageArea.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/ImageArea.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ImageArea.java    2000/10/19 11:18:35     1.7
  +++ ImageArea.java    2001/06/10 17:02:41     1.8
  @@ -1,4 +1,4 @@
  -/*-- $Id: ImageArea.java,v 1.7 2000/10/19 11:18:35 eschaeffer Exp $ -- 
  +/*-- $Id: ImageArea.java,v 1.8 2001/06/10 17:02:41 arved Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -54,24 +54,32 @@
   
   import org.apache.fop.fo.properties.TextAlign;
   import org.apache.fop.layout.*;
  +import org.apache.fop.layout.inline.*;
  +
   import org.apache.fop.render.Renderer;
   
   import java.util.Vector;
   import java.util.Enumeration;
   
  -public class ImageArea extends Area {
  +public class ImageArea extends InlineArea {
   
       protected int xOffset = 0;
  +    protected int align;
  +    protected int valign;
       protected FopImage image;
  +    
   
       public ImageArea(FontState fontState, FopImage img,
                     int AllocationWidth, int width, int height,
                     int startIndent, int endIndent, int align)  {
  -     super(fontState,width,height);
  +     super(fontState,width,0,0,0);
        this.currentHeight = height;
        this.contentRectangleWidth = width;
  +     this.height = height;
        this.image = img;
  +     this.align = align;
   
  +/*
        switch (align) {
        case TextAlign.START:
            xOffset = startIndent;
  @@ -90,6 +98,7 @@
            xOffset = startIndent + ((endIndent - startIndent) - width)/2;
            break;
        }
  +     */
       }
   
       public int getXOffset() {
  @@ -107,4 +116,34 @@
       public int getImageHeight() {
        return currentHeight;
       }
  +             
  +    public void setAlign(int align)
  +    {
  +             this.align = align;
  +     }
  +
  +    public int getAlign()
  +    {
  +             return this.align;
  +     }
  +
  +    public void setVerticalAlign(int align)
  +    {
  +             this.valign = align;
  +     }
  +
  +    public int getVerticalAlign()
  +    {
  +             return this.valign;
  +     }
  +
  + public void setStartIndent(int startIndent)
  +   {
  +    xOffset = startIndent;
  +   }
  +
  +
  +
   }
  +
  +
  
  
  

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

Reply via email to