xmlgraphics-batik-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r489964 [2/3] - in /xmlgraphics/batik/trunk/sources/org/apache/batik: dom/svg/ extension/
Date Sun, 24 Dec 2006 01:30:26 GMT
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEBlendElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEBlendElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEBlendElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEBlendElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -158,43 +157,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn1(), val);
-                return;
-            } else if (ln.equals(SVG_IN2_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn2(), val);
-                return;
-            } else if (ln.equals(SVG_MODE_ATTRIBUTE)) {
-                updateEnumerationAttributeValue(getMode(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                return getBaseValue(getIn1());
-            } else if (ln.equals(SVG_IN2_ATTRIBUTE)) {
-                return getBaseValue(getIn2());
-            } else if (ln.equals(SVG_MODE_ATTRIBUTE)) {
-                return getBaseValue(getMode());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEColorMatrixElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEColorMatrixElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEColorMatrixElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEColorMatrixElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -157,43 +156,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn1(), val);
-                return;
-            } else if (ln.equals(SVG_TYPE_ATTRIBUTE)) {
-                updateEnumerationAttributeValue(getType(), val);
-                return;
-            } else if (ln.equals(SVG_VALUES_ATTRIBUTE)) {
-                updateNumberListAttributeValue(getValues(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                return getBaseValue(getIn1());
-            } else if (ln.equals(SVG_TYPE_ATTRIBUTE)) {
-                return getBaseValue(getType());
-            } else if (ln.equals(SVG_VALUES_ATTRIBUTE)) {
-                return getBaseValue(getValues());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEComponentTransferElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEComponentTransferElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEComponentTransferElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEComponentTransferElement.java Sat Dec 23 17:30:23 2006
@@ -20,7 +20,6 @@
 
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.util.SVGTypes;
 
 import org.w3c.dom.Node;
@@ -112,33 +111,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn1(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                return getBaseValue(getIn1());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFECompositeElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFECompositeElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFECompositeElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFECompositeElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -218,63 +217,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn1(), val);
-                return;
-            } else if (ln.equals(SVG_IN2_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn2(), val);
-                return;
-            } else if (ln.equals(SVG_OPERATOR_ATTRIBUTE)) {
-                updateEnumerationAttributeValue(getOperator(), val);
-                return;
-            } else if (ln.equals(SVG_K1_ATTRIBUTE)) {
-                updateNumberAttributeValue(getK1(), val);
-                return;
-            } else if (ln.equals(SVG_K2_ATTRIBUTE)) {
-                updateNumberAttributeValue(getK2(), val);
-                return;
-            } else if (ln.equals(SVG_K3_ATTRIBUTE)) {
-                updateNumberAttributeValue(getK3(), val);
-                return;
-            } else if (ln.equals(SVG_K4_ATTRIBUTE)) {
-                updateNumberAttributeValue(getK4(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                return getBaseValue(getIn1());
-            } else if (ln.equals(SVG_IN2_ATTRIBUTE)) {
-                return getBaseValue(getIn2());
-            } else if (ln.equals(SVG_OPERATOR_ATTRIBUTE)) {
-                return getBaseValue(getOperator());
-            } else if (ln.equals(SVG_K1_ATTRIBUTE)) {
-                return getBaseValue(getK1());
-            } else if (ln.equals(SVG_K2_ATTRIBUTE)) {
-                return getBaseValue(getK2());
-            } else if (ln.equals(SVG_K3_ATTRIBUTE)) {
-                return getBaseValue(getK3());
-            } else if (ln.equals(SVG_K4_ATTRIBUTE)) {
-                return getBaseValue(getK4());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEConvolveMatrixElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEConvolveMatrixElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEConvolveMatrixElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEConvolveMatrixElement.java Sat Dec 23 17:30:23 2006
@@ -18,8 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
-import org.apache.batik.anim.values.AnimatableNumberOptionalNumberValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -264,103 +262,70 @@
 
     // AnimationTarget ///////////////////////////////////////////////////////
 
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_KERNEL_MATRIX_ATTRIBUTE)) {
-                updateNumberListAttributeValue(getKernelMatrix(), val);
-                return;
-            } else if (ln.equals(SVG_DIVISOR_ATTRIBUTE)) {
-                updateNumberAttributeValue(getDivisor(), val);
-                return;
-            } else if (ln.equals(SVG_BIAS_ATTRIBUTE)) {
-                updateNumberAttributeValue(getBias(), val);
-                return;
-            } else if (ln.equals(SVG_TARGET_X_ATTRIBUTE)) {
-                updateIntegerAttributeValue(getTargetX(), val);
-                return;
-            } else if (ln.equals(SVG_TARGET_Y_ATTRIBUTE)) {
-                updateIntegerAttributeValue(getTargetY(), val);
-                return;
-            } else if (ln.equals(SVG_EDGE_MODE_ATTRIBUTE)) {
-                updateEnumerationAttributeValue(getEdgeMode(), val);
-                return;
-            } else if (ln.equals(SVG_PRESERVE_ALPHA_ATTRIBUTE)) {
-                updateBooleanAttributeValue(getPreserveAlpha(), val);
-                return;
-            } else if (ln.equals(SVG_ORDER_ATTRIBUTE)) {
-                // XXX Needs testing.
-                if (val == null) {
-                    updateIntegerAttributeValue(getOrderX(), null);
-                    updateIntegerAttributeValue(getOrderY(), null);
-                } else {
-                    AnimatableNumberOptionalNumberValue anonv =
-                        (AnimatableNumberOptionalNumberValue) val;
-                    SVGOMAnimatedInteger ai =
-                        (SVGOMAnimatedInteger) getOrderX();
-                    ai.setAnimatedValue(Math.round(anonv.getNumber()));
-                    ai = (SVGOMAnimatedInteger) getOrderY();
-                    if (anonv.hasOptionalNumber()) {
-                        ai.setAnimatedValue
-                            (Math.round(anonv.getOptionalNumber()));
-                    } else {
-                        ai.setAnimatedValue(Math.round(anonv.getNumber()));
-                    }
-                }
-                return;
-            } else if (ln.equals(SVG_KERNEL_UNIT_LENGTH_ATTRIBUTE)) {
-                // XXX Needs testing.
-                if (val == null) {
-                    updateNumberAttributeValue(getKernelUnitLengthX(), null);
-                    updateNumberAttributeValue(getKernelUnitLengthY(), null);
-                } else {
-                    AnimatableNumberOptionalNumberValue anonv =
-                        (AnimatableNumberOptionalNumberValue) val;
-                    SVGOMAnimatedNumber an =
-                        (SVGOMAnimatedNumber) getKernelUnitLengthX();
-                    an.setAnimatedValue(anonv.getNumber());
-                    an = (SVGOMAnimatedNumber) getKernelUnitLengthY();
-                    if (anonv.hasOptionalNumber()) {
-                        an.setAnimatedValue(anonv.getOptionalNumber());
-                    } else {
-                        an.setAnimatedValue(anonv.getNumber());
-                    }
-                }
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_KERNEL_MATRIX_ATTRIBUTE)) {
-                return getBaseValue(getKernelMatrix());
-            } else if (ln.equals(SVG_DIVISOR_ATTRIBUTE)) {
-                return getBaseValue(getDivisor());
-            } else if (ln.equals(SVG_BIAS_ATTRIBUTE)) {
-                return getBaseValue(getBias());
-            } else if (ln.equals(SVG_TARGET_X_ATTRIBUTE)) {
-                return getBaseValue(getTargetX());
-            } else if (ln.equals(SVG_TARGET_Y_ATTRIBUTE)) {
-                return getBaseValue(getTargetY());
-            } else if (ln.equals(SVG_EDGE_MODE_ATTRIBUTE)) {
-                return getBaseValue(getEdgeMode());
-            } else if (ln.equals(SVG_PRESERVE_ALPHA_ATTRIBUTE)) {
-                return getBaseValue(getPreserveAlpha());
-            } else if (ln.equals(SVG_ORDER_ATTRIBUTE)) {
-                return getBaseValue(getOrderX(), getOrderY());
-            } else if (ln.equals(SVG_KERNEL_UNIT_LENGTH_ATTRIBUTE)) {
-                return getBaseValue(getKernelUnitLengthX(),
-                                    getKernelUnitLengthY());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
-    }
+// XXX TBD
+//
+//     /**
+//      * Updates an attribute value in this target.
+//      */
+//     public void updateAttributeValue(String ns, String ln,
+//                                      AnimatableValue val) {
+//         if (ns == null) {
+//             if (ln.equals(SVG_ORDER_ATTRIBUTE)) {
+//                 if (val == null) {
+//                 // XXX Needs testing.
+//                     updateIntegerAttributeValue(getOrderX(), null);
+//                     updateIntegerAttributeValue(getOrderY(), null);
+//                 } else {
+//                     AnimatableNumberOptionalNumberValue anonv =
+//                         (AnimatableNumberOptionalNumberValue) val;
+//                     SVGOMAnimatedInteger ai =
+//                         (SVGOMAnimatedInteger) getOrderX();
+//                     ai.setAnimatedValue(Math.round(anonv.getNumber()));
+//                     ai = (SVGOMAnimatedInteger) getOrderY();
+//                     if (anonv.hasOptionalNumber()) {
+//                         ai.setAnimatedValue
+//                             (Math.round(anonv.getOptionalNumber()));
+//                     } else {
+//                         ai.setAnimatedValue(Math.round(anonv.getNumber()));
+//                     }
+//                 }
+//                 return;
+//             } else if (ln.equals(SVG_KERNEL_UNIT_LENGTH_ATTRIBUTE)) {
+//                 // XXX Needs testing.
+//                 if (val == null) {
+//                     updateNumberAttributeValue(getKernelUnitLengthX(), null);
+//                     updateNumberAttributeValue(getKernelUnitLengthY(), null);
+//                 } else {
+//                     AnimatableNumberOptionalNumberValue anonv =
+//                         (AnimatableNumberOptionalNumberValue) val;
+//                     SVGOMAnimatedNumber an =
+//                         (SVGOMAnimatedNumber) getKernelUnitLengthX();
+//                     an.setAnimatedValue(anonv.getNumber());
+//                     an = (SVGOMAnimatedNumber) getKernelUnitLengthY();
+//                     if (anonv.hasOptionalNumber()) {
+//                         an.setAnimatedValue(anonv.getOptionalNumber());
+//                     } else {
+//                         an.setAnimatedValue(anonv.getNumber());
+//                     }
+//                 }
+//                 return;
+//             }
+//         }
+//         super.updateAttributeValue(ns, ln, val);
+//     }
+// 
+//     /**
+//      * Returns the underlying value of an animatable XML attribute.
+//      */
+//     public AnimatableValue getUnderlyingValue(String ns, String ln) {
+//         if (ns == null) {
+//             if (ln.equals(SVG_KERNEL_UNIT_LENGTH_ATTRIBUTE)) {
+//                 return getBaseValue(getKernelUnitLengthX(),
+//                                     getKernelUnitLengthY());
+//             } else if (ln.equals(SVG_ORDER_ATTRIBUTE)) {
+//                 return getBaseValue(getOrderX(), getOrderY());
+//             }
+//         }
+//         return super.getUnderlyingValue(ns, ln);
+//     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDiffuseLightingElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDiffuseLightingElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDiffuseLightingElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDiffuseLightingElement.java Sat Dec 23 17:30:23 2006
@@ -18,8 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableNumberOptionalNumberValue;
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -170,61 +168,48 @@
 
     // AnimationTarget ///////////////////////////////////////////////////////
 
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn1(), val);
-                return;
-            } else if (ln.equals(SVG_SURFACE_SCALE_ATTRIBUTE)) {
-                updateNumberAttributeValue(getSurfaceScale(), val);
-                return;
-            } else if (ln.equals(SVG_DIFFUSE_CONSTANT_ATTRIBUTE)) {
-                updateNumberAttributeValue(getDiffuseConstant(), val);
-                return;
-            } else if (ln.equals(SVG_KERNEL_UNIT_LENGTH_ATTRIBUTE)) {
-                // XXX Needs testing.
-                if (val == null) {
-                    updateNumberAttributeValue(getKernelUnitLengthX(), null);
-                    updateNumberAttributeValue(getKernelUnitLengthY(), null);
-                } else {
-                    AnimatableNumberOptionalNumberValue anonv =
-                        (AnimatableNumberOptionalNumberValue) val;
-                    SVGOMAnimatedNumber an =
-                        (SVGOMAnimatedNumber) getKernelUnitLengthX();
-                    an.setAnimatedValue(anonv.getNumber());
-                    an = (SVGOMAnimatedNumber) getKernelUnitLengthY();
-                    if (anonv.hasOptionalNumber()) {
-                        an.setAnimatedValue(anonv.getOptionalNumber());
-                    } else {
-                        an.setAnimatedValue(anonv.getNumber());
-                    }
-                }
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                return getBaseValue(getIn1());
-            } else if (ln.equals(SVG_SURFACE_SCALE_ATTRIBUTE)) {
-                return getBaseValue(getSurfaceScale());
-            } else if (ln.equals(SVG_DIFFUSE_CONSTANT_ATTRIBUTE)) {
-                return getBaseValue(getDiffuseConstant());
-            } else if (ln.equals(SVG_KERNEL_UNIT_LENGTH_ATTRIBUTE)) {
-                return getBaseValue(getKernelUnitLengthX(),
-                                    getKernelUnitLengthY());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
-    }
+// XXX TBD
+//
+//     /**
+//      * Updates an attribute value in this target.
+//      */
+//     public void updateAttributeValue(String ns, String ln,
+//                                      AnimatableValue val) {
+//         if (ns == null) {
+//             if (ln.equals(SVG_KERNEL_UNIT_LENGTH_ATTRIBUTE)) {
+//                 // XXX Needs testing.
+//                 if (val == null) {
+//                     updateNumberAttributeValue(getKernelUnitLengthX(), null);
+//                     updateNumberAttributeValue(getKernelUnitLengthY(), null);
+//                 } else {
+//                     AnimatableNumberOptionalNumberValue anonv =
+//                         (AnimatableNumberOptionalNumberValue) val;
+//                     SVGOMAnimatedNumber an =
+//                         (SVGOMAnimatedNumber) getKernelUnitLengthX();
+//                     an.setAnimatedValue(anonv.getNumber());
+//                     an = (SVGOMAnimatedNumber) getKernelUnitLengthY();
+//                     if (anonv.hasOptionalNumber()) {
+//                         an.setAnimatedValue(anonv.getOptionalNumber());
+//                     } else {
+//                         an.setAnimatedValue(anonv.getNumber());
+//                     }
+//                 }
+//                 return;
+//             }
+//         }
+//         super.updateAttributeValue(ns, ln, val);
+//     }
+// 
+//     /**
+//      * Returns the underlying value of an animatable XML attribute.
+//      */
+//     public AnimatableValue getUnderlyingValue(String ns, String ln) {
+//         if (ns == null) {
+//             if (ln.equals(SVG_KERNEL_UNIT_LENGTH_ATTRIBUTE)) {
+//                 return getBaseValue(getKernelUnitLengthX(),
+//                                     getKernelUnitLengthY());
+//             }
+//         }
+//         return super.getUnderlyingValue(ns, ln);
+//     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDisplacementMapElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDisplacementMapElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDisplacementMapElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDisplacementMapElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -196,53 +195,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn1(), val);
-                return;
-            } else if (ln.equals(SVG_IN2_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn2(), val);
-                return;
-            } else if (ln.equals(SVG_SCALE_ATTRIBUTE)) {
-                updateNumberAttributeValue(getScale(), val);
-                return;
-            } else if (ln.equals(SVG_X_CHANNEL_SELECTOR_ATTRIBUTE)) {
-                updateEnumerationAttributeValue(getXChannelSelector(), val);
-                return;
-            } else if (ln.equals(SVG_Y_CHANNEL_SELECTOR_ATTRIBUTE)) {
-                updateEnumerationAttributeValue(getYChannelSelector(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                return getBaseValue(getIn1());
-            } else if (ln.equals(SVG_IN2_ATTRIBUTE)) {
-                return getBaseValue(getIn2());
-            } else if (ln.equals(SVG_SCALE_ATTRIBUTE)) {
-                return getBaseValue(getScale());
-            } else if (ln.equals(SVG_X_CHANNEL_SELECTOR_ATTRIBUTE)) {
-                return getBaseValue(getXChannelSelector());
-            } else if (ln.equals(SVG_Y_CHANNEL_SELECTOR_ATTRIBUTE)) {
-                return getBaseValue(getYChannelSelector());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDistantLightElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDistantLightElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDistantLightElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDistantLightElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -127,38 +126,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_AZIMUTH_ATTRIBUTE)) {
-                updateNumberAttributeValue(getAzimuth(), val);
-                return;
-            } else if (ln.equals(SVG_ELEVATION_ATTRIBUTE)) {
-                updateNumberAttributeValue(getElevation(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_AZIMUTH_ATTRIBUTE)) {
-                return getBaseValue(getAzimuth());
-            } else if (ln.equals(SVG_ELEVATION_ATTRIBUTE)) {
-                return getBaseValue(getElevation());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEFloodElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEFloodElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEFloodElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEFloodElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -112,33 +111,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn1(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                return getBaseValue(getIn1());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEGaussianBlurElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEGaussianBlurElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEGaussianBlurElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEGaussianBlurElement.java Sat Dec 23 17:30:23 2006
@@ -20,8 +20,6 @@
 
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
-import org.apache.batik.anim.values.AnimatableNumberOptionalNumberValue;
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.util.SVGTypes;
 
 import org.w3c.dom.Node;
@@ -146,50 +144,47 @@
 
     // AnimationTarget ///////////////////////////////////////////////////////
 
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn1(), val);
-                return;
-            } else if (ln.equals(SVG_STD_DEVIATION_ATTRIBUTE)) {
-                // XXX Needs testing.
-                if (val == null) {
-                    updateNumberAttributeValue(getStdDeviationX(), null);
-                    updateNumberAttributeValue(getStdDeviationY(), null);
-                } else {
-                    AnimatableNumberOptionalNumberValue anonv =
-                        (AnimatableNumberOptionalNumberValue) val;
-                    SVGOMAnimatedNumber an =
-                        (SVGOMAnimatedNumber) getStdDeviationX();
-                    an.setAnimatedValue(anonv.getNumber());
-                    an = (SVGOMAnimatedNumber) getStdDeviationY();
-                    if (anonv.hasOptionalNumber()) {
-                        an.setAnimatedValue(anonv.getOptionalNumber());
-                    } else {
-                        an.setAnimatedValue(anonv.getNumber());
-                    }
-                }
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                return getBaseValue(getIn1());
-            } else if (ln.equals(SVG_STD_DEVIATION_ATTRIBUTE)) {
-                return getBaseValue(getStdDeviationX(), getStdDeviationY());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
-    }
+// XXX TBD
+//
+//     /**
+//      * Updates an attribute value in this target.
+//      */
+//     public void updateAttributeValue(String ns, String ln,
+//                                      AnimatableValue val) {
+//         if (ns == null) {
+//             if (ln.equals(SVG_STD_DEVIATION_ATTRIBUTE)) {
+//                 // XXX Needs testing.
+//                 if (val == null) {
+//                     updateNumberAttributeValue(getStdDeviationX(), null);
+//                     updateNumberAttributeValue(getStdDeviationY(), null);
+//                 } else {
+//                     AnimatableNumberOptionalNumberValue anonv =
+//                         (AnimatableNumberOptionalNumberValue) val;
+//                     SVGOMAnimatedNumber an =
+//                         (SVGOMAnimatedNumber) getStdDeviationX();
+//                     an.setAnimatedValue(anonv.getNumber());
+//                     an = (SVGOMAnimatedNumber) getStdDeviationY();
+//                     if (anonv.hasOptionalNumber()) {
+//                         an.setAnimatedValue(anonv.getOptionalNumber());
+//                     } else {
+//                         an.setAnimatedValue(anonv.getNumber());
+//                     }
+//                 }
+//                 return;
+//             }
+//         }
+//         super.updateAttributeValue(ns, ln, val);
+//     }
+// 
+//     /**
+//      * Returns the underlying value of an animatable XML attribute.
+//      */
+//     public AnimatableValue getUnderlyingValue(String ns, String ln) {
+//         if (ns == null) {
+//             if (ln.equals(SVG_STD_DEVIATION_ATTRIBUTE)) {
+//                 return getBaseValue(getStdDeviationX(), getStdDeviationY());
+//             }
+//         }
+//         return super.getUnderlyingValue(ns, ln);
+//     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEImageElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEImageElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEImageElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEImageElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.dom.util.XLinkSupport;
@@ -208,40 +207,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_EXTERNAL_RESOURCES_REQUIRED_ATTRIBUTE)) {
-                updateBooleanAttributeValue(getExternalResourcesRequired(),
-                                            val);
-                return;
-            } else if (ln.equals(SVG_PRESERVE_ASPECT_RATIO_ATTRIBUTE)) {
-                updatePreserveAspectRatioAttributeValue(getPreserveAspectRatio(),
-                                                        val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_EXTERNAL_RESOURCES_REQUIRED_ATTRIBUTE)) {
-                return getBaseValue(getExternalResourcesRequired());
-            } else if (ln.equals(SVG_PRESERVE_ASPECT_RATIO_ATTRIBUTE)) {
-                return getBaseValue(getPreserveAspectRatio());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEMergeNodeElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEMergeNodeElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEMergeNodeElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEMergeNodeElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -112,33 +111,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn1(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                return getBaseValue(getIn1());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEMorphologyElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEMorphologyElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEMorphologyElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEMorphologyElement.java Sat Dec 23 17:30:23 2006
@@ -18,8 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableNumberOptionalNumberValue;
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -162,55 +160,46 @@
 
     // AnimationTarget ///////////////////////////////////////////////////////
 
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn1(), val);
-                return;
-            } else if (ln.equals(SVG_OPERATOR_ATTRIBUTE)) {
-                updateEnumerationAttributeValue(getOperator(), val);
-                return;
-            } else if (ln.equals(SVG_RADIUS_ATTRIBUTE)) {
-                // XXX Needs testing.
-                if (val == null) {
-                    updateNumberAttributeValue(getRadiusX(), null);
-                    updateNumberAttributeValue(getRadiusY(), null);
-                } else {
-                    AnimatableNumberOptionalNumberValue anonv =
-                        (AnimatableNumberOptionalNumberValue) val;
-                    SVGOMAnimatedNumber ai =
-                        (SVGOMAnimatedNumber) getRadiusX();
-                    ai.setAnimatedValue(anonv.getNumber());
-                    ai = (SVGOMAnimatedNumber) getRadiusY();
-                    if (anonv.hasOptionalNumber()) {
-                        ai.setAnimatedValue(anonv.getOptionalNumber());
-                    } else {
-                        ai.setAnimatedValue(anonv.getNumber());
-                    }
-                }
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                return getBaseValue(getIn1());
-            } else if (ln.equals(SVG_OPERATOR_ATTRIBUTE)) {
-                return getBaseValue(getOperator());
-            } else if (ln.equals(SVG_RADIUS_ATTRIBUTE)) {
-                return getBaseValue(getRadiusX(), getRadiusY());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
-    }
+// XXX TBD
+//     /**
+//      * Updates an attribute value in this target.
+//      */
+//     public void updateAttributeValue(String ns, String ln,
+//                                      AnimatableValue val) {
+//         if (ns == null) {
+//             if (ln.equals(SVG_RADIUS_ATTRIBUTE)) {
+//                 // XXX Needs testing.
+//                 if (val == null) {
+//                     updateNumberAttributeValue(getRadiusX(), null);
+//                     updateNumberAttributeValue(getRadiusY(), null);
+//                 } else {
+//                     AnimatableNumberOptionalNumberValue anonv =
+//                         (AnimatableNumberOptionalNumberValue) val;
+//                     SVGOMAnimatedNumber ai =
+//                         (SVGOMAnimatedNumber) getRadiusX();
+//                     ai.setAnimatedValue(anonv.getNumber());
+//                     ai = (SVGOMAnimatedNumber) getRadiusY();
+//                     if (anonv.hasOptionalNumber()) {
+//                         ai.setAnimatedValue(anonv.getOptionalNumber());
+//                     } else {
+//                         ai.setAnimatedValue(anonv.getNumber());
+//                     }
+//                 }
+//                 return;
+//             }
+//         }
+//         super.updateAttributeValue(ns, ln, val);
+//     }
+// 
+//     /**
+//      * Returns the underlying value of an animatable XML attribute.
+//      */
+//     public AnimatableValue getUnderlyingValue(String ns, String ln) {
+//         if (ns == null) {
+//             if (ln.equals(SVG_RADIUS_ATTRIBUTE)) {
+//                 return getBaseValue(getRadiusX(), getRadiusY());
+//             }
+//         }
+//         return super.getUnderlyingValue(ns, ln);
+//     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEOffsetElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEOffsetElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEOffsetElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEOffsetElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -145,43 +144,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn1(), val);
-                return;
-            } else if (ln.equals(SVG_DX_ATTRIBUTE)) {
-                updateNumberAttributeValue(getDx(), val);
-                return;
-            } else if (ln.equals(SVG_DY_ATTRIBUTE)) {
-                updateNumberAttributeValue(getDy(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                return getBaseValue(getIn1());
-            } else if (ln.equals(SVG_DX_ATTRIBUTE)) {
-                return getBaseValue(getDx());
-            } else if (ln.equals(SVG_DY_ATTRIBUTE)) {
-                return getBaseValue(getDy());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEPointLightElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEPointLightElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEPointLightElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEPointLightElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -142,43 +141,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_X_ATTRIBUTE)) {
-                updateNumberAttributeValue(getX(), val);
-                return;
-            } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
-                updateNumberAttributeValue(getY(), val);
-                return;
-            } else if (ln.equals(SVG_Z_ATTRIBUTE)) {
-                updateNumberAttributeValue(getZ(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_X_ATTRIBUTE)) {
-                return getBaseValue(getX());
-            } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
-                return getBaseValue(getY());
-            } else if (ln.equals(SVG_Z_ATTRIBUTE)) {
-                return getBaseValue(getZ());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFESpecularLightingElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFESpecularLightingElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFESpecularLightingElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFESpecularLightingElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -164,48 +163,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn1(), val);
-                return;
-            } else if (ln.equals(SVG_SURFACE_SCALE_ATTRIBUTE)) {
-                updateNumberAttributeValue(getSurfaceScale(), val);
-                return;
-            } else if (ln.equals(SVG_SPECULAR_CONSTANT_ATTRIBUTE)) {
-                updateNumberAttributeValue(getSpecularConstant(), val);
-                return;
-            } else if (ln.equals(SVG_SPECULAR_EXPONENT_ATTRIBUTE)) {
-                updateNumberAttributeValue(getSpecularExponent(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                return getBaseValue(getIn1());
-            } else if (ln.equals(SVG_SURFACE_SCALE_ATTRIBUTE)) {
-                return getBaseValue(getSurfaceScale());
-            } else if (ln.equals(SVG_SPECULAR_CONSTANT_ATTRIBUTE)) {
-                return getBaseValue(getSpecularConstant());
-            } else if (ln.equals(SVG_SPECULAR_EXPONENT_ATTRIBUTE)) {
-                return getBaseValue(getSpecularExponent());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFESpotLightElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFESpotLightElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFESpotLightElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFESpotLightElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -225,68 +224,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_X_ATTRIBUTE)) {
-                updateNumberAttributeValue(getX(), val);
-                return;
-            } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
-                updateNumberAttributeValue(getY(), val);
-                return;
-            } else if (ln.equals(SVG_Z_ATTRIBUTE)) {
-                updateNumberAttributeValue(getZ(), val);
-                return;
-            } else if (ln.equals(SVG_POINTS_AT_X_ATTRIBUTE)) {
-                updateNumberAttributeValue(getPointsAtX(), val);
-                return;
-            } else if (ln.equals(SVG_POINTS_AT_Y_ATTRIBUTE)) {
-                updateNumberAttributeValue(getPointsAtY(), val);
-                return;
-            } else if (ln.equals(SVG_POINTS_AT_Z_ATTRIBUTE)) {
-                updateNumberAttributeValue(getPointsAtZ(), val);
-                return;
-            } else if (ln.equals(SVG_SPECULAR_EXPONENT_ATTRIBUTE)) {
-                updateNumberAttributeValue(getSpecularExponent(), val);
-                return;
-            } else if (ln.equals(SVG_LIMITING_CONE_ANGLE_ATTRIBUTE)) {
-                updateNumberAttributeValue(getLimitingConeAngle(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_X_ATTRIBUTE)) {
-                return getBaseValue(getX());
-            } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
-                return getBaseValue(getY());
-            } else if (ln.equals(SVG_Z_ATTRIBUTE)) {
-                return getBaseValue(getZ());
-            } else if (ln.equals(SVG_POINTS_AT_X_ATTRIBUTE)) {
-                return getBaseValue(getPointsAtX());
-            } else if (ln.equals(SVG_POINTS_AT_Y_ATTRIBUTE)) {
-                return getBaseValue(getPointsAtY());
-            } else if (ln.equals(SVG_POINTS_AT_Z_ATTRIBUTE)) {
-                return getBaseValue(getPointsAtZ());
-            } else if (ln.equals(SVG_SPECULAR_EXPONENT_ATTRIBUTE)) {
-                return getBaseValue(getSpecularExponent());
-            } else if (ln.equals(SVG_LIMITING_CONE_ANGLE_ATTRIBUTE)) {
-                return getBaseValue(getLimitingConeAngle());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFETileElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFETileElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFETileElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFETileElement.java Sat Dec 23 17:30:23 2006
@@ -20,7 +20,6 @@
 
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.util.SVGTypes;
 
 import org.w3c.dom.Node;
@@ -111,33 +110,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                updateStringAttributeValue(getIn1(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_IN_ATTRIBUTE)) {
-                return getBaseValue(getIn1());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFETurbulenceElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFETurbulenceElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFETurbulenceElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFETurbulenceElement.java Sat Dec 23 17:30:23 2006
@@ -18,8 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
-import org.apache.batik.anim.values.AnimatableNumberOptionalNumberValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -208,65 +206,46 @@
 
     // AnimationTarget ///////////////////////////////////////////////////////
 
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_TYPE_ATTRIBUTE)) {
-                updateEnumerationAttributeValue(getType(), val);
-                return;
-            } else if (ln.equals(SVG_NUM_OCTAVES_ATTRIBUTE)) {
-                updateIntegerAttributeValue(getNumOctaves(), val);
-                return;
-            } else if (ln.equals(SVG_SEED_ATTRIBUTE)) {
-                updateNumberAttributeValue(getSeed(), val);
-                return;
-            } else if (ln.equals(SVG_STITCH_TILES_ATTRIBUTE)) {
-                updateEnumerationAttributeValue(getStitchTiles(), val);
-                return;
-            } else if (ln.equals(SVG_BASE_FREQUENCY_ATTRIBUTE)) {
-                // XXX Needs testing.
-                if (val == null) {
-                    updateNumberAttributeValue(getBaseFrequencyX(), null);
-                    updateNumberAttributeValue(getBaseFrequencyY(), null);
-                } else {
-                    AnimatableNumberOptionalNumberValue anonv =
-                        (AnimatableNumberOptionalNumberValue) val;
-                    SVGOMAnimatedNumber an =
-                        (SVGOMAnimatedNumber) getBaseFrequencyX();
-                    an.setAnimatedValue(anonv.getNumber());
-                    an = (SVGOMAnimatedNumber) getBaseFrequencyY();
-                    if (anonv.hasOptionalNumber()) {
-                        an.setAnimatedValue(anonv.getOptionalNumber());
-                    } else {
-                        an.setAnimatedValue(anonv.getNumber());
-                    }
-                }
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_TYPE_ATTRIBUTE)) {
-                return getBaseValue(getType());
-            } else if (ln.equals(SVG_NUM_OCTAVES_ATTRIBUTE)) {
-                return getBaseValue(getNumOctaves());
-            } else if (ln.equals(SVG_SEED_ATTRIBUTE)) {
-                return getBaseValue(getSeed());
-            } else if (ln.equals(SVG_STITCH_TILES_ATTRIBUTE)) {
-                return getBaseValue(getStitchTiles());
-            } else if (ln.equals(SVG_BASE_FREQUENCY_ATTRIBUTE)) {
-                return getBaseValue(getBaseFrequencyX(), getBaseFrequencyY());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
-    }
+// XXX TBD
+//     /**
+//      * Updates an attribute value in this target.
+//      */
+//     public void updateAttributeValue(String ns, String ln,
+//                                      AnimatableValue val) {
+//         if (ns == null) {
+//             if (ln.equals(SVG_BASE_FREQUENCY_ATTRIBUTE)) {
+//                 // XXX Needs testing.
+//                 if (val == null) {
+//                     updateNumberAttributeValue(getBaseFrequencyX(), null);
+//                     updateNumberAttributeValue(getBaseFrequencyY(), null);
+//                 } else {
+//                     AnimatableNumberOptionalNumberValue anonv =
+//                         (AnimatableNumberOptionalNumberValue) val;
+//                     SVGOMAnimatedNumber an =
+//                         (SVGOMAnimatedNumber) getBaseFrequencyX();
+//                     an.setAnimatedValue(anonv.getNumber());
+//                     an = (SVGOMAnimatedNumber) getBaseFrequencyY();
+//                     if (anonv.hasOptionalNumber()) {
+//                         an.setAnimatedValue(anonv.getOptionalNumber());
+//                     } else {
+//                         an.setAnimatedValue(anonv.getNumber());
+//                     }
+//                 }
+//                 return;
+//             }
+//         }
+//         super.updateAttributeValue(ns, ln, val);
+//     }
+// 
+//     /**
+//      * Returns the underlying value of an animatable XML attribute.
+//      */
+//     public AnimatableValue getUnderlyingValue(String ns, String ln) {
+//         if (ns == null) {
+//             if (ln.equals(SVG_BASE_FREQUENCY_ATTRIBUTE)) {
+//                 return getBaseValue(getBaseFrequencyX(), getBaseFrequencyY());
+//             }
+//         }
+//         return super.getUnderlyingValue(ns, ln);
+//     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFilterElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFilterElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFilterElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFilterElement.java Sat Dec 23 17:30:23 2006
@@ -18,8 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableNumberOptionalNumberValue;
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.dom.util.XLinkSupport;
@@ -335,86 +333,47 @@
 
     // AnimationTarget ///////////////////////////////////////////////////////
 
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_EXTERNAL_RESOURCES_REQUIRED_ATTRIBUTE)) {
-                updateBooleanAttributeValue(getExternalResourcesRequired(),
-                                            val);
-                return;
-            } else if (ln.equals(SVG_FILTER_UNITS_ATTRIBUTE)) {
-                updateEnumerationAttributeValue(getFilterUnits(), val);
-                return;
-            } else if (ln.equals(SVG_PRIMITIVE_UNITS_ATTRIBUTE)) {
-                updateEnumerationAttributeValue(getPrimitiveUnits(), val);
-                return;
-            } else if (ln.equals(SVG_X_ATTRIBUTE)) {
-                updateLengthAttributeValue(getX(), val);
-                return;
-            } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
-                updateLengthAttributeValue(getY(), val);
-                return;
-            } else if (ln.equals(SVG_WIDTH_ATTRIBUTE)) {
-                updateLengthAttributeValue(getWidth(), val);
-                return;
-            } else if (ln.equals(SVG_HEIGHT_ATTRIBUTE)) {
-                updateLengthAttributeValue(getHeight(), val);
-                return;
-            } else if (ln.equals(SVG_FILTER_RES_ATTRIBUTE)) {
-                // XXX Needs testing.
-                if (val == null) {
-                    updateIntegerAttributeValue(getFilterResX(), null);
-                    updateIntegerAttributeValue(getFilterResY(), null);
-                } else {
-                    AnimatableNumberOptionalNumberValue anonv =
-                        (AnimatableNumberOptionalNumberValue) val;
-                    SVGOMAnimatedInteger ai =
-                        (SVGOMAnimatedInteger) getFilterResX();
-                    ai.setAnimatedValue(Math.round(anonv.getNumber()));
-                    ai = (SVGOMAnimatedInteger) getFilterResY();
-                    if (anonv.hasOptionalNumber()) {
-                        ai.setAnimatedValue
-                            (Math.round(anonv.getOptionalNumber()));
-                    } else {
-                        ai.setAnimatedValue(Math.round(anonv.getNumber()));
-                    }
-                }
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_EXTERNAL_RESOURCES_REQUIRED_ATTRIBUTE)) {
-                return getBaseValue(getExternalResourcesRequired());
-            } else if (ln.equals(SVG_FILTER_UNITS_ATTRIBUTE)) {
-                return getBaseValue(getFilterUnits());
-            } else if (ln.equals(SVG_PRIMITIVE_UNITS_ATTRIBUTE)) {
-                return getBaseValue(getPrimitiveUnits());
-            } else if (ln.equals(SVG_X_ATTRIBUTE)) {
-                return getBaseValue
-                    (getX(), PERCENTAGE_VIEWPORT_WIDTH);
-            } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
-                return getBaseValue
-                    (getY(), PERCENTAGE_VIEWPORT_HEIGHT);
-            } else if (ln.equals(SVG_WIDTH_ATTRIBUTE)) {
-                return getBaseValue
-                    (getWidth(), PERCENTAGE_VIEWPORT_WIDTH);
-            } else if (ln.equals(SVG_HEIGHT_ATTRIBUTE)) {
-                return getBaseValue
-                    (getHeight(), PERCENTAGE_VIEWPORT_HEIGHT);
-            } else if (ln.equals(SVG_FILTER_RES_ATTRIBUTE)) {
-                return getBaseValue(getFilterResX(), getFilterResY());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
-    }
+// XXX TBD
+//     /**
+//      * Updates an attribute value in this target.
+//      */
+//     public void updateAttributeValue(String ns, String ln,
+//                                      AnimatableValue val) {
+//         if (ns == null) {
+//             if (ln.equals(SVG_FILTER_RES_ATTRIBUTE)) {
+//                 // XXX Needs testing.
+//                 if (val == null) {
+//                     updateIntegerAttributeValue(getFilterResX(), null);
+//                     updateIntegerAttributeValue(getFilterResY(), null);
+//                 } else {
+//                     AnimatableNumberOptionalNumberValue anonv =
+//                         (AnimatableNumberOptionalNumberValue) val;
+//                     SVGOMAnimatedInteger ai =
+//                         (SVGOMAnimatedInteger) getFilterResX();
+//                     ai.setAnimatedValue(Math.round(anonv.getNumber()));
+//                     ai = (SVGOMAnimatedInteger) getFilterResY();
+//                     if (anonv.hasOptionalNumber()) {
+//                         ai.setAnimatedValue
+//                             (Math.round(anonv.getOptionalNumber()));
+//                     } else {
+//                         ai.setAnimatedValue(Math.round(anonv.getNumber()));
+//                     }
+//                 }
+//                 return;
+//             }
+//         }
+//         super.updateAttributeValue(ns, ln, val);
+//     }
+// 
+//     /**
+//      * Returns the underlying value of an animatable XML attribute.
+//      */
+//     public AnimatableValue getUnderlyingValue(String ns, String ln) {
+//         if (ns == null) {
+//             if (ln.equals(SVG_FILTER_RES_ATTRIBUTE)) {
+//                 return getBaseValue(getFilterResX(), getFilterResY());
+//             }
+//         }
+//         return super.getUnderlyingValue(ns, ln);
+//     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFilterPrimitiveStandardAttributes.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFilterPrimitiveStandardAttributes.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFilterPrimitiveStandardAttributes.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFilterPrimitiveStandardAttributes.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -176,57 +175,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_RESULT_ATTRIBUTE)) {
-                updateStringAttributeValue(getResult(), val);
-                return;
-            } else if (ln.equals(SVG_X_ATTRIBUTE)) {
-                updateLengthAttributeValue(getX(), val);
-                return;
-            } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
-                updateLengthAttributeValue(getY(), val);
-                return;
-            } else if (ln.equals(SVG_WIDTH_ATTRIBUTE)) {
-                updateLengthAttributeValue(getWidth(), val);
-                return;
-            } else if (ln.equals(SVG_HEIGHT_ATTRIBUTE)) {
-                updateLengthAttributeValue(getHeight(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_RESULT_ATTRIBUTE)) {
-                return getBaseValue(getResult());
-            } else if (ln.equals(SVG_X_ATTRIBUTE)) {
-                return getBaseValue
-                    (getX(), PERCENTAGE_VIEWPORT_WIDTH);
-            } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
-                return getBaseValue
-                    (getY(), PERCENTAGE_VIEWPORT_HEIGHT);
-            } else if (ln.equals(SVG_WIDTH_ATTRIBUTE)) {
-                return getBaseValue
-                    (getWidth(), PERCENTAGE_VIEWPORT_WIDTH);
-            } else if (ln.equals(SVG_HEIGHT_ATTRIBUTE)) {
-                return getBaseValue
-                    (getHeight(), PERCENTAGE_VIEWPORT_HEIGHT);
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -128,34 +127,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_EXTERNAL_RESOURCES_REQUIRED_ATTRIBUTE)) {
-                updateBooleanAttributeValue(getExternalResourcesRequired(),
-                                            val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_EXTERNAL_RESOURCES_REQUIRED_ATTRIBUTE)) {
-                return getBaseValue(getExternalResourcesRequired());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontFaceElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontFaceElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontFaceElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontFaceElement.java Sat Dec 23 17:30:23 2006
@@ -19,8 +19,6 @@
 package org.apache.batik.dom.svg;
 
 import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.util.DoublyIndexedTable;
-import org.apache.batik.util.SVGTypes;
 import org.w3c.dom.Node;
 import org.w3c.dom.svg.SVGFontFaceElement;
 

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontFaceFormatElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontFaceFormatElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontFaceFormatElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontFaceFormatElement.java Sat Dec 23 17:30:23 2006
@@ -19,8 +19,6 @@
 package org.apache.batik.dom.svg;
 
 import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.util.DoublyIndexedTable;
-import org.apache.batik.util.SVGTypes;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.svg.SVGFontFaceFormatElement;

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontFaceNameElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontFaceNameElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontFaceNameElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFontFaceNameElement.java Sat Dec 23 17:30:23 2006
@@ -19,8 +19,6 @@
 package org.apache.batik.dom.svg;
 
 import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.util.DoublyIndexedTable;
-import org.apache.batik.util.SVGTypes;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.svg.SVGFontFaceNameElement;

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMForeignObjectElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMForeignObjectElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMForeignObjectElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMForeignObjectElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.util.SVGTypes;
@@ -172,58 +171,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_EXTERNAL_RESOURCES_REQUIRED_ATTRIBUTE)) {
-                updateBooleanAttributeValue(getExternalResourcesRequired(),
-                                            val);
-                return;
-            } else if (ln.equals(SVG_X_ATTRIBUTE)) {
-                updateLengthAttributeValue(getX(), val);
-                return;
-            } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
-                updateLengthAttributeValue(getY(), val);
-                return;
-            } else if (ln.equals(SVG_WIDTH_ATTRIBUTE)) {
-                updateLengthAttributeValue(getWidth(), val);
-                return;
-            } else if (ln.equals(SVG_HEIGHT_ATTRIBUTE)) {
-                updateLengthAttributeValue(getHeight(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_EXTERNAL_RESOURCES_REQUIRED_ATTRIBUTE)) {
-                return getBaseValue(getExternalResourcesRequired());
-            } else if (ln.equals(SVG_X_ATTRIBUTE)) {
-                return getBaseValue
-                    (getX(), PERCENTAGE_VIEWPORT_WIDTH);
-            } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
-                return getBaseValue
-                    (getY(), PERCENTAGE_VIEWPORT_HEIGHT);
-            } else if (ln.equals(SVG_WIDTH_ATTRIBUTE)) {
-                return getBaseValue
-                    (getWidth(), PERCENTAGE_VIEWPORT_WIDTH);
-            } else if (ln.equals(SVG_HEIGHT_ATTRIBUTE)) {
-                return getBaseValue
-                    (getHeight(), PERCENTAGE_VIEWPORT_HEIGHT);
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGlyphElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGlyphElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGlyphElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGlyphElement.java Sat Dec 23 17:30:23 2006
@@ -19,8 +19,6 @@
 package org.apache.batik.dom.svg;
 
 import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.util.DoublyIndexedTable;
-import org.apache.batik.util.SVGTypes;
 import org.w3c.dom.Node;
 import org.w3c.dom.svg.SVGGlyphElement;
 

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGlyphRefElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGlyphRefElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGlyphRefElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGlyphRefElement.java Sat Dec 23 17:30:23 2006
@@ -19,10 +19,9 @@
 package org.apache.batik.dom.svg;
 
 import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.dom.util.XLinkSupport;
 import org.apache.batik.dom.util.XMLSupport;
-import org.apache.batik.util.SVGTypes;
+
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Node;
 import org.w3c.dom.svg.SVGAnimatedString;

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGradientElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGradientElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGradientElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGradientElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.dom.util.XLinkSupport;
@@ -223,49 +222,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_EXTERNAL_RESOURCES_REQUIRED_ATTRIBUTE)) {
-                updateBooleanAttributeValue(getExternalResourcesRequired(),
-                                            val);
-                return;
-            } else if (ln.equals(SVG_GRADIENT_UNITS_ATTRIBUTE)) {
-                updateEnumerationAttributeValue(getGradientUnits(), val);
-                return;
-            } else if (ln.equals(SVG_GRADIENT_TRANSFORM_ATTRIBUTE)) {
-                updateTransformListAttributeValue(getGradientTransform(), val);
-                return;
-            } else if (ln.equals(SVG_SPREAD_METHOD_ATTRIBUTE)) {
-                updateEnumerationAttributeValue(getSpreadMethod(), val);
-                return;
-            }
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_EXTERNAL_RESOURCES_REQUIRED_ATTRIBUTE)) {
-                return getBaseValue(getExternalResourcesRequired());
-            } else if (ln.equals(SVG_GRADIENT_UNITS_ATTRIBUTE)) {
-                return getBaseValue(getGradientUnits());
-            } else if (ln.equals(SVG_GRADIENT_TRANSFORM_ATTRIBUTE)) {
-                return getBaseValue(getGradientTransform());
-            } else if (ln.equals(SVG_SPREAD_METHOD_ATTRIBUTE)) {
-                return getBaseValue(getSpreadMethod());
-            }
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMHKernElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMHKernElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMHKernElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMHKernElement.java Sat Dec 23 17:30:23 2006
@@ -19,8 +19,6 @@
 package org.apache.batik.dom.svg;
 
 import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.util.DoublyIndexedTable;
-import org.apache.batik.util.SVGTypes;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.svg.SVGHKernElement;

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMImageElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMImageElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMImageElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMImageElement.java Sat Dec 23 17:30:23 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.batik.dom.svg;
 
-import org.apache.batik.anim.values.AnimatableValue;
 import org.apache.batik.dom.AbstractDocument;
 import org.apache.batik.dom.util.DoublyIndexedTable;
 import org.apache.batik.dom.util.XLinkSupport;
@@ -211,64 +210,5 @@
      */
     protected DoublyIndexedTable getTraitInformationTable() {
         return xmlTraitInformation;
-    }
-
-    // AnimationTarget ///////////////////////////////////////////////////////
-
-    /**
-     * Updates an attribute value in this target.
-     */
-    public void updateAttributeValue(String ns, String ln,
-                                     AnimatableValue val) {
-        if (ns == null) {
-            if (ln.equals(SVG_PRESERVE_ASPECT_RATIO_ATTRIBUTE)) {
-                updatePreserveAspectRatioAttributeValue
-                    (getPreserveAspectRatio(), val);
-                return;
-            } else if (ln.equals(SVG_X_ATTRIBUTE)) {
-                updateLengthAttributeValue(getX(), val);
-                return;
-            } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
-                updateLengthAttributeValue(getY(), val);
-                return;
-            } else if (ln.equals(SVG_WIDTH_ATTRIBUTE)) {
-                updateLengthAttributeValue(getWidth(), val);
-                return;
-            } else if (ln.equals(SVG_HEIGHT_ATTRIBUTE)) {
-                updateLengthAttributeValue(getHeight(), val);
-                return;
-            }
-        } else if (ns.equals(XLINK_NAMESPACE_URI)
-                && ln.equals(XLINK_HREF_ATTRIBUTE)) {
-            updateStringAttributeValue(getHref(), val);
-        }
-        super.updateAttributeValue(ns, ln, val);
-    }
-
-    /**
-     * Returns the underlying value of an animatable XML attribute.
-     */
-    public AnimatableValue getUnderlyingValue(String ns, String ln) {
-        if (ns == null) {
-            if (ln.equals(SVG_PRESERVE_ASPECT_RATIO_ATTRIBUTE)) {
-                return getBaseValue(getPreserveAspectRatio());
-            } else if (ln.equals(SVG_X_ATTRIBUTE)) {
-                return getBaseValue
-                    (getX(), PERCENTAGE_VIEWPORT_WIDTH);
-            } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
-                return getBaseValue
-                    (getY(), PERCENTAGE_VIEWPORT_HEIGHT);
-            } else if (ln.equals(SVG_WIDTH_ATTRIBUTE)) {
-                return getBaseValue
-                    (getWidth(), PERCENTAGE_VIEWPORT_WIDTH);
-            } else if (ln.equals(SVG_HEIGHT_ATTRIBUTE)) {
-                return getBaseValue
-                    (getHeight(), PERCENTAGE_VIEWPORT_HEIGHT);
-            }
-        } else if (ns.equals(XLINK_NAMESPACE_URI)
-                && ln.equals(XLINK_HREF_ATTRIBUTE)) {
-            return getBaseValue(getHref());
-        }
-        return super.getUnderlyingValue(ns, ln);
     }
 }



Mime
View raw message