You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by jo...@locus.apache.org on 2000/06/21 03:37:00 UTC

cvs commit: xml-fop/src/org/apache/fop/layout LinkSet.java Page.java

jordan      00/06/20 18:36:58

  Modified:    src/org/apache/fop/layout LinkSet.java Page.java
  Log:
  Added internal-link functionality
  
  Revision  Changes    Path
  1.6       +202 -191  xml-fop/src/org/apache/fop/layout/LinkSet.java
  
  Index: LinkSet.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/LinkSet.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LinkSet.java	2000/06/14 01:55:46	1.5
  +++ LinkSet.java	2000/06/21 01:36:54	1.6
  @@ -1,191 +1,202 @@
  -/*-- $Id: LinkSet.java,v 1.5 2000/06/14 01:55:46 arved Exp $ -- 
  -
  - ============================================================================
  -                   The Apache Software License, Version 1.1
  - ============================================================================
  - 
  -    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
  - 
  - Redistribution and use in source and binary forms, with or without modifica-
  - tion, are permitted provided that the following conditions are met:
  - 
  - 1. Redistributions of  source code must  retain the above copyright  notice,
  -    this list of conditions and the following disclaimer.
  - 
  - 2. Redistributions in binary form must reproduce the above copyright notice,
  -    this list of conditions and the following disclaimer in the documentation
  -    and/or other materials provided with the distribution.
  - 
  - 3. The end-user documentation included with the redistribution, if any, must
  -    include  the following  acknowledgment:  "This product includes  software
  -    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
  -    Alternately, this  acknowledgment may  appear in the software itself,  if
  -    and wherever such third-party acknowledgments normally appear.
  - 
  - 4. The names "FOP" and  "Apache Software Foundation"  must not be used to
  -    endorse  or promote  products derived  from this  software without  prior
  -    written permission. For written permission, please contact
  -    apache@apache.org.
  - 
  - 5. Products  derived from this software may not  be called "Apache", nor may
  -    "Apache" appear  in their name,  without prior written permission  of the
  -    Apache Software Foundation.
  - 
  - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  - APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  - INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  - DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  - ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  - (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - 
  - This software  consists of voluntary contributions made  by many individuals
  - on  behalf of the Apache Software  Foundation and was  originally created by
  - James Tauber <jt...@jtauber.com>. For more  information on the Apache 
  - Software Foundation, please see <http://www.apache.org/>.
  - 
  - */
  -
  -/* this class contributed by Arved Sandstrom with minor modifications
  -   by James Tauber */
  -
  -package org.apache.fop.layout;
  -
  -// Java
  -import java.util.Vector;
  -import java.util.Enumeration;
  -import java.awt.Rectangle;
  -
  -import org.apache.fop.fo.properties.WrapOption; // for enumerated
  -// values 
  -import org.apache.fop.fo.properties.WhiteSpaceTreatment; // for
  -// enumerated values 
  -import org.apache.fop.fo.properties.TextAlign; // for enumerated
  -// values 
  -import org.apache.fop.fo.properties.TextAlignLast; // for enumerated
  -// values 
  -
  -/**
  - * a set of rectangles on a page that are linked to a common
  - * destination
  - */
  -public class LinkSet {
  -
  -    /** the destination of the links */
  -    String externalDestination;
  -
  -    /** the set of rectangles */
  -    Vector rects = new Vector();
  -
  -    private int xoffset = 0;
  -    private int yoffset = 0;
  -    
  -    /* the maximum Y offset value encountered for this LinkSet*/
  -    private int maxY = 0;
  -
  -    protected int startIndent;
  -    protected int endIndent;
  -
  -    private Area area;
  -
  -    // property required for alignment adjustments
  -    int contentRectangleWidth = 0;
  -
  -    public LinkSet(String externalDest, Area area) {
  -	this.externalDestination = externalDest;
  -	this.area = area;
  -    }
  -    
  -    public void addRect(Rectangle r, LineArea lineArea) {
  -	LinkedRectangle linkedRectangle =
  -	    new LinkedRectangle(r, lineArea);
  -	linkedRectangle.setY(this.yoffset);
  -        if(this.yoffset>maxY)
  -        {
  -            maxY=this.yoffset;
  -        }
  -	rects.addElement(linkedRectangle);
  -    }
  -	
  -    public void setYOffset(int y) {
  -	this.yoffset = y;
  -    }
  -	
  -    public void setXOffset(int x) {
  -	this.xoffset = x;
  -    }
  -	
  -    public void setContentRectangleWidth(int contentRectangleWidth) {
  -	this.contentRectangleWidth = contentRectangleWidth;
  -    }
  -	
  -    public void applyAreaContainerOffsets(AreaContainer ac, Area area) {        
  -	int height=area.getAbsoluteHeight();
  -        BlockArea ba = (BlockArea)area;
  -        Enumeration re = rects.elements();                 
  -        while (re.hasMoreElements()) {
  -	    LinkedRectangle r = (LinkedRectangle)re.nextElement();
  -            r.setX(r.getX() + ac.getXPosition() + area.getTableCellXOffset() - ba.startIndent);             
  -            r.setY( ac.getYPosition() - height +(maxY-r.getY()) - ba.getHalfLeading());                    
  -         }
  -    }
  -	
  -    // intermediate implementation for joining all sublinks on same line
  -    public void mergeLinks() {
  -	int numRects = rects.size();
  -	if (numRects == 1)
  -	    return;
  -	
  -	LinkedRectangle curRect =
  -	    new LinkedRectangle((LinkedRectangle)rects.elementAt(0));
  -	Vector nv = new Vector();
  -		
  -	for (int ri=1; ri < numRects; ri++) {
  -	    LinkedRectangle r = (LinkedRectangle)rects.elementAt(ri);
  -	    
  -	    // yes, I'm really happy with comparing refs...
  -	    if (r.getLineArea() == curRect.getLineArea()) {
  -		curRect.setWidth( r.getX() + r.getWidth() - curRect.getX() );
  -	    } else {
  -		nv.addElement(curRect);
  -		curRect = new LinkedRectangle(r);
  -	    }
  -
  -	    if (ri == numRects-1)
  -		nv.addElement(curRect);
  -	}
  -	
  -	rects = nv;
  -    }
  -	
  -    public void align() {
  -	Enumeration re = rects.elements();
  -	while (re.hasMoreElements()) {
  -	    LinkedRectangle r = (LinkedRectangle)re.nextElement();
  -	    r.setX( r.getX() + r.getLineArea().getStartIndent() );
  -	}	
  -    }
  -
  -    public String getDest() {
  -	return this.externalDestination;
  -    }
  -
  -    public Vector getRects() {
  -	return this.rects;
  -    }
  -
  -    public int getEndIndent() {
  -	return endIndent;
  -    }
  -    
  -    public int getStartIndent() {
  -	return startIndent;
  -    }
  -    
  -    public Area getArea() {
  -	return area;
  -    }
  -}
  +/*-- $Id: LinkSet.java,v 1.6 2000/06/21 01:36:54 jordan Exp $ -- 
  +
  + ============================================================================
  +                   The Apache Software License, Version 1.1
  + ============================================================================
  + 
  +    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
  + 
  + Redistribution and use in source and binary forms, with or without modifica-
  + tion, are permitted provided that the following conditions are met:
  + 
  + 1. Redistributions of  source code must  retain the above copyright  notice,
  +    this list of conditions and the following disclaimer.
  + 
  + 2. Redistributions in binary form must reproduce the above copyright notice,
  +    this list of conditions and the following disclaimer in the documentation
  +    and/or other materials provided with the distribution.
  + 
  + 3. The end-user documentation included with the redistribution, if any, must
  +    include  the following  acknowledgment:  "This product includes  software
  +    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
  +    Alternately, this  acknowledgment may  appear in the software itself,  if
  +    and wherever such third-party acknowledgments normally appear.
  + 
  + 4. The names "FOP" and  "Apache Software Foundation"  must not be used to
  +    endorse  or promote  products derived  from this  software without  prior
  +    written permission. For written permission, please contact
  +    apache@apache.org.
  + 
  + 5. Products  derived from this software may not  be called "Apache", nor may
  +    "Apache" appear  in their name,  without prior written permission  of the
  +    Apache Software Foundation.
  + 
  + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  + FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  + APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  + INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  + DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  + OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  + ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  + (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  + 
  + This software  consists of voluntary contributions made  by many individuals
  + on  behalf of the Apache Software  Foundation and was  originally created by
  + James Tauber <jt...@jtauber.com>. For more  information on the Apache 
  + Software Foundation, please see <http://www.apache.org/>.
  + 
  + */
  +
  +/* this class contributed by Arved Sandstrom with minor modifications
  +   by James Tauber */
  +
  +package org.apache.fop.layout;
  +
  +// Java
  +import java.util.Vector;
  +import java.util.Enumeration;
  +import java.awt.Rectangle;
  +
  +import org.apache.fop.fo.properties.WrapOption; // for enumerated
  +// values 
  +import org.apache.fop.fo.properties.WhiteSpaceTreatment; // for
  +// enumerated values 
  +import org.apache.fop.fo.properties.TextAlign; // for enumerated
  +// values 
  +import org.apache.fop.fo.properties.TextAlignLast; // for enumerated
  +// values 
  +
  +/**
  + * a set of rectangles on a page that are linked to a common
  + * destination
  + */
  +public class LinkSet {
  +
  +    /** the destination of the links */
  +    String destination;
  +
  +    /** the set of rectangles */
  +    Vector rects = new Vector();
  +
  +    private int xoffset = 0;
  +    private int yoffset = 0;
  +    
  +    /* the maximum Y offset value encountered for this LinkSet*/
  +    private int maxY = 0;
  +
  +    protected int startIndent;
  +    protected int endIndent;
  +
  +    private int linkType;
  +
  +    private Area area;
  +
  +    public final static int 
  +        INTERNAL = 0,  // represents internal link
  +        EXTERNAL = 1;  // represents external link    
  +
  +    // property required for alignment adjustments
  +    int contentRectangleWidth = 0;
  +
  +    public LinkSet(String destination, Area area, int linkType) {
  +	this.destination = destination;
  +	this.area = area;
  +        this.linkType = linkType;
  +    }
  +    
  +    public void addRect(Rectangle r, LineArea lineArea) {
  +	LinkedRectangle linkedRectangle =
  +	    new LinkedRectangle(r, lineArea);
  +	linkedRectangle.setY(this.yoffset);
  +        if(this.yoffset>maxY)
  +        {
  +            maxY=this.yoffset;
  +        }
  +	rects.addElement(linkedRectangle);
  +    }
  +	
  +    public void setYOffset(int y) {
  +	this.yoffset = y;
  +    }
  +	
  +    public void setXOffset(int x) {
  +	this.xoffset = x;
  +    }
  +	
  +    public void setContentRectangleWidth(int contentRectangleWidth) {
  +	this.contentRectangleWidth = contentRectangleWidth;
  +    }
  +	
  +    public void applyAreaContainerOffsets(AreaContainer ac, Area area) {        
  +	int height=area.getAbsoluteHeight();
  +        BlockArea ba = (BlockArea)area;
  +        Enumeration re = rects.elements();                 
  +        while (re.hasMoreElements()) {
  +	    LinkedRectangle r = (LinkedRectangle)re.nextElement();
  +            r.setX(r.getX() + ac.getXPosition() + area.getTableCellXOffset() - ba.startIndent);             
  +            r.setY( ac.getYPosition() - height +(maxY-r.getY()) - ba.getHalfLeading());                    
  +         }
  +    }
  +	
  +    // intermediate implementation for joining all sublinks on same line
  +    public void mergeLinks() {
  +	int numRects = rects.size();
  +	if (numRects == 1)
  +	    return;
  +	
  +	LinkedRectangle curRect =
  +	    new LinkedRectangle((LinkedRectangle)rects.elementAt(0));
  +	Vector nv = new Vector();
  +		
  +	for (int ri=1; ri < numRects; ri++) {
  +	    LinkedRectangle r = (LinkedRectangle)rects.elementAt(ri);
  +	    
  +	    // yes, I'm really happy with comparing refs...
  +	    if (r.getLineArea() == curRect.getLineArea()) {
  +		curRect.setWidth( r.getX() + r.getWidth() - curRect.getX() );
  +	    } else {
  +		nv.addElement(curRect);
  +		curRect = new LinkedRectangle(r);
  +	    }
  +
  +	    if (ri == numRects-1)
  +		nv.addElement(curRect);
  +	}
  +	
  +	rects = nv;
  +    }
  +	
  +    public void align() {
  +	Enumeration re = rects.elements();
  +	while (re.hasMoreElements()) {
  +	    LinkedRectangle r = (LinkedRectangle)re.nextElement();
  +	    r.setX( r.getX() + r.getLineArea().getStartIndent() );
  +	}	
  +    }
  +
  +    public String getDest() {
  +	return this.destination;
  +    }
  +
  +    public Vector getRects() {
  +	return this.rects;
  +    }
  +
  +    public int getEndIndent() {
  +	return endIndent;
  +    }
  +    
  +    public int getStartIndent() {
  +	return startIndent;
  +    }
  +    
  +    public Area getArea() {
  +	return area;
  +    }
  +
  +    public int getLinkType(){
  +        return linkType;
  +    }
  +}
  
  
  
  1.7       +11 -1     xml-fop/src/org/apache/fop/layout/Page.java
  
  Index: Page.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/Page.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Page.java	1999/12/02 09:37:50	1.6
  +++ Page.java	2000/06/21 01:36:54	1.7
  @@ -1,4 +1,4 @@
  -/*-- $Id: Page.java,v 1.6 1999/12/02 09:37:50 jtauber Exp $ -- 
  +/*-- $Id: Page.java,v 1.7 2000/06/21 01:36:54 jordan Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -75,6 +75,8 @@
   
       protected Vector linkSets = new Vector();
   
  +    private Vector idList = new Vector();
  +
       Page(AreaTree areaTree, int height, int width) {
   	this.areaTree = areaTree;
   	this.height = height;
  @@ -152,5 +154,13 @@
   
       public boolean hasLinks() {
   	return (!this.linkSets.isEmpty());
  +    }
  +
  +    public void addToIDList(String id){
  +        idList.addElement(id);
  +    }
  +
  +    public Vector getIDList(){
  +        return idList;
       }
   }