Browse Source

style changes only


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196726 13f79535-47bb-0310-9956-ffa450edef68
tags/Root_Temp_KnuthStylePageBreaking
William Victor Mote 21 years ago
parent
commit
d9178c2add

+ 1
- 1
src/java/org/apache/fop/extensions/ExtensionElementMapping.java View File

@@ -66,7 +66,7 @@ public class ExtensionElementMapping extends ElementMapping {
* Constructor.
*/
public ExtensionElementMapping() {
URI = "http://xml.apache.org/fop/extensions";
namespaceURI = "http://xml.apache.org/fop/extensions";
}

/**

+ 5
- 1
src/java/org/apache/fop/fo/BoxPropShorthandParser.java View File

@@ -50,6 +50,9 @@
*/
package org.apache.fop.fo;

/**
* Shorthand property parser for Box properties
*/
public class BoxPropShorthandParser extends GenericShorthandParser {

/**
@@ -63,7 +66,8 @@ public class BoxPropShorthandParser extends GenericShorthandParser {
* Stores 1 to 4 values of same type.
* Set the given property based on the number of values set.
* Example: padding, border-width, border-color, border-style, margin
* @see org.apache.fop.fo.GenericShorthandParser#convertValueForProperty(String, Property.Maker, PropertyList)
* @see org.apache.fop.fo.GenericShorthandParser#convertValueForProperty(String,
* Property.Maker, PropertyList)
*/
protected Property convertValueForProperty(String propName,
Property.Maker maker,

+ 31
- 10
src/java/org/apache/fop/fo/CharacterProperty.java View File

@@ -3,34 +3,34 @@
* ============================================================================
* 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
* 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
@@ -42,18 +42,27 @@
* (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 <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo;

/**
* Superclass for properties that wrap a character value
*/
public class CharacterProperty extends Property {

/**
* Inner class for creating instances of CharacterProperty
*/
public static class Maker extends Property.Maker {

/**
* @param propName name of property for which a Maker should be created
*/
public Maker(String propName) {
super(propName);
}
@@ -68,18 +77,30 @@ public class CharacterProperty extends Property {

private char character;

/**
* @param character character value to be wrapped in this property
*/
public CharacterProperty(char character) {
this.character = character;
}

/**
* @return this.character cast as an Object
*/
public Object getObject() {
return new Character(character);
}

/**
* @return this.character
*/
public char getCharacter() {
return this.character;
}

/**
* @return this.character cast as a String
*/
public String getString() {
return new Character(character).toString();
}

+ 30
- 11
src/java/org/apache/fop/fo/ColorTypeProperty.java View File

@@ -3,34 +3,34 @@
* ============================================================================
* 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
* 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
@@ -42,20 +42,29 @@
* (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 <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo;

import org.apache.fop.datatypes.ColorType;

/**
* Superclass for properties that wrap ColorType values
*/
public class ColorTypeProperty extends Property {

/**
* Inner class for creating instances of ColorTypeProperty
*/
public static class Maker extends Property.Maker {

/**
* @param propName name of property for which a Maker should be created
*/
public Maker(String propName) {
super(propName);
}
@@ -76,15 +85,25 @@ public class ColorTypeProperty extends Property {

private ColorType colorType;

/**
* @param colorType color type object which is to be wrapped in this
* Property
*/
public ColorTypeProperty(ColorType colorType) {
this.colorType = colorType;
}

// Can't convert to any other types
/**
* Can't convert to any other types
* @return this.colorType
*/
public ColorType getColorType() {
return this.colorType;
}

/**
* @return this.colorType cast as an Object
*/
public Object getObject() {
return this.colorType;
}

+ 33
- 11
src/java/org/apache/fop/fo/CondLengthProperty.java View File

@@ -3,34 +3,34 @@
* ============================================================================
* 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
* 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
@@ -42,21 +42,30 @@
* (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 <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo;

import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.CondLength;

/**
* Superclass for properties that have conditional lengths
*/
public class CondLengthProperty extends Property {

/**
* Inner class for creating instances of CondLengthProperty
*/
public static class Maker extends Property.Maker {

/**
* @param name of property for which a Maker should be created
*/
public Maker(String name) {
super(name);
}
@@ -65,19 +74,32 @@ public class CondLengthProperty extends Property {

private CondLength condLength = null;

/**
* @param condLength conditional length object which is to be wrapped in
* this property
*/
public CondLengthProperty(CondLength condLength) {
this.condLength = condLength;
}

/**
* @return this.condLength
*/
public CondLength getCondLength() {
return this.condLength;
}

/* Question, should we allow this? */
/**
* TODO: Should we allow this?
* @return this.condLength cast as a Length
*/
public Length getLength() {
return this.condLength.getLength().getLength();
}

/**
* @return this.condLength cast as an Object
*/
public Object getObject() {
return this.condLength;
}

+ 19
- 18
src/java/org/apache/fop/fo/ElementMapping.java View File

@@ -3,34 +3,34 @@
* ============================================================================
* 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
* 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
@@ -42,29 +42,30 @@
* (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 <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo;

import java.util.HashMap;

/**
* Interface for adding supported element and property mappings to
* the given builder.
* Abstract base class for Element Mappings (including FO Element Mappings)
* which provide the framework of valid elements and attibutes for a given
* namespace.
*/
/** Abstract base class of FO Element Mappings. */
public abstract class ElementMapping {
/** constant for defining the default value */
public static final String DEFAULT = "<default>";

/** The HashMap table of formatting objects defined by the ElementMapping */
protected HashMap foObjs = null;

/** The namespace for the ElementMapping */
protected String URI = null;
protected String namespaceURI = null;

/**
* Returns a HashMap of maker objects for this element mapping
@@ -82,18 +83,18 @@ public abstract class ElementMapping {
* Returns the namespace URI for this element mapping
*
* @return Namespace URI for this element mapping
*/
*/
public String getNamespaceURI() {
return URI;
return namespaceURI;
}

/**
* Initializes the set of maker objects associated with this ElementMapping
*
*/
*/
protected abstract void initialize();

public static class Maker {

public FONode make(FONode parent) {
return null;
}

+ 30
- 10
src/java/org/apache/fop/fo/EnumProperty.java View File

@@ -3,34 +3,34 @@
* ============================================================================
* 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
* 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
@@ -42,26 +42,37 @@
* (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 <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo;

import org.apache.fop.apps.FOPException;

/**
* Superclass for properties that wrap an enumeration value
*/
public class EnumProperty extends Property {

/**
* Inner class for creating EnumProperty instances
*/
public static class Maker extends Property.Maker {

/**
* @param propName name of property for which a Maker should be created
*/
protected Maker(String propName) {
super(propName);
}

/**
* Called by subclass if no match found.
* @param value string containing the value to be checked
* @return null (indicates that an appropriate match was not found)
*/
public Property checkEnumValues(String value) {
//log.error("Unknown enumerated value for property '"
@@ -86,14 +97,23 @@ public class EnumProperty extends Property {

private int value;

/**
* @param explicitValue enumerated value to be set for this property
*/
public EnumProperty(int explicitValue) {
this.value = explicitValue;
}

/**
* @return this.value
*/
public int getEnum() {
return this.value;
}

/**
* @return this.value cast as an Object
*/
public Object getObject() {
// FIXME: return String value: property must reference maker
// return maker.getEnumValue(this.value);

+ 18
- 12
src/java/org/apache/fop/fo/FOElementMapping.java View File

@@ -3,34 +3,34 @@
* ============================================================================
* 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
* 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
@@ -42,12 +42,12 @@
* (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 <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo;

// Java
@@ -57,11 +57,17 @@ import java.util.HashMap;
* Element mapping class for all XSL-FO elements.
*/
public class FOElementMapping extends ElementMapping {

/**
* Basic constructor; inititializes the namespace URI for the fo: namespace
*/
public FOElementMapping() {
URI = "http://www.w3.org/1999/XSL/Format";
namespaceURI = "http://www.w3.org/1999/XSL/Format";
}

/**
* Initializes the collection of valid objects for the fo: namespace
*/
protected void initialize() {
if (foObjs == null) {
foObjs = new HashMap();

+ 6
- 0
src/java/org/apache/fop/fo/FONode.java View File

@@ -163,9 +163,15 @@ public abstract class FONode {
// do nothing by default
}

/**
* @param child child node to be added to the children of this node
*/
protected void addChild(FONode child) {
}

/**
* @return the parent node of this node
*/
public FONode getParent() {
return this.parent;
}

+ 1
- 1
src/java/org/apache/fop/fo/FOTreeBuilder.java View File

@@ -340,7 +340,7 @@ public class FOTreeBuilder extends DefaultHandler {
public boolean hasData() {
return (rootFObj != null);
}
}

// code stolen from org.apache.batik.util and modified slightly

+ 20
- 5
src/java/org/apache/fop/fo/FObj.java View File

@@ -150,7 +150,7 @@ public class FObj extends FONode {
* The attributes must be used immediately as the sax attributes
* will be altered for the next element.
* @param attlist Collection of attributes passed to us from the parser.
* @throws FOPException
* @throws FOPException for invalid FO data
*/
public void handleAttrs(Attributes attlist) throws FOPException {
properties = getListBuilder().makeList(FO_URI, name, attlist, this);
@@ -205,24 +205,33 @@ public class FObj extends FONode {
// if we got here, it is because parent is null
if (returnRoot) {
return p;
}
else {
} else {
return null;
}
}

/**
* For a given namespace, determine whether the properties of this object
* match that namespace.
* @param nameSpaceURI the namespace URI to be tested against
* @return this.properties, if the namespaces match; otherwise, null
*/
public PropertyList getPropertiesForNamespace(String nameSpaceURI) {
if (this.properties == null) {
return null;
}
if (! nameSpaceURI.equals(this.properties.getNameSpace())) {
if (!nameSpaceURI.equals(this.properties.getNameSpace())) {
return null;
}
return this.properties;
}

/**
* @param propertyList the collection of Property objects to be managed
* @return a PropertyManager for the Property objects
*/
protected PropertyManager makePropertyManager(
PropertyList propertyList) {
PropertyList propertyList) {
return new PropertyManager(propertyList);
}

@@ -405,10 +414,16 @@ public class FObj extends FONode {
}
}

/**
* @return true if there are any Markers attached to this object
*/
public boolean hasMarkers() {
return markers != null && !markers.isEmpty();
}

/**
* @return th collection of Markers attached to this object
*/
public Map getMarkers() {
return markers;
}

+ 1
- 1
src/java/org/apache/fop/svg/SVGElementMapping.java View File

@@ -68,7 +68,7 @@ public class SVGElementMapping extends ElementMapping {
private boolean batik = true;

public SVGElementMapping() {
URI = SVGDOMImplementation.SVG_NAMESPACE_URI;
namespaceURI = SVGDOMImplementation.SVG_NAMESPACE_URI;
}

protected void initialize() {

Loading…
Cancel
Save