cvs commit: xml-fop/src/java/org/apache/fop/render/rtf TextAttributesConverter.java

[jeremias]

jeremias    2004/11/01 01:32:25

  Modified:    src/java/org/apache/fop/fo/properties EnumNumber.java
                        EnumLength.java
               src/java/org/apache/fop/render/rtf
                        TextAttributesConverter.java
  Log:
  Now compiles under JDK 5.0
  
  Revision  Changes    Path
  1.2       +9 -9      xml-fop/src/java/org/apache/fop/fo/properties/EnumNumber.java
  
  Index: EnumNumber.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/EnumNumber.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EnumNumber.java   28 Oct 2004 15:21:54 -0000      1.1
  +++ EnumNumber.java   1 Nov 2004 09:32:25 -0000       1.2
  @@ -22,15 +22,15 @@
    * A number quantity in XSL which is specified as an enum, such as "no-limit".
    */
   public class EnumNumber extends NumberProperty {
  -    private Property enum;
  +    private Property enumProperty;
       
  -    public EnumNumber(Property enum) {
  +    public EnumNumber(Property enumProperty) {
           super(null);
  -        this.enum = enum;
  +        this.enumProperty = enumProperty;
       }
   
       public int getEnum() {
  -        return enum.getEnum();
  +        return enumProperty.getEnum();
       }
   
       /**
  @@ -38,7 +38,7 @@
        * @return the length in millipoints
        */
       public int getValue() {
  -        log.error("getValue() called on " + enum + " number");
  +        log.error("getValue() called on " + enumProperty + " number");
           return 0;
       }
   
  @@ -47,7 +47,7 @@
        * @return the length in millipoints
        */
       public double getNumericValue() {
  -        log.error("getNumericValue() called on " + enum + " number");
  +        log.error("getNumericValue() called on " + enumProperty + " number");
           return 0;
       }
   
  @@ -55,14 +55,14 @@
        * @see org.apache.fop.fo.properties.Property#getString()
        */
       public String getString() {
  -        return enum.toString();
  +        return enumProperty.toString();
       }
   
       /**
        * @see org.apache.fop.fo.properties.Property#getString()
        */
       public Object getObject() {
  -        return enum.getObject();
  +        return enumProperty.getObject();
       }
   
   
  
  
  
  1.2       +9 -9      xml-fop/src/java/org/apache/fop/fo/properties/EnumLength.java
  
  Index: EnumLength.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/EnumLength.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EnumLength.java   28 Oct 2004 15:21:54 -0000      1.1
  +++ EnumLength.java   1 Nov 2004 09:32:25 -0000       1.2
  @@ -22,17 +22,17 @@
    * A length quantity in XSL which is specified as an enum, such as "auto"
    */
   public class EnumLength extends LengthProperty {
  -    private Property enum;
  +    private Property enumProperty;
       
  -    public EnumLength(Property enum) {
  -        this.enum = enum;
  +    public EnumLength(Property enumProperty) {
  +        this.enumProperty = enumProperty;
       }
   
       /**
        * @see org.apache.fop.datatypes.Numeric#getEnum()
        */
       public int getEnum() {
  -        return enum.getEnum();
  +        return enumProperty.getEnum();
       }
   
       public boolean isAbsolute() {
  @@ -43,7 +43,7 @@
        * @return the length in millipoints
        */
       public int getValue() {
  -        log.error("getValue() called on " + enum + " length");
  +        log.error("getValue() called on " + enumProperty + " length");
           return 0;
       }
   
  @@ -52,7 +52,7 @@
        * @return the length in millipoints
        */
       public double getNumericValue() {
  -        log.error("getNumericValue() called on " + enum + " number");
  +        log.error("getNumericValue() called on " + enumProperty + " number");
           return 0;
       }
   
  @@ -60,14 +60,14 @@
        * @see org.apache.fop.fo.properties.Property#getString()
        */
       public String getString() {
  -        return enum.toString();
  +        return enumProperty.toString();
       }
   
       /**
        * @see org.apache.fop.fo.properties.Property#getString()
        */
       public Object getObject() {
  -        return enum.getObject();
  +        return enumProperty.getObject();
       }
   
   
  
  
  
  1.20      +3 -3      
xml-fop/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java
  
  Index: TextAttributesConverter.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- TextAttributesConverter.java      28 Oct 2004 15:21:54 -0000      1.19
  +++ TextAttributesConverter.java      1 Nov 2004 09:32:25 -0000       1.20
  @@ -196,9 +196,9 @@
       }
       */
   
  -    private static void attrBlockTextAlign(int enum, RtfAttributes rtfAttr) {
  +    private static void attrBlockTextAlign(int alignment, RtfAttributes rtfAttr) {
           String rtfValue = null;
  -        switch (enum) {
  +        switch (alignment) {
               case Constants.CENTER:
                   rtfValue = RtfText.ALIGN_CENTER;
                   break;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]