jeremias 2004/11/01 01:17:35
Modified: src/java/org/apache/fop/fo/properties CommonFont.java
NumberProperty.java
src/java/org/apache/fop/fo StaticPropertyList.java
Log:
Removing tab characters again
Revision Changes Path
1.4 +23 -23 xml-fop/src/java/org/apache/fop/fo/properties/CommonFont.java
Index: CommonFont.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/CommonFont.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CommonFont.java 28 Oct 2004 10:00:24 -0000 1.3
+++ CommonFont.java 1 Nov 2004 09:17:35 -0000 1.4
@@ -36,42 +36,42 @@
/**
* 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 @@
* 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) {
/[EMAIL PROTECTED] this is ugly. need to improve. */
@@ -126,6 +126,6 @@
FontMetrics metrics = fontInfo.getMetricsFor(fname);
fontState = new Font(fname, metrics, fontSize.getValue());
}
- return fontState;
- }
+ return fontState;
+ }
}
1.7 +2 -2
xml-fop/src/java/org/apache/fop/fo/properties/NumberProperty.java
Index: NumberProperty.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/NumberProperty.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NumberProperty.java 28 Oct 2004 15:21:54 -0000 1.6
+++ NumberProperty.java 1 Nov 2004 09:17:35 -0000 1.7
@@ -105,7 +105,7 @@
}
public int getValue() {
- return number.intValue();
+ return number.intValue();
}
/**
1.3 +9 -9 xml-fop/src/java/org/apache/fop/fo/StaticPropertyList.java
Index: StaticPropertyList.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/StaticPropertyList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StaticPropertyList.java 28 Oct 2004 10:00:20 -0000 1.2
+++ StaticPropertyList.java 1 Nov 2004 09:17:35 -0000 1.3
@@ -23,27 +23,27 @@
* 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 @@
* @param value The value of the property to set.
*/
public void putExplicit(int propId, Property value) {
- explicit[propId] = value;
+ explicit[propId] = value;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
