You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-dev@xmlgraphics.apache.org by tk...@apache.org on 2002/04/11 17:00:27 UTC

cvs commit: xml-batik/sources/org/apache/batik/ext/awt/g2d TransformStackElement.java

tkormann    02/04/11 08:00:27

  Modified:    sources/org/apache/batik/ext/awt/g2d
                        TransformStackElement.java
  Log:
  fix a compilation prb
  
  Revision  Changes    Path
  1.4       +47 -46    xml-batik/sources/org/apache/batik/ext/awt/g2d/TransformStackElement.java
  
  Index: TransformStackElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/awt/g2d/TransformStackElement.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TransformStackElement.java	12 Oct 2001 07:59:05 -0000	1.3
  +++ TransformStackElement.java	11 Apr 2002 15:00:27 -0000	1.4
  @@ -17,9 +17,10 @@
    *
    * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
    * @author <a href="mailto:paul_evenblij@compuware.com">Paul Evenblij</a>
  - * @version $Id: TransformStackElement.java,v 1.3 2001/10/12 07:59:05 vhardy Exp $
  + * @version $Id: TransformStackElement.java,v 1.4 2002/04/11 15:00:27 tkormann Exp $
    */
  -abstract public class TransformStackElement implements Cloneable{
  +public abstract class TransformStackElement implements Cloneable{
  +
       /**
        * Transform type
        */
  @@ -34,12 +35,12 @@
        * @param type transform type
        * @param transformParameters parameters for transform
        */
  -    private TransformStackElement(TransformType type,
  -                                  double transformParameters[]){
  +    protected TransformStackElement(TransformType type,
  +                                    double transformParameters[]){
           this.type = type;
           this.transformParameters = transformParameters;
       }
  -
  +    
       /**
        * @return an object which is a deep copy of this one
        */
  @@ -58,59 +59,59 @@
           return newElement;
       }
   
  -    /**
  -     * @return a String describing this object
  -     */
  -    public String toString(){
  -        // return SVGTransform.convertTransform(this);
  -        return super.toString();
  -    }
  -
       /*
        * Factory methods
        */
   
  -    public static TransformStackElement createTranslateElement(double tx, double ty){
  -        return new TransformStackElement(TransformType.TRANSLATE, new double[]{ tx, ty }) {
  -                       boolean isIdentity(double[] parameters) {
  -                           return parameters[0] == 0 && parameters[1] == 0;
  -                       }
  -                   };
  +    public static TransformStackElement createTranslateElement(double tx, 
  +                                                               double ty){
  +        return new TransformStackElement(TransformType.TRANSLATE, 
  +                                         new double[]{ tx, ty }) {
  +                boolean isIdentity(double[] parameters) {
  +                    return parameters[0] == 0 && parameters[1] == 0;
  +                }
  +            };
       }
   
       public static TransformStackElement createRotateElement(double theta){
  -        return new TransformStackElement(TransformType.ROTATE, new double[]{ theta }) {
  -                       boolean isIdentity(double[] parameters) {
  -                           return Math.cos(parameters[0]) == 1;
  -                       }
  -                   };
  -    }
  -
  -    public static TransformStackElement createScaleElement(double scaleX, double scaleY){
  -        return new TransformStackElement(TransformType.SCALE, new double[]{ scaleX, scaleY }) {
  -                       boolean isIdentity(double[] parameters) {
  -                           return parameters[0] == 1 && parameters[1] == 1;
  -                       }
  -                   };
  -    }
  -
  -    public static TransformStackElement createShearElement(double shearX, double shearY){
  -        return new TransformStackElement(TransformType.SHEAR, new double[]{ shearX, shearY }) {
  -                       boolean isIdentity(double[] parameters) {
  -                           return parameters[0] == 0 && parameters[1] == 0;
  -                       }
  -                   };
  +        return new TransformStackElement(TransformType.ROTATE, 
  +                                         new double[]{ theta }) {
  +                boolean isIdentity(double[] parameters) {
  +                    return Math.cos(parameters[0]) == 1;
  +                }
  +            };
  +    }
  +
  +    public static TransformStackElement createScaleElement(double scaleX, 
  +                                                           double scaleY){
  +        return new TransformStackElement(TransformType.SCALE, 
  +                                         new double[]{ scaleX, scaleY }) {
  +                boolean isIdentity(double[] parameters) {
  +                    return parameters[0] == 1 && parameters[1] == 1;
  +                }
  +            };
  +    }
  +    
  +    public static TransformStackElement createShearElement(double shearX, 
  +                                                           double shearY){
  +        return new TransformStackElement(TransformType.SHEAR, 
  +                                         new double[]{ shearX, shearY }) {
  +                boolean isIdentity(double[] parameters) {
  +                    return parameters[0] == 0 && parameters[1] == 0;
  +                }
  +            };
       }
   
  -    public static TransformStackElement createGeneralTransformElement(AffineTransform txf){
  +    public static TransformStackElement createGeneralTransformElement
  +        (AffineTransform txf){
           double matrix[] = new double[6];
           txf.getMatrix(matrix);
           return new TransformStackElement(TransformType.GENERAL, matrix) {
  -                       boolean isIdentity(double[] m) {
  -                           return (m[0] == 1 && m[2] == 0 && m[4] == 0 &&
  -                                   m[1] == 0 && m[3] == 1 && m[5] == 0);
  -                       }
  -                   };
  +                boolean isIdentity(double[] m) {
  +                    return (m[0] == 1 && m[2] == 0 && m[4] == 0 &&
  +                            m[1] == 0 && m[3] == 1 && m[5] == 0);
  +                }
  +            };
       }
       
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org