pbwest 2004/01/29 21:52:43
Added: src/java/org/apache/fop/area/inline Tag:
FOP_0-20-0_Alt-Design InlineArea.java
InlineContainer.java
Log:
Initial stubs.
Revision Changes Path
No revision
No revision
1.2.2.1 +29 -182 xml-fop/src/java/org/apache/fop/area/inline/InlineArea.java
Index: InlineArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/inline/InlineArea.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- InlineArea.java 10 Sep 2003 18:42:22 -0000 1.2
+++ InlineArea.java 30 Jan 2004 05:52:43 -0000 1.2.2.1
@@ -1,204 +1,51 @@
/*
- * $Id$
- * ============================================================================
- * 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.
+ * Copyright {YEARS} The Apache Software Foundation.
*
- * 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.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * 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.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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]
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
- * 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/>.
+ * Created on 30/01/2004
+ * $Id$
*/
package org.apache.fop.area.inline;
import org.apache.fop.area.Area;
-import org.apache.fop.area.Trait;
-import org.apache.fop.traits.BorderProps;
+import org.apache.fop.datastructs.Node;
/**
- * Inline Area
- * This area is for all inline areas that can be placed
- * in a line area.
- * Extensions of this class should render themselves with the
- * requested renderer.
+ * @author pbw
+ * @version $Revision$ $Name$
*/
public class InlineArea extends Area {
- // int width;
- private int height;
- /**
- * The content ipd of this inline area
- */
- protected int contentIPD = 0;
-
- /**
- * offset position from top of parent area
- */
- protected int verticalPosition = 0;
-
- /**
- * Handle a visitor (usually a renderer) for this inline area.
- * Inline areas that extend this class are expected
- * to pass themselves back to the visitor so that the visitor can process
- * them, usually by rendering them.
- *
- * @param visitor the InlineAreaVisitor that will process this
- */
- public void acceptVisitor(InlineAreaVisitor visitor) {
- }
-
- /**
- * Set the width of this inline area.
- * Currently sets the ipd.
- *
- * @param w the width
- */
- public void setWidth(int w) {
- contentIPD = w;
- }
-
- /**
- * Get the width of this inline area.
- * Currently gets the ipd.
- *
- * @return the width
- */
- public int getWidth() {
- return contentIPD;
- }
/**
- * Set the inline progression dimension of this inline area.
- *
- * @param ipd the inline progression dimension
+ * @param parent
+ * @param index
+ * @throws IndexOutOfBoundsException
*/
- public void setIPD(int ipd) {
- this.contentIPD = ipd;
+ public InlineArea(Node parent, int index)
+ throws IndexOutOfBoundsException {
+ super(parent, index);
+ // TODO Auto-generated constructor stub
}
/**
- * Get the inline progression dimension
- *
- * @return the inline progression dimension of this area
+ * @param parent
+ * @throws IndexOutOfBoundsException
*/
- public int getIPD() {
- return this.contentIPD;
+ public InlineArea(Node parent) throws IndexOutOfBoundsException {
+ super(parent);
+ // TODO Auto-generated constructor stub
}
- /**
- * Increase the inline progression dimensions of this area.
- * This is used for inline parent areas that contain mulitple child areas.
- *
- * @param ipd the inline progression to increase by
- */
- public void increaseIPD(int ipd) {
- this.contentIPD += ipd;
- }
-
- /**
- * Set the height of this inline area.
- *
- * @param h the height value to set
- */
- public void setHeight(int h) {
- height = h;
- }
-
- /**
- * Get the height of this inline area.
- *
- * @return the height of the inline area
- */
- public int getHeight() {
- return height;
- }
-
- /**
- * Get the allocation inline progression dimension of this area.
- * This adds the content, borders and the padding to find the
- * total allocated IPD.
- *
- * @return the total IPD allocation for this area
- */
- public int getAllocIPD() {
- // If start or end border or padding is non-zero, add to content IPD
- int iBP = contentIPD;
- Object t;
- if ((t = getTrait(Trait.PADDING_START)) != null) {
- iBP += ((Integer) t).intValue();
- }
- if ((t = getTrait(Trait.PADDING_END)) != null) {
- iBP += ((Integer) t).intValue();
- }
- if ((t = getTrait(Trait.BORDER_START)) != null) {
- iBP += ((BorderProps) t).width;
- }
- if ((t = getTrait(Trait.BORDER_END)) != null) {
- iBP += ((BorderProps) t).width;
- }
- return iBP;
- }
-
- /**
- * Set the offset of this inline area.
- * This is used to set the offset of the inline area
- * which is normally relative to the top of the line
- * or the baseline.
- *
- * @param v the offset
- */
- public void setOffset(int v) {
- verticalPosition = v;
- }
-
- /**
- * Get the offset of this inline area.
- * This returns the offset of the inline area
- * which is normally relative to the top of the line
- * or the baseline.
- *
- * @return the offset
- */
- public int getOffset() {
- return verticalPosition;
- }
}
-
1.1.2.1 +51 -0
xml-fop/src/java/org/apache/fop/area/inline/Attic/InlineContainer.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
