From: Jeremias Maerki Date: Mon, 1 Nov 2004 09:17:35 +0000 (+0000) Subject: Removing tab characters again X-Git-Tag: Root_Temp_KnuthStylePageBreaking~392 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=714a94ed55e147d3b4d8191075607ee121a2e95d;p=xmlgraphics-fop.git Removing tab characters again git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198115 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/fop/fo/StaticPropertyList.java b/src/java/org/apache/fop/fo/StaticPropertyList.java index 77211b7a1..37699847a 100755 --- a/src/java/org/apache/fop/fo/StaticPropertyList.java +++ b/src/java/org/apache/fop/fo/StaticPropertyList.java @@ -23,27 +23,27 @@ import org.apache.fop.fo.properties.Property; * the explit set properties and another array to store cached values. */ public class StaticPropertyList extends PropertyList { - private Property[] explicit; - private Property[] values; + private Property[] explicit; + private Property[] values; /** * Construct a StaticPropertyList. * @param fObjToAttach The FObj object. * @param parentPropertyList The parent property list. */ - public StaticPropertyList(FObj fObjToAttach, PropertyList parentPropertyList) { - super(fObjToAttach, parentPropertyList); - explicit = new Property[Constants.PROPERTY_COUNT + 1]; + public StaticPropertyList(FObj fObjToAttach, PropertyList parentPropertyList) { + super(fObjToAttach, parentPropertyList); + explicit = new Property[Constants.PROPERTY_COUNT + 1]; values = new Property[Constants.PROPERTY_COUNT + 1]; - } - + } + /** * Return the value explicitly specified on this FO. * @param propId The ID of the property whose value is desired. * @return The value if the property is explicitly set, otherwise null. */ public Property getExplicit(int propId) { - return explicit[propId]; + return explicit[propId]; } /** @@ -52,7 +52,7 @@ public class StaticPropertyList extends PropertyList { * @param value The value of the property to set. */ public void putExplicit(int propId, Property value) { - explicit[propId] = value; + explicit[propId] = value; } /** diff --git a/src/java/org/apache/fop/fo/properties/CommonFont.java b/src/java/org/apache/fop/fo/properties/CommonFont.java index 30e9ea09d..77fbe53c1 100755 --- a/src/java/org/apache/fop/fo/properties/CommonFont.java +++ b/src/java/org/apache/fop/fo/properties/CommonFont.java @@ -36,42 +36,42 @@ public class CommonFont { /** * The "font-family" property. */ - public String fontFamily; + public String fontFamily; /** * The "font-selection-strategy" property. */ - public int fontSelectionStrategy; + public int fontSelectionStrategy; /** * The "font-size" property. */ - public Length fontSize; + public Length fontSize; /** * The "font-stretch" property. */ - public int fontStretch; + public int fontStretch; /** * The "font-size-adjust" property. */ - public Numeric fontSizeAdjust; + public Numeric fontSizeAdjust; /** * The "font-style" property. */ - public String fontStyle; + public String fontStyle; /** * The "font-variant" property. */ - public int fontVariant; + public int fontVariant; /** * The "font-weight" property. */ - public String fontWeight; + public String fontWeight; private Font fontState; @@ -79,24 +79,24 @@ public class CommonFont { * Create a CommonFont object. * @param pList The PropertyList to get properties from. */ - public CommonFont(PropertyList pList) throws PropertyException { - fontFamily = pList.get(Constants.PR_FONT_FAMILY).getString(); - fontSelectionStrategy = pList.get(Constants.PR_FONT_SELECTION_STRATEGY).getEnum(); - fontSize = pList.get(Constants.PR_FONT_SIZE).getLength(); - fontStretch = pList.get(Constants.PR_FONT_STRETCH).getEnum(); - fontSizeAdjust = pList.get(Constants.PR_FONT_SIZE_ADJUST).getNumeric(); - fontStyle = pList.get(Constants.PR_FONT_STYLE).getString(); - fontVariant = pList.get(Constants.PR_FONT_VARIANT).getEnum(); - fontWeight = pList.get(Constants.PR_FONT_WEIGHT).getString(); - } - + public CommonFont(PropertyList pList) throws PropertyException { + fontFamily = pList.get(Constants.PR_FONT_FAMILY).getString(); + fontSelectionStrategy = pList.get(Constants.PR_FONT_SELECTION_STRATEGY).getEnum(); + fontSize = pList.get(Constants.PR_FONT_SIZE).getLength(); + fontStretch = pList.get(Constants.PR_FONT_STRETCH).getEnum(); + fontSizeAdjust = pList.get(Constants.PR_FONT_SIZE_ADJUST).getNumeric(); + fontStyle = pList.get(Constants.PR_FONT_STYLE).getString(); + fontVariant = pList.get(Constants.PR_FONT_VARIANT).getEnum(); + fontWeight = pList.get(Constants.PR_FONT_WEIGHT).getString(); + } + /** * Create and return a Font object based on the properties. * * @param fontInfo * @return a Font object. */ - public Font getFontState(FontInfo fontInfo) { + public Font getFontState(FontInfo fontInfo) { if (fontState == null) { /**@todo this is ugly. need to improve. */ @@ -126,6 +126,6 @@ public class CommonFont { FontMetrics metrics = fontInfo.getMetricsFor(fname); fontState = new Font(fname, metrics, fontSize.getValue()); } - return fontState; - } + return fontState; + } } diff --git a/src/java/org/apache/fop/fo/properties/NumberProperty.java b/src/java/org/apache/fop/fo/properties/NumberProperty.java index ba943d1f0..a93e68b55 100644 --- a/src/java/org/apache/fop/fo/properties/NumberProperty.java +++ b/src/java/org/apache/fop/fo/properties/NumberProperty.java @@ -105,7 +105,7 @@ public class NumberProperty extends Property implements Numeric { } public int getValue() { - return number.intValue(); + return number.intValue(); } /**