From afcf5b2828f6461abfc04fa3a4cf358dc3bfe240 Mon Sep 17 00:00:00 2001 From: fotis Date: Sat, 11 Nov 2000 23:24:18 +0000 Subject: [PATCH] rename simple-link to basic-link for xsl:fo spec (18.10.2000) conformance git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193785 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/fop/fo/StandardElementMapping.java | 2 +- .../flow/{SimpleLink.java => BasicLink.java} | 75 +++++++++---------- 2 files changed, 38 insertions(+), 39 deletions(-) rename src/org/apache/fop/fo/flow/{SimpleLink.java => BasicLink.java} (85%) diff --git a/src/org/apache/fop/fo/StandardElementMapping.java b/src/org/apache/fop/fo/StandardElementMapping.java index f1f967301..7bb19c215 100644 --- a/src/org/apache/fop/fo/StandardElementMapping.java +++ b/src/org/apache/fop/fo/StandardElementMapping.java @@ -102,7 +102,7 @@ public class StandardElementMapping implements ElementMapping { builder.addMapping(uri, "table-body", TableBody.maker()); builder.addMapping(uri, "table-row", TableRow.maker()); builder.addMapping(uri, "table-cell", TableCell.maker()); - builder.addMapping(uri, "simple-link", SimpleLink.maker()); + builder.addMapping(uri, "basic-link", BasicLink.maker()); builder.addMapping(uri, "instream-foreign-object", InstreamForeignObject.maker()); builder.addMapping(uri, "leader", Leader.maker()); } diff --git a/src/org/apache/fop/fo/flow/SimpleLink.java b/src/org/apache/fop/fo/flow/BasicLink.java similarity index 85% rename from src/org/apache/fop/fo/flow/SimpleLink.java rename to src/org/apache/fop/fo/flow/BasicLink.java index 64e5f0a05..aa07d6f7a 100644 --- a/src/org/apache/fop/fo/flow/SimpleLink.java +++ b/src/org/apache/fop/fo/flow/BasicLink.java @@ -1,36 +1,35 @@ -/*-- $Id$ -- - +/* ============================================================================ 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 @@ -41,12 +40,12 @@ 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 . For more information on the Apache + James Tauber . For more information on the Apache Software Foundation, please see . - + */ /* this class contributed by Arved Sandstrom with minor modifications @@ -65,83 +64,83 @@ import org.apache.fop.datatypes.ColorType; import java.util.Enumeration; import java.awt.Rectangle; -public class SimpleLink extends FObjMixed { +public class BasicLink extends FObjMixed { public static class Maker extends FObj.Maker { public FObj make(FObj parent, PropertyList propertyList) - throws FOPException { - return new SimpleLink(parent, propertyList); + throws FOPException { + return new BasicLink(parent, propertyList); } } public static FObj.Maker maker() { - return new SimpleLink.Maker(); + return new BasicLink.Maker(); } - - public SimpleLink(FObj parent, PropertyList propertyList) + + public BasicLink(FObj parent, PropertyList propertyList) throws FOPException { super(parent, propertyList); - this.name = "fo:simple-link"; - + this.name = "fo:basic-link"; + if (parent.getName().equals("fo:flow")) { - throw new FOPException("simple-link can't be directly" - + " under flow"); + throw new FOPException("basic-link can't be directly" + + " under flow"); } } public Status layout(Area area) throws FOPException { String destination; int linkType; - + if ( !(destination = this.properties.get("internal-destination").getString()).equals("")) - { + { linkType=LinkSet.INTERNAL; } - else if ( !(destination = this.properties.get("external-destination").getString()).equals("") ) - { + else if ( !(destination = this.properties.get("external-destination").getString()).equals("") ) + { linkType=LinkSet.EXTERNAL; } else { - throw new FOPException("internal-destination or external-destination must be specified in simple-link"); + throw new FOPException("internal-destination or external-destination must be specified in basic-link"); } if (this.marker == START) { - // initialize id - String id = this.properties.get("id").getString(); - area.getIDReferences().initializeID(id,area); + // initialize id + String id = this.properties.get("id").getString(); + area.getIDReferences().initializeID(id,area); this.marker = 0; } - + // new LinkedArea to gather up inlines LinkSet ls = new LinkSet(destination, area, linkType); - + Page p = area.getPage(); // assumption - AS // should be able to retrieve this from somewhere - JT AreaContainer ac = p.getBody(); - + int numChildren = this.children.size(); for (int i = this.marker; i < numChildren; i++) { FONode fo = (FONode) children.elementAt(i); fo.setLinkSet(ls); - + Status status; if ((status = fo.layout(area)).isIncomplete()) { this.marker = i; return status; } } - + ls.applyAreaContainerOffsets(ac, area); - + // pass on command line String mergeLinks = System.getProperty( "links.merge" ); if ((null != mergeLinks) && !mergeLinks.equalsIgnoreCase("no")) { ls.mergeLinks(); } - + p.addLinkSet(ls); return new Status(Status.OK); -- 2.39.5