cvs commit: xml-fop/src/org/apache/fop/area/inline Viewport.java Word.java Container.java InlineParent.java Character.java UnresolvedPageNumber.java ForeignObject.java InlineArea.java Anchor.java Leader.java Image.java FilledArea.java Space.java

2003-03-05 Thread jeremias 
jeremias2003/03/05 08:45:43

  Modified:src/org/apache/fop/area/inline Viewport.java Word.java
Container.java InlineParent.java Character.java
UnresolvedPageNumber.java ForeignObject.java
InlineArea.java Anchor.java Leader.java Image.java
FilledArea.java Space.java
  Log:
  Switched to long licence
  
  Revision  ChangesPath
  1.7   +49 -6 xml-fop/src/org/apache/fop/area/inline/Viewport.java
  
  Index: Viewport.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/inline/Viewport.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Viewport.java 14 Nov 2002 11:13:33 -  1.6
  +++ Viewport.java 5 Mar 2003 16:45:42 -   1.7
  @@ -1,10 +1,53 @@
   /*
* $Id$
  - * Copyright (C) 2001-2002 The Apache Software Foundation. All rights reserved.
  - * For details on use and redistribution please refer to the
  - * LICENSE file included with these sources.
  - */
  -
  + * 
  + *The Apache Software License, Version 1.1
  + * 
  + * 
  + * Copyright (C) 1999-2003 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
  + *[EMAIL PROTECTED]
  + * 
  + * 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 [EMAIL PROTECTED]. For more information on the Apache
  + * Software Foundation, please see http://www.apache.org/.
  + */ 
   package org.apache.fop.area.inline;
   
   import org.apache.fop.area.Area;
  
  
  
  1.10  +49 -6 xml-fop/src/org/apache/fop/area/inline/Word.java
  
  Index: Word.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/inline/Word.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Word.java 23 Jan 2003 18:59:08 -  1.9
  +++ Word.java 5 Mar 2003 16:45:42 -   1.10
  @@ -1,10 +1,53 @@
   /*
* $Id$
  - * Copyright (C) 2001-2002 The Apache Software Foundation. All rights reserved.
  - * For details on use and redistribution please refer to the
  - * LICENSE file included with these sources.
  - */
  -
  + * 
  + *The Apache Software License, Version 1.1
  + *

cvs commit: xml-fop/src/org/apache/fop/area/inline Viewport.java

2002-11-06 Thread keiron 
keiron  2002/11/06 07:07:04

  Modified:src/org/apache/fop/area Area.java RegionViewport.java
   src/org/apache/fop/area/inline Viewport.java
  Log:
  clone and serialize area traits
  
  Revision  ChangesPath
  1.12  +6 -2  xml-fop/src/org/apache/fop/area/Area.java
  
  Index: Area.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/Area.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Area.java 25 Oct 2002 09:29:39 -  1.11
  +++ Area.java 6 Nov 2002 15:07:04 -   1.12
  @@ -105,7 +105,11 @@
   
   private int areaClass = CLASS_NORMAL;
   private int ipd;
  -private HashMap props = null;
  +
  +/**
  + * Traits for this area stored in a HashMap
  + */
  +protected HashMap props = null;
   
   /**
* Get the area class of this area.
  
  
  
  1.6   +7 -1  xml-fop/src/org/apache/fop/area/RegionViewport.java
  
  Index: RegionViewport.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/RegionViewport.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RegionViewport.java   18 Sep 2002 13:50:13 -  1.5
  +++ RegionViewport.java   6 Nov 2002 15:07:04 -   1.6
  @@ -9,6 +9,7 @@
   
   import java.awt.geom.Rectangle2D;
   import java.io.IOException;
  +import java.util.HashMap;
   
   /**
* Region Viewport reference area.
  @@ -72,6 +73,7 @@
   out.writeFloat((float) viewArea.getWidth());
   out.writeFloat((float) viewArea.getHeight());
   out.writeBoolean(clip);
  +out.writeObject(props);
   out.writeObject(region);
   }
   
  @@ -80,6 +82,7 @@
   viewArea = new Rectangle2D.Float(in.readFloat(), in.readFloat(),
in.readFloat(), in.readFloat());
   clip = in.readBoolean();
  +props = (HashMap)in.readObject();
   setRegion((RegionReference) in.readObject());
   }
   
  @@ -92,6 +95,9 @@
   public Object clone() {
   RegionViewport rv = new RegionViewport((Rectangle2D)viewArea.clone());
   rv.region = (RegionReference)region.clone();
  +if(props != null) {
  +rv.props = (HashMap)props.clone();
  +}
   return rv;
   }
   }
  
  
  
  1.5   +4 -1  xml-fop/src/org/apache/fop/area/inline/Viewport.java
  
  Index: Viewport.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/inline/Viewport.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Viewport.java 18 Sep 2002 13:50:14 -  1.4
  +++ Viewport.java 6 Nov 2002 15:07:04 -   1.5
  @@ -12,6 +12,7 @@
   
   import java.io.IOException;
   import java.awt.geom.Rectangle2D;
  +import java.util.HashMap;
   
   /**
* Inline viewport area.
  @@ -100,6 +101,7 @@
   out.writeFloat((float) contentPosition.getHeight());
   }
   out.writeBoolean(clip);
  +//out.writeObject(props);
   out.writeObject(content);
   }
   
  @@ -112,6 +114,7 @@
   in.readFloat());
   }
   clip = in.readBoolean();
  +//props = (HashMap) in.readObject();
   content = (Area) in.readObject();
   }
   
  
  
  

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