You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ca...@apache.org on 2006/12/24 02:30:26 UTC
svn commit: r489964 [3/3] - in
/xmlgraphics/batik/trunk/sources/org/apache/batik: dom/svg/ extension/
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMLineElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMLineElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMLineElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMLineElement.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,52 +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_X1_ATTRIBUTE)) {
- updateLengthAttributeValue(getX1(), val);
- return;
- } else if (ln.equals(SVG_Y1_ATTRIBUTE)) {
- updateLengthAttributeValue(getY1(), val);
- return;
- } else if (ln.equals(SVG_X2_ATTRIBUTE)) {
- updateLengthAttributeValue(getX2(), val);
- return;
- } else if (ln.equals(SVG_Y2_ATTRIBUTE)) {
- updateLengthAttributeValue(getY2(), 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_X1_ATTRIBUTE)) {
- return getBaseValue
- (getX1(), PERCENTAGE_VIEWPORT_WIDTH);
- } else if (ln.equals(SVG_Y1_ATTRIBUTE)) {
- return getBaseValue
- (getY1(), PERCENTAGE_VIEWPORT_HEIGHT);
- } else if (ln.equals(SVG_X2_ATTRIBUTE)) {
- return getBaseValue
- (getX2(), PERCENTAGE_VIEWPORT_WIDTH);
- } else if (ln.equals(SVG_Y2_ATTRIBUTE)) {
- return getBaseValue
- (getY2(), PERCENTAGE_VIEWPORT_HEIGHT);
- }
- }
- return super.getUnderlyingValue(ns, ln);
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMLinearGradientElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMLinearGradientElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMLinearGradientElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMLinearGradientElement.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,52 +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_X1_ATTRIBUTE)) {
- updateLengthAttributeValue(getX1(), val);
- return;
- } else if (ln.equals(SVG_Y1_ATTRIBUTE)) {
- updateLengthAttributeValue(getY1(), val);
- return;
- } else if (ln.equals(SVG_X2_ATTRIBUTE)) {
- updateLengthAttributeValue(getX2(), val);
- return;
- } else if (ln.equals(SVG_Y2_ATTRIBUTE)) {
- updateLengthAttributeValue(getY2(), 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_X1_ATTRIBUTE)) {
- return getBaseValue
- (getX1(), PERCENTAGE_VIEWPORT_WIDTH);
- } else if (ln.equals(SVG_Y1_ATTRIBUTE)) {
- return getBaseValue
- (getY1(), PERCENTAGE_VIEWPORT_HEIGHT);
- } else if (ln.equals(SVG_X2_ATTRIBUTE)) {
- return getBaseValue
- (getX2(), PERCENTAGE_VIEWPORT_WIDTH);
- } else if (ln.equals(SVG_Y2_ATTRIBUTE)) {
- return getBaseValue
- (getY2(), PERCENTAGE_VIEWPORT_HEIGHT);
- }
- }
- return super.getUnderlyingValue(ns, ln);
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMPathElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMPathElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMPathElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMPathElement.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;
@@ -143,34 +142,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/SVGOMMarkerElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMarkerElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMarkerElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMarkerElement.java Sat Dec 23 17:30:23 2006
@@ -18,8 +18,6 @@
*/
package org.apache.batik.dom.svg;
-import org.apache.batik.anim.values.AnimatableAngleOrIdentValue;
-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.XMLSupport;
@@ -353,100 +351,58 @@
// 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_REF_X_ATTRIBUTE)) {
- updateLengthAttributeValue(getRefX(), val);
- return;
- } else if (ln.equals(SVG_REF_Y_ATTRIBUTE)) {
- updateLengthAttributeValue(getRefY(), val);
- return;
- } else if (ln.equals(SVG_MARKER_UNITS_ATTRIBUTE)) {
- updateEnumerationAttributeValue(getMarkerUnits(), val);
- return;
- } else if (ln.equals(SVG_MARKER_WIDTH_ATTRIBUTE)) {
- updateLengthAttributeValue(getMarkerWidth(), val);
- return;
- } else if (ln.equals(SVG_MARKER_HEIGHT_ATTRIBUTE)) {
- updateLengthAttributeValue(getMarkerHeight(), val);
- return;
- } else if (ln.equals(SVG_PRESERVE_ASPECT_RATIO_ATTRIBUTE)) {
- updatePreserveAspectRatioAttributeValue
- (getPreserveAspectRatio(), val);
- return;
- } else if (ln.equals(SVG_ORIENT_ATTRIBUTE)) {
- // XXX Needs testing. Esp with the LiveAttributeValues updating
- // the DOM attributes.
- SVGOMAnimatedMarkerOrientValue orient =
- (SVGOMAnimatedMarkerOrientValue)
- getLiveAttributeValue(null, ln);
- if (val == null) {
- orient.resetAnimatedValue();
- } else {
- AnimatableAngleOrIdentValue aloiv =
- (AnimatableAngleOrIdentValue) val;
- if (aloiv.isIdent()
- && aloiv.getIdent().equals(SVG_AUTO_VALUE)) {
- orient.setAnimatedValueToAuto();
- } else {
- orient.setAnimatedValueToAngle(aloiv.getUnit(),
- aloiv.getValue());
- }
- }
- 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_REF_X_ATTRIBUTE)) {
- return getBaseValue
- (getRefX(), PERCENTAGE_VIEWPORT_WIDTH);
- } else if (ln.equals(SVG_REF_Y_ATTRIBUTE)) {
- return getBaseValue
- (getRefY(), PERCENTAGE_VIEWPORT_HEIGHT);
- } else if (ln.equals(SVG_MARKER_UNITS_ATTRIBUTE)) {
- return getBaseValue(getMarkerUnits());
- } else if (ln.equals(SVG_MARKER_WIDTH_ATTRIBUTE)) {
- return getBaseValue
- (getMarkerWidth(),
- PERCENTAGE_VIEWPORT_WIDTH);
- } else if (ln.equals(SVG_MARKER_HEIGHT_ATTRIBUTE)) {
- return getBaseValue
- (getMarkerHeight(),
- PERCENTAGE_VIEWPORT_HEIGHT);
- } else if (ln.equals(SVG_PRESERVE_ASPECT_RATIO_ATTRIBUTE)) {
- return getBaseValue(getPreserveAspectRatio());
- } else if (ln.equals(SVG_ORIENT_ATTRIBUTE)) {
- SVGOMAnimatedMarkerOrientValue orient =
- (SVGOMAnimatedMarkerOrientValue)
- getLiveAttributeValue(null, ln);
- if (orient.getAnimatedEnumeration().getBaseVal() ==
- SVGMarkerElement.SVG_MARKER_ORIENT_ANGLE) {
- SVGAngle a = orient.getAnimatedAngle().getBaseVal();
- return new AnimatableAngleOrIdentValue(this, a.getValue(),
- a.getUnitType());
- } else {
- return new AnimatableAngleOrIdentValue(this,
- SVG_AUTO_VALUE);
- }
- }
- }
- 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_ORIENT_ATTRIBUTE)) {
+// // XXX Needs testing. Esp with the LiveAttributeValues updating
+// // the DOM attributes.
+// SVGOMAnimatedMarkerOrientValue orient =
+// (SVGOMAnimatedMarkerOrientValue)
+// getLiveAttributeValue(null, ln);
+// if (val == null) {
+// orient.resetAnimatedValue();
+// } else {
+// AnimatableAngleOrIdentValue aloiv =
+// (AnimatableAngleOrIdentValue) val;
+// if (aloiv.isIdent()
+// && aloiv.getIdent().equals(SVG_AUTO_VALUE)) {
+// orient.setAnimatedValueToAuto();
+// } else {
+// orient.setAnimatedValueToAngle(aloiv.getUnit(),
+// aloiv.getValue());
+// }
+// }
+// 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_ORIENT_ATTRIBUTE)) {
+// SVGOMAnimatedMarkerOrientValue orient =
+// (SVGOMAnimatedMarkerOrientValue)
+// getLiveAttributeValue(null, ln);
+// if (orient.getAnimatedEnumeration().getBaseVal() ==
+// SVGMarkerElement.SVG_MARKER_ORIENT_ANGLE) {
+// SVGAngle a = orient.getAnimatedAngle().getBaseVal();
+// return new AnimatableAngleOrIdentValue(this, a.getValue(),
+// a.getUnitType());
+// } else {
+// return new AnimatableAngleOrIdentValue(this,
+// SVG_AUTO_VALUE);
+// }
+// }
+// }
+// return super.getUnderlyingValue(ns, ln);
+// }
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMaskElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMaskElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMaskElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMaskElement.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;
@@ -211,68 +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_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;
- } else if (ln.equals(SVG_MASK_UNITS_ATTRIBUTE)) {
- updateEnumerationAttributeValue(getMaskUnits(), val);
- return;
- } else if (ln.equals(SVG_MASK_CONTENT_UNITS_ATTRIBUTE)) {
- updateEnumerationAttributeValue(getMaskContentUnits(), 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);
- } else if (ln.equals(SVG_MASK_UNITS_ATTRIBUTE)) {
- return getBaseValue(getMaskUnits());
- } else if (ln.equals(SVG_MASK_CONTENT_UNITS_ATTRIBUTE)) {
- return getBaseValue(getMaskContentUnits());
- }
- }
- return super.getUnderlyingValue(ns, ln);
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMissingGlyphElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMissingGlyphElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMissingGlyphElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMissingGlyphElement.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.SVGMissingGlyphElement;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMPathElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMPathElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMPathElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMPathElement.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;
@@ -932,44 +931,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_PATH_LENGTH_ATTRIBUTE)) {
- updateNumberAttributeValue(getPathLength(), val);
- return;
- } else if (ln.equals(SVG_D_ATTRIBUTE)) {
- updatePathDataAttributeValue(d, 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_PATH_LENGTH_ATTRIBUTE)) {
- return getBaseValue(getPathLength());
- } else if (ln.equals(SVG_D_ATTRIBUTE)) {
- return getBaseValue(d);
- }
- }
- return super.getUnderlyingValue(ns, ln);
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMPatternElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMPatternElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMPatternElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMPatternElement.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;
@@ -390,79 +389,5 @@
*/
protected Node newNode() {
return new SVGOMPatternElement();
- }
-
- // 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;
- } else if (ln.equals(SVG_PATTERN_UNITS_ATTRIBUTE)) {
- updateEnumerationAttributeValue(getPatternUnits(), val);
- return;
- } else if (ln.equals(SVG_PATTERN_CONTENT_UNITS_ATTRIBUTE)) {
- updateEnumerationAttributeValue(getPatternContentUnits(), val);
- return;
- } else if (ln.equals(SVG_PATTERN_TRANSFORM_ATTRIBUTE)) {
- updateTransformListAttributeValue(getPatternTransform(), 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_PRESERVE_ASPECT_RATIO_ATTRIBUTE)) {
- return getBaseValue(getPreserveAspectRatio());
- } else if (ln.equals(SVG_PATTERN_UNITS_ATTRIBUTE)) {
- return getBaseValue(getPatternUnits());
- } else if (ln.equals(SVG_PATTERN_CONTENT_UNITS_ATTRIBUTE)) {
- return getBaseValue(getPatternContentUnits());
- } else if (ln.equals(SVG_PATTERN_TRANSFORM_ATTRIBUTE)) {
- return getBaseValue(getPatternTransform());
- } 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/SVGOMRadialGradientElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMRadialGradientElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMRadialGradientElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMRadialGradientElement.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;
@@ -210,58 +209,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_CX_ATTRIBUTE)) {
- updateLengthAttributeValue(getCx(), val);
- return;
- } else if (ln.equals(SVG_CY_ATTRIBUTE)) {
- updateLengthAttributeValue(getCy(), val);
- return;
- } else if (ln.equals(SVG_R_ATTRIBUTE)) {
- updateLengthAttributeValue(getR(), val);
- return;
- } else if (ln.equals(SVG_FX_ATTRIBUTE)) {
- updateLengthAttributeValue(getFx(), val);
- return;
- } else if (ln.equals(SVG_FY_ATTRIBUTE)) {
- updateLengthAttributeValue(getFy(), 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_CX_ATTRIBUTE)) {
- return getBaseValue
- (getCx(), PERCENTAGE_VIEWPORT_WIDTH);
- } else if (ln.equals(SVG_CY_ATTRIBUTE)) {
- return getBaseValue
- (getCy(), PERCENTAGE_VIEWPORT_HEIGHT);
- } else if (ln.equals(SVG_R_ATTRIBUTE)) {
- return getBaseValue
- (getR(), PERCENTAGE_VIEWPORT_SIZE);
- } else if (ln.equals(SVG_FX_ATTRIBUTE)) {
- return getBaseValue
- (getFx(), PERCENTAGE_VIEWPORT_WIDTH);
- } else if (ln.equals(SVG_FY_ATTRIBUTE)) {
- return getBaseValue
- (getFy(), PERCENTAGE_VIEWPORT_HEIGHT);
- }
- }
- return super.getUnderlyingValue(ns, ln);
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMRectElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMRectElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMRectElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMRectElement.java Sat Dec 23 17:30:23 2006
@@ -250,64 +250,24 @@
public void updateAttributeValue(String ns, String ln,
AnimatableValue val) {
if (ns == null) {
- 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_RX_ATTRIBUTE)) {
- updateLengthAttributeValue(getRx(), val);
+ if (ln.equals(SVG_RX_ATTRIBUTE)) {
+ super.updateAttributeValue(ns, ln, val);
AbstractSVGAnimatedLength ry =
(AbstractSVGAnimatedLength) getRy();
if (!ry.isSpecified()) {
- updateLengthAttributeValue(getRy(), val);
+ super.updateAttributeValue(ns, SVG_RY_ATTRIBUTE, val);
}
return;
} else if (ln.equals(SVG_RY_ATTRIBUTE)) {
- updateLengthAttributeValue(getRy(), val);
+ super.updateAttributeValue(ns, ln, val);
AbstractSVGAnimatedLength rx =
(AbstractSVGAnimatedLength) getRx();
if (!rx.isSpecified()) {
- updateLengthAttributeValue(getRx(), val);
+ super.updateAttributeValue(ns, SVG_RX_ATTRIBUTE, 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_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_RX_ATTRIBUTE)) {
- return getBaseValue
- (getRx(), PERCENTAGE_VIEWPORT_WIDTH);
- } else if (ln.equals(SVG_RY_ATTRIBUTE)) {
- return getBaseValue
- (getRy(), 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/SVGOMSVGElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSVGElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSVGElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSVGElement.java Sat Dec 23 17:30:23 2006
@@ -21,7 +21,6 @@
import java.awt.geom.AffineTransform;
import java.util.List;
-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;
@@ -869,58 +868,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/SVGOMScriptElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMScriptElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMScriptElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMScriptElement.java Sat Dec 23 17:30:23 2006
@@ -19,7 +19,6 @@
package org.apache.batik.dom.svg;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.anim.values.AnimatableValue;
import org.apache.batik.dom.util.DoublyIndexedTable;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.dom.util.XMLSupport;
@@ -160,34 +159,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/SVGOMSetElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSetElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSetElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSetElement.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.SVGSetElement;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMStopElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMStopElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMStopElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMStopElement.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_OFFSET_ATTRIBUTE)) {
- updateNumberAttributeValue(getOffset(), 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_OFFSET_ATTRIBUTE)) {
- return getBaseValue(getOffset());
- }
- }
- return super.getUnderlyingValue(ns, ln);
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMStyleElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMStyleElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMStyleElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMStyleElement.java Sat Dec 23 17:30:23 2006
@@ -25,10 +25,8 @@
import org.apache.batik.css.engine.CSSStyleSheetNode;
import org.apache.batik.css.engine.StyleSheet;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.util.DoublyIndexedTable;
import org.apache.batik.dom.util.XMLSupport;
import org.apache.batik.util.XMLConstants;
-import org.apache.batik.util.SVGTypes;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSymbolElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSymbolElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSymbolElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSymbolElement.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.XMLSupport;
@@ -213,45 +212,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;
- } else if (ln.equals(SVG_VIEW_BOX_ATTRIBUTE)) {
- updateRectAttributeValue(getViewBox(), 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());
- } else if (ln.equals(SVG_VIEW_BOX_ATTRIBUTE)) {
- return getBaseValue(getViewBox());
- }
- }
- return super.getUnderlyingValue(ns, ln);
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextContentElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextContentElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextContentElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextContentElement.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.XMLSupport;
@@ -325,45 +324,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_TEXT_LENGTH_ATTRIBUTE)) {
- updateLengthAttributeValue(getTextLength(), val);
- return;
- } else if (ln.equals(SVG_LENGTH_ADJUST_ATTRIBUTE)) {
- updateEnumerationAttributeValue(getLengthAdjust(), 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_TEXT_LENGTH_ATTRIBUTE)) {
- return getBaseValue
- (getTextLength(), PERCENTAGE_VIEWPORT_SIZE);
- } else if (ln.equals(SVG_LENGTH_ADJUST_ATTRIBUTE)) {
- return getBaseValue(getLengthAdjust());
- }
- }
- return super.getUnderlyingValue(ns, ln);
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextPathElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextPathElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextPathElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextPathElement.java Sat Dec 23 17:30:23 2006
@@ -19,7 +19,6 @@
package org.apache.batik.dom.svg;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.anim.values.AnimatableValue;
import org.apache.batik.dom.util.DoublyIndexedTable;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.dom.util.XMLSupport;
@@ -145,10 +144,10 @@
method =
createLiveAnimatedEnumeration
(null, SVG_METHOD_ATTRIBUTE, METHOD_VALUES, (short) 1);
- SVGOMAnimatedEnumeration spacing =
+ spacing =
createLiveAnimatedEnumeration
(null, SVG_SPACING_ATTRIBUTE, SPACING_VALUES, (short) 2);
- SVGOMAnimatedLength startOffset =
+ startOffset =
createLiveAnimatedLength
(null, SVG_START_OFFSET_ATTRIBUTE,
SVG_TEXT_PATH_START_OFFSET_DEFAULT_VALUE,
@@ -215,45 +214,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_START_OFFSET_ATTRIBUTE)) {
- updateLengthAttributeValue(getStartOffset(), val);
- return;
- } else if (ln.equals(SVG_METHOD_ATTRIBUTE)) {
- updateEnumerationAttributeValue(getMethod(), val);
- return;
- } else if (ln.equals(SVG_SPACING_ATTRIBUTE)) {
- updateEnumerationAttributeValue(getSpacing(), 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_START_OFFSET_ATTRIBUTE)) {
- return getBaseValue
- (getStartOffset(),
- PERCENTAGE_VIEWPORT_SIZE);
- } else if (ln.equals(SVG_METHOD_ATTRIBUTE)) {
- return getBaseValue(getMethod());
- } else if (ln.equals(SVG_SPACING_ATTRIBUTE)) {
- return getBaseValue(getSpacing());
- }
- }
- return super.getUnderlyingValue(ns, ln);
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextPositioningElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextPositioningElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextPositioningElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextPositioningElement.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;
@@ -181,57 +180,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)) {
- updateLengthListAttributeValue(getX(), val);
- return;
- } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
- updateLengthListAttributeValue(getY(), val);
- return;
- } else if (ln.equals(SVG_DX_ATTRIBUTE)) {
- updateLengthListAttributeValue(getDx(), val);
- return;
- } else if (ln.equals(SVG_DY_ATTRIBUTE)) {
- updateLengthListAttributeValue(getDy(), val);
- return;
- } else if (ln.equals(SVG_ROTATE_ATTRIBUTE)) {
- updateNumberListAttributeValue(getRotate(), 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(), PERCENTAGE_VIEWPORT_WIDTH);
- } else if (ln.equals(SVG_Y_ATTRIBUTE)) {
- return getBaseValue
- (getY(), PERCENTAGE_VIEWPORT_HEIGHT);
- } else if (ln.equals(SVG_DX_ATTRIBUTE)) {
- return getBaseValue
- (getDx(), PERCENTAGE_VIEWPORT_WIDTH);
- } else if (ln.equals(SVG_DY_ATTRIBUTE)) {
- return getBaseValue
- (getDy(), PERCENTAGE_VIEWPORT_HEIGHT);
- } else if (ln.equals(SVG_ROTATE_ATTRIBUTE)) {
- return getBaseValue(getRotate());
- }
- }
- return super.getUnderlyingValue(ns, ln);
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMUseElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMUseElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMUseElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMUseElement.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;
@@ -252,52 +251,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)) {
- 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_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/SVGOMVKernElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMVKernElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMVKernElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMVKernElement.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.SVGVKernElement;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMViewElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMViewElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMViewElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMViewElement.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;
@@ -202,40 +201,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/SVGPointShapeElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGPointShapeElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGPointShapeElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGPointShapeElement.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;
@@ -106,33 +105,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_POINTS_ATTRIBUTE)) {
- updatePointsAttributeValue(points, 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_POINTS_ATTRIBUTE)) {
- return getBaseValue(points);
- }
- }
- return super.getUnderlyingValue(ns, ln);
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGStylableElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGStylableElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGStylableElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGStylableElement.java Sat Dec 23 17:30:23 2006
@@ -221,28 +221,6 @@
}
/**
- * Updates an attribute value in this target.
- */
- public void updateAttributeValue(String ns, String ln,
- AnimatableValue val) {
- if (ns == null && ln.equals(SVG_CLASS_ATTRIBUTE)) {
- updateStringAttributeValue(getClassName(), 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 && ln.equals(SVG_CLASS_ATTRIBUTE)) {
- return getBaseValue(getClassName());
- }
- return super.getUnderlyingValue(ns, ln);
- }
-
- /**
* Returns whether color interpolations should be done in linear RGB
* color space rather than sRGB.
*/
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGURIReferenceGraphicsElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGURIReferenceGraphicsElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGURIReferenceGraphicsElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGURIReferenceGraphicsElement.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;
@@ -96,30 +95,5 @@
*/
protected DoublyIndexedTable getTraitInformationTable() {
return xmlTraitInformation;
- }
-
- // AnimationTarget ///////////////////////////////////////////////////////
-
- /**
- * Updates an attribute value in this target.
- */
- public void updateAttributeValue(String ns, String ln,
- AnimatableValue val) {
- if (XLINK_NAMESPACE_URI.equals(ns)
- && ln.equals(XLINK_HREF_ATTRIBUTE)) {
- updateStringAttributeValue(getHref(), val);
- } else {
- super.updateAttributeValue(ns, ln, val);
- }
- }
-
- /**
- * Returns the underlying value of an animatable XML attribute.
- */
- public AnimatableValue getUnderlyingValue(String ns, String ln) {
- if (XLINK_NAMESPACE_URI.equals(ns)) {
- return getBaseValue(getHref());
- }
- return super.getUnderlyingValue(ns, ln);
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGURIReferenceTextPositioningElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGURIReferenceTextPositioningElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGURIReferenceTextPositioningElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGURIReferenceTextPositioningElement.java Sat Dec 23 17:30:23 2006
@@ -18,10 +18,10 @@
*/
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;
+
import org.w3c.dom.svg.SVGAnimatedString;
import org.w3c.dom.svg.SVGURIReference;
@@ -98,30 +98,5 @@
*/
protected DoublyIndexedTable getTraitInformationTable() {
return xmlTraitInformation;
- }
-
- // AnimationTarget ///////////////////////////////////////////////////////
-
- /**
- * Updates an attribute value in this target.
- */
- public void updateAttributeValue(String ns, String ln,
- AnimatableValue val) {
- if (XLINK_NAMESPACE_URI.equals(ns)
- && ln.equals(XLINK_HREF_ATTRIBUTE)) {
- updateStringAttributeValue(getHref(), val);
- } else {
- super.updateAttributeValue(ns, ln, val);
- }
- }
-
- /**
- * Returns the underlying value of an animatable XML attribute.
- */
- public AnimatableValue getUnderlyingValue(String ns, String ln) {
- if (XLINK_NAMESPACE_URI.equals(ns)) {
- return getBaseValue(getHref());
- }
- return super.getUnderlyingValue(ns, ln);
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/extension/GraphicsExtensionElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/extension/GraphicsExtensionElement.java?view=diff&rev=489964&r1=489963&r2=489964
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/extension/GraphicsExtensionElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/extension/GraphicsExtensionElement.java Sat Dec 23 17:30:23 2006
@@ -19,13 +19,10 @@
package org.apache.batik.extension;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGExternalResourcesRequiredSupport;
import org.apache.batik.dom.svg.SVGLocatableSupport;
import org.apache.batik.dom.svg.SVGOMAnimatedBoolean;
import org.apache.batik.dom.svg.SVGOMAnimatedTransformList;
-import org.apache.batik.dom.svg.SVGStylableElement;
import org.apache.batik.dom.svg.SVGTestsSupport;
-import org.apache.batik.dom.svg.SVGTransformableSupport;
import org.apache.batik.dom.svg.TraitInformation;
import org.apache.batik.dom.util.DoublyIndexedTable;
import org.apache.batik.dom.util.XMLSupport;