]> source.dussan.org Git - xmlgraphics-fop.git/commitdiff
Removing tab characters again
authorJeremias Maerki <jeremias@apache.org>
Mon, 1 Nov 2004 09:17:35 +0000 (09:17 +0000)
committerJeremias Maerki <jeremias@apache.org>
Mon, 1 Nov 2004 09:17:35 +0000 (09:17 +0000)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198115 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/fop/fo/StaticPropertyList.java
src/java/org/apache/fop/fo/properties/CommonFont.java
src/java/org/apache/fop/fo/properties/NumberProperty.java

index 77211b7a17efb6155ff11b74f0cf7db1949312ea..37699847a0f3fce3f234a13aac880cea4b374b8e 100755 (executable)
@@ -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;
     }
 
     /**
index 30e9ea09d56534416c875ee1146ca892260a3a7a..77fbe53c1e942662af5459b73bba0501448ba4b4 100755 (executable)
@@ -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;
+    }
 }
index ba943d1f0aed883da960788ed1def46d79eeb6b3..a93e68b55216de3d2e5ab8fadfcaf623da8707b7 100644 (file)
@@ -105,7 +105,7 @@ public class NumberProperty extends Property implements Numeric {
     }
 
     public int getValue() {
-       return number.intValue();
+        return number.intValue();
     }
 
     /**