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 ar...@locus.apache.org on 2000/10/10 04:04:17 UTC

cvs commit: xml-fop/src/org/apache/fop/fo/flow Flow.java

arved       00/10/09 19:04:17

  Modified:    src/org/apache/fop/fo/flow Tag: fop-0_14_0_regions Flow.java
  Log:
  region-name/multiple flow support
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.4.1   +28 -3     xml-fop/src/org/apache/fop/fo/flow/Flow.java
  
  Index: Flow.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Flow.java,v
  retrieving revision 1.7
  retrieving revision 1.7.4.1
  diff -u -r1.7 -r1.7.4.1
  --- Flow.java	2000/07/13 17:35:42	1.7
  +++ Flow.java	2000/10/10 02:04:16	1.7.4.1
  @@ -1,4 +1,4 @@
  -/*-- $Id: Flow.java,v 1.7 2000/07/13 17:35:42 jordan Exp $ -- 
  +/*-- $Id: Flow.java,v 1.7.4.1 2000/10/10 02:04:16 arved Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -76,12 +76,16 @@
       }
   
       PageSequence pageSequence;
  -
  +	protected String flowName;
  +	protected Status currentStatus;
  +	
       protected Flow(FObj parent, PropertyList propertyList)
   	throws FOPException {
   	super(parent, propertyList);
   	this.name =  "fo:flow";
   
  +	currentStatus = new Status(Status.AREA_FULL_NONE);
  +	
   	if (parent.getName().equals("fo:page-sequence")) {
   	    this.pageSequence = (PageSequence) parent;
   	} else {
  @@ -89,7 +93,13 @@
   				   + "page-sequence, not "
   				   + parent.getName());
   	}
  -	pageSequence.setFlow(this);
  +	flowName = this.properties.get("flow-name").getString();
  +	if (flowName.equals(""))
  +	{
  +	    throw new FOPException("A 'flow-name' is required for fo:flow");
  +	}
  +	
  +	pageSequence.setFlow(flowName, this);
       }
   	
       public Status layout(Area area) throws FOPException {
  @@ -128,4 +138,19 @@
   	}
   	return new Status(Status.OK);
       }
  +	
  +	public Status getCurrentStatus()
  +	{
  +		return currentStatus;
  +	}
  +
  +	public void setCurrentStatus(Status currentStatus)
  +	{
  +		this.currentStatus = currentStatus;
  +	}
  +	
  +	public String getFlowName()
  +	{
  +		return flowName;
  +	}
   }