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/03/08 01:04:03 UTC
svn commit: r384062 [3/6] - in /xmlgraphics/batik/branches/anim: ./ lib/
resources/META-INF/services/
resources/org/apache/batik/apps/rasterizer/resources/
resources/org/apache/batik/apps/svgbrowser/resources/
resources/org/apache/batik/dom/svg/resourc...
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSEngine.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSEngine.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSEngine.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSEngine.java Tue Mar 7 16:03:46 2006
@@ -1,6 +1,6 @@
/*
- Copyright 2002-2005 The Apache Software Foundation
+ Copyright 2002-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -626,6 +626,13 @@
}
/**
+ * Returns the ShorthandManagers.
+ */
+ public ShorthandManager[] getShorthandManagers() {
+ return shorthandManagers;
+ }
+
+ /**
* Gets the StyleMaps generated by @font-face rules
* encountered by this CSSEngine thus far.
*/
@@ -821,6 +828,24 @@
}
}
}
+
+ // Apply the override rules to the result.
+ StyleDeclarationProvider p =
+ elt.getOverrideStyleDeclarationProvider();
+ StyleDeclaration over = p.getStyleDeclaration();
+ if (over != null) {
+ int ol = over.size();
+ for (int i = 0; i < ol; i++) {
+ int idx = over.getIndex(i);
+ Value value = over.getValue(i);
+ boolean important = over.getPriority(i);
+ if (!result.isImportant(idx) || important) {
+ result.putValue(idx, value);
+ result.putImportant(idx, important);
+ result.putOrigin(idx, StyleMap.OVERRIDE_ORIGIN);
+ }
+ }
+ }
} finally {
element = null;
cssBaseURI = null;
@@ -951,6 +976,7 @@
* set. Shorthand properties will be expanded "automatically".
*/
public interface MainPropertyReceiver {
+
/**
* Called with a non-shorthand property name and it's value.
*/
@@ -1023,7 +1049,7 @@
documentURI.toString());
String s = Messages.formatMessage
("property.syntax.error.at",
- new Object[] { u, prop, value, m});
+ new Object[] { u, prop, value, m });
DOMException de = new DOMException(DOMException.SYNTAX_ERR, s);
if (userAgent == null) throw de;
userAgent.displayError(de);
@@ -1259,6 +1285,9 @@
case StyleMap.AUTHOR_ORIGIN:
cond = !dimp || imp;
break;
+ case StyleMap.OVERRIDE_ORIGIN:
+ cond = false;
+ break;
default:
cond = true;
}
@@ -1856,13 +1885,14 @@
if (prevValue != null && prevValue.length() > 0) {
// Check if the style map has cascaded styles which
- // come from the inline style attribute.
+ // come from the inline style attribute or override style.
for (int i = getNumberOfProperties() - 1; i >= 0; --i) {
- if (style.isComputed(i) &&
- style.getOrigin(i) == StyleMap.INLINE_AUTHOR_ORIGIN &&
- !updated[i]) {
- removed = true;
- updated[i] = true;
+ if (style.isComputed(i) && !updated[i]) {
+ short origin = style.getOrigin(i);
+ if (origin >= StyleMap.INLINE_AUTHOR_ORIGIN) {
+ removed = true;
+ updated[i] = true;
+ }
}
}
}
@@ -2166,9 +2196,7 @@
return;
}
- switch (style.getOrigin(idx)) {
- case StyleMap.AUTHOR_ORIGIN:
- case StyleMap.INLINE_AUTHOR_ORIGIN:
+ if (style.getOrigin(idx) >= StyleMap.AUTHOR_ORIGIN) {
// The current value has a greater priority
return;
}
@@ -2313,7 +2341,19 @@
* To handle mutations of a CSSNavigableDocument.
*/
protected class CSSNavigableDocumentHandler
- implements CSSNavigableDocumentListener {
+ implements CSSNavigableDocumentListener,
+ MainPropertyReceiver {
+
+ /**
+ * Array to hold which properties have been changed by a call to
+ * setMainProperties.
+ */
+ protected boolean[] mainPropertiesChanged;
+
+ /**
+ * The StyleDeclaration to use from the MainPropertyReceiver.
+ */
+ protected StyleDeclaration declaration;
/**
* A node has been inserted into the CSSNavigableDocument tree.
@@ -2399,6 +2439,93 @@
String prevValue,
String newValue) {
handleAttrModified(e, attr, attrChange, prevValue, newValue);
+ }
+
+ /**
+ * The text of the override style declaration for this element has been
+ * modified.
+ */
+ public void overrideStyleTextChanged(CSSStylableElement elt,
+ String text) {
+ StyleDeclarationProvider p =
+ elt.getOverrideStyleDeclarationProvider();
+ StyleDeclaration declaration = p.getStyleDeclaration();
+ int ds = declaration.size();
+ boolean[] updated = new boolean[getNumberOfProperties()];
+ for (int i = 0; i < ds; i++) {
+ updated[declaration.getIndex(i)] = true;
+ }
+ declaration = parseStyleDeclaration(elt, text);
+ p.setStyleDeclaration(declaration);
+ ds = declaration.size();
+ for (int i = 0; i < ds; i++) {
+ updated[declaration.getIndex(i)] = true;
+ }
+ invalidateProperties(elt, null, updated, true);
+ }
+
+ /**
+ * A property in the override style declaration has been removed.
+ */
+ public void overrideStylePropertyRemoved(CSSStylableElement elt,
+ String name) {
+ StyleDeclarationProvider p =
+ elt.getOverrideStyleDeclarationProvider();
+ StyleDeclaration declaration = p.getStyleDeclaration();
+ int idx = getPropertyIndex(name);
+ int ds = declaration.size();
+ for (int i = 0; i < ds; i++) {
+ if (idx == declaration.getIndex(i)) {
+ declaration.remove(i);
+ StyleMap style = elt.getComputedStyleMap(null);
+ if (style.getOrigin(idx) == StyleMap.OVERRIDE_ORIGIN
+ && style.isComputed(idx)) {
+ invalidateProperties
+ (elt, new int[] { idx }, null, true);
+ }
+ break;
+ }
+ }
+ }
+
+ /**
+ * A property in the override style declaration has been changed.
+ */
+ public void overrideStylePropertyChanged(CSSStylableElement elt,
+ String name, String val,
+ String prio) {
+ boolean important = prio != null && prio.length() != 0;
+ StyleDeclarationProvider p =
+ elt.getOverrideStyleDeclarationProvider();
+ declaration = p.getStyleDeclaration();
+ setMainProperties(elt, this, name, val, important);
+ declaration = null;
+ invalidateProperties(elt, null, mainPropertiesChanged, true);
+ }
+
+ // MainPropertyReceiver //////////////////////////////////////////////
+
+ /**
+ * Sets a main property value in response to a shorthand property
+ * being set.
+ */
+ public void setMainProperty(String name, Value v, boolean important) {
+ int idx = getPropertyIndex(name);
+ if (idx == -1) {
+ return; // unknown property
+ }
+
+ int i;
+ for (i = 0; i < declaration.size(); i++) {
+ if (idx == declaration.getIndex(i)) {
+ break;
+ }
+ }
+ if (i < declaration.size()) {
+ declaration.put(i, v, idx, important);
+ } else {
+ declaration.append(v, idx, important);
+ }
}
}
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSNavigableDocumentListener.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSNavigableDocumentListener.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSNavigableDocumentListener.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSNavigableDocumentListener.java Tue Mar 7 16:03:46 2006
@@ -1,6 +1,6 @@
/*
- Copyright 2005 The Apache Software Foundation
+ Copyright 2005-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -57,4 +57,21 @@
*/
void attrModified(Element e, Attr attr, short attrChange,
String prevValue, String newValue);
+
+ /**
+ * The text of the override style declaration for this element has been
+ * modified.
+ */
+ void overrideStyleTextChanged(CSSStylableElement e, String text);
+
+ /**
+ * A property in the override style declaration has been removed.
+ */
+ void overrideStylePropertyRemoved(CSSStylableElement e, String name);
+
+ /**
+ * A property in the override style declaration has been changed.
+ */
+ void overrideStylePropertyChanged(CSSStylableElement e, String name,
+ String val, String prio);
}
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSStylableElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSStylableElement.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSStylableElement.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSStylableElement.java Tue Mar 7 16:03:46 2006
@@ -1,6 +1,6 @@
/*
- Copyright 2002 The Apache Software Foundation
+ Copyright 2002,2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -60,4 +60,10 @@
* class.
*/
boolean isPseudoInstanceOf(String pseudoClass);
+
+ /**
+ * Returns the object that gives access to the underlying
+ * {@link StyleDeclaration} for the override style of this element.
+ */
+ StyleDeclarationProvider getOverrideStyleDeclarationProvider();
}
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/StyleDeclarationProvider.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/StyleMap.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/StyleMap.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/StyleMap.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/StyleMap.java Tue Mar 7 16:03:46 2006
@@ -1,6 +1,6 @@
/*
- Copyright 2002 The Apache Software Foundation
+ Copyright 2002,2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -54,6 +54,7 @@
public final static short NON_CSS_ORIGIN = 0x4000; // 0100
public final static short AUTHOR_ORIGIN = 0x6000; // 0110
public final static short INLINE_AUTHOR_ORIGIN = (short)0x8000; // 1000
+ public final static short OVERRIDE_ORIGIN = (short)0xA000; // 1010
/**
* The values.
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractAttributeCondition.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractAttributeCondition.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractAttributeCondition.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractAttributeCondition.java Tue Mar 7 16:03:46 2006
@@ -47,11 +47,11 @@
* @param obj the reference object with which to compare.
*/
public boolean equals(Object obj) {
- if (obj == null || !(obj.getClass() != getClass())) {
- return false;
- }
- AbstractAttributeCondition c = (AbstractAttributeCondition)obj;
- return c.value.equals(value);
+ if (obj == null || (obj.getClass() != getClass())) {
+ return false;
+ }
+ AbstractAttributeCondition c = (AbstractAttributeCondition)obj;
+ return c.value.equals(value);
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractCombinatorCondition.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractCombinatorCondition.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractCombinatorCondition.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractCombinatorCondition.java Tue Mar 7 16:03:46 2006
@@ -54,12 +54,12 @@
* @param obj the reference object with which to compare.
*/
public boolean equals(Object obj) {
- if (obj == null || !(obj.getClass() != getClass())) {
- return false;
- }
- AbstractCombinatorCondition c = (AbstractCombinatorCondition)obj;
- return c.firstCondition.equals(firstCondition) &&
- c.secondCondition.equals(secondCondition);
+ if (obj == null || (obj.getClass() != getClass())) {
+ return false;
+ }
+ AbstractCombinatorCondition c = (AbstractCombinatorCondition)obj;
+ return (c.firstCondition.equals(firstCondition) &&
+ c.secondCondition.equals(secondCondition));
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractDescendantSelector.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractDescendantSelector.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractDescendantSelector.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractDescendantSelector.java Tue Mar 7 16:03:46 2006
@@ -56,11 +56,11 @@
* @param obj the reference object with which to compare.
*/
public boolean equals(Object obj) {
- if (obj == null || !(obj.getClass() != getClass())) {
- return false;
- }
- AbstractDescendantSelector s = (AbstractDescendantSelector)obj;
- return s.simpleSelector.equals(simpleSelector);
+ if (obj == null || (obj.getClass() != getClass())) {
+ return false;
+ }
+ AbstractDescendantSelector s = (AbstractDescendantSelector)obj;
+ return s.simpleSelector.equals(simpleSelector);
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractElementSelector.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractElementSelector.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractElementSelector.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractElementSelector.java Tue Mar 7 16:03:46 2006
@@ -46,8 +46,8 @@
* Creates a new ElementSelector object.
*/
protected AbstractElementSelector(String uri, String name) {
- namespaceURI = uri;
- localName = name;
+ namespaceURI = uri;
+ localName = name;
}
/**
@@ -55,12 +55,12 @@
* @param obj the reference object with which to compare.
*/
public boolean equals(Object obj) {
- if (obj == null || !(obj.getClass() != getClass())) {
- return false;
- }
- AbstractElementSelector s = (AbstractElementSelector)obj;
- return s.namespaceURI.equals(namespaceURI) &&
- s.localName.equals(localName);
+ if (obj == null || (obj.getClass() != getClass())) {
+ return false;
+ }
+ AbstractElementSelector s = (AbstractElementSelector)obj;
+ return (s.namespaceURI.equals(namespaceURI) &&
+ s.localName.equals(localName));
}
/**
@@ -68,7 +68,7 @@
* org.w3c.css.sac.ElementSelector#getNamespaceURI()}.
*/
public String getNamespaceURI() {
- return namespaceURI;
+ return namespaceURI;
}
/**
@@ -76,7 +76,7 @@
* org.w3c.css.sac.ElementSelector#getLocalName()}.
*/
public String getLocalName() {
- return localName;
+ return localName;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractSiblingSelector.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractSiblingSelector.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractSiblingSelector.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractSiblingSelector.java Tue Mar 7 16:03:46 2006
@@ -70,11 +70,11 @@
* @param obj the reference object with which to compare.
*/
public boolean equals(Object obj) {
- if (obj == null || !(obj.getClass() != getClass())) {
- return false;
- }
- AbstractSiblingSelector s = (AbstractSiblingSelector)obj;
- return s.simpleSelector.equals(simpleSelector);
+ if (obj == null || (obj.getClass() != getClass())) {
+ return false;
+ }
+ AbstractSiblingSelector s = (AbstractSiblingSelector)obj;
+ return s.simpleSelector.equals(simpleSelector);
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSAttributeCondition.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSAttributeCondition.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSAttributeCondition.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSAttributeCondition.java Tue Mar 7 16:03:46 2006
@@ -62,13 +62,13 @@
* @param obj the reference object with which to compare.
*/
public boolean equals(Object obj) {
- if (!super.equals(obj)) {
- return false;
- }
- CSSAttributeCondition c = (CSSAttributeCondition)obj;
- return c.namespaceURI.equals(namespaceURI) &&
- c.localName.equals(localName) &&
- c.specified == specified;
+ if (!super.equals(obj)) {
+ return false;
+ }
+ CSSAttributeCondition c = (CSSAttributeCondition)obj;
+ return (c.namespaceURI.equals(namespaceURI) &&
+ c.localName.equals(localName) &&
+ c.specified == specified);
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSConditionalSelector.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSConditionalSelector.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSConditionalSelector.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSConditionalSelector.java Tue Mar 7 16:03:46 2006
@@ -58,12 +58,12 @@
* @param obj the reference object with which to compare.
*/
public boolean equals(Object obj) {
- if (obj == null || !(obj.getClass() != getClass())) {
- return false;
- }
- CSSConditionalSelector s = (CSSConditionalSelector)obj;
- return s.simpleSelector.equals(simpleSelector) &&
- s.condition.equals(condition);
+ if (obj == null || (obj.getClass() != getClass())) {
+ return false;
+ }
+ CSSConditionalSelector s = (CSSConditionalSelector)obj;
+ return (s.simpleSelector.equals(simpleSelector) &&
+ s.condition.equals(condition));
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSLangCondition.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSLangCondition.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSLangCondition.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSLangCondition.java Tue Mar 7 16:03:46 2006
@@ -50,11 +50,11 @@
* @param obj the reference object with which to compare.
*/
public boolean equals(Object obj) {
- if (obj == null || !(obj.getClass() != getClass())) {
- return false;
- }
- CSSLangCondition c = (CSSLangCondition)obj;
- return c.lang.equals(lang);
+ if (obj == null || (obj.getClass() != getClass())) {
+ return false;
+ }
+ CSSLangCondition c = (CSSLangCondition)obj;
+ return c.lang.equals(lang);
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSPseudoClassCondition.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSPseudoClassCondition.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSPseudoClassCondition.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSPseudoClassCondition.java Tue Mar 7 16:03:46 2006
@@ -48,11 +48,11 @@
* @param obj the reference object with which to compare.
*/
public boolean equals(Object obj) {
- if (!super.equals(obj)) {
- return false;
- }
- CSSPseudoClassCondition c = (CSSPseudoClassCondition)obj;
- return c.namespaceURI.equals(namespaceURI);
+ if (!super.equals(obj)) {
+ return false;
+ }
+ CSSPseudoClassCondition c = (CSSPseudoClassCondition)obj;
+ return c.namespaceURI.equals(namespaceURI);
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/ShorthandManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/ShorthandManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/ShorthandManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/ShorthandManager.java Tue Mar 7 16:03:46 2006
@@ -36,6 +36,16 @@
String getPropertyName();
/**
+ * Whether the handled property can be animated.
+ */
+ boolean isAnimatableProperty();
+
+ /**
+ * Whether the handled property can be additively animated.
+ */
+ boolean isAdditiveProperty();
+
+ /**
* Sets the properties which are affected by this shorthand
* property.
* @param eng The current CSSEngine.
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/ValueManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/ValueManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/ValueManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/ValueManager.java Tue Mar 7 16:03:46 2006
@@ -44,6 +44,22 @@
boolean isInheritedProperty();
/**
+ * Whether the handled property can be animated.
+ */
+ boolean isAnimatableProperty();
+
+ /**
+ * Whether the handled property can be additively animated.
+ */
+ boolean isAdditiveProperty();
+
+ /**
+ * Returns the type of value this manager handles. This should be
+ * one of the constants defined in {@link org.apache.batik.util.SVGTypes}.
+ */
+ int getPropertyType();
+
+ /**
* Returns the default value for the handled property.
*/
Value getDefaultValue();
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/ClipManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/ClipManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/ClipManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/ClipManager.java Tue Mar 7 16:03:46 2006
@@ -24,6 +24,8 @@
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -41,6 +43,27 @@
*/
public boolean isInheritedProperty() {
return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_CLIP_VALUE;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/CursorManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/CursorManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/CursorManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/CursorManager.java Tue Mar 7 16:03:46 2006
@@ -28,6 +28,8 @@
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -85,6 +87,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_CURSOR_VALUE;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/DirectionManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/DirectionManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/DirectionManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/DirectionManager.java Tue Mar 7 16:03:46 2006
@@ -22,6 +22,7 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'direction' property values.
@@ -46,6 +47,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/DisplayManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/DisplayManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/DisplayManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/DisplayManager.java Tue Mar 7 16:03:46 2006
@@ -22,6 +22,7 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'display' property values.
@@ -78,6 +79,27 @@
*/
public boolean isInheritedProperty() {
return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontFamilyManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontFamilyManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontFamilyManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontFamilyManager.java Tue Mar 7 16:03:46 2006
@@ -29,6 +29,8 @@
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -79,6 +81,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_FONT_FAMILY_VALUE;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontShorthandManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontShorthandManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontShorthandManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontShorthandManager.java Tue Mar 7 16:03:46 2006
@@ -63,6 +63,20 @@
return CSSConstants.CSS_FONT_PROPERTY;
}
+ /**
+ * Implements {@link ShorthandManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
static LexicalUnit NORMAL_LU = CSSLexicalUnit.createString
(LexicalUnit.SAC_IDENT, CSSConstants.CSS_NORMAL_VALUE, null);
static LexicalUnit BOLD_LU = CSSLexicalUnit.createString
@@ -134,7 +148,7 @@
switch (lu.getLexicalUnitType()) {
case LexicalUnit.SAC_INHERIT: return;
case LexicalUnit.SAC_IDENT: {
- String s= lu.getStringValue().toLowerCase();
+ String s = lu.getStringValue().toLowerCase();
if (values.contains(s)) {
handleSystemFont(eng, ph, s, imp);
return;
@@ -161,7 +175,7 @@
IdentifierManager fstVM = (IdentifierManager)vMgrs[fst];
IdentifierManager fvVM = (IdentifierManager)vMgrs[fv];
IdentifierManager fwVM = (IdentifierManager)vMgrs[fw];
- FontSizeManager fszVM = (FontSizeManager)vMgrs[fsz];
+ FontSizeManager fszVM = (FontSizeManager)vMgrs[fsz];
ValueManager ffVM = vMgrs[ff];
StringMap fstSM = fstVM.getIdentifiers();
@@ -170,43 +184,45 @@
StringMap fszSM = fszVM.getIdentifiers();
- // Check for font-style, font-varient, & font-weight
+ // Check for font-style, font-variant, & font-weight
// These are all optional.
boolean svwDone= false;
- LexicalUnit intLU = null;;
+ LexicalUnit intLU = null;
while (!svwDone && (lu != null)) {
switch (lu.getLexicalUnitType()) {
case LexicalUnit.SAC_IDENT: {
- String s= lu.getStringValue().toLowerCase().intern();
- if ((fontStyle == null) && (fstSM.get(s) != null)) {
- fontStyle = lu;
+ String s = lu.getStringValue().toLowerCase().intern();
+ if (fontStyle == null && fstSM.get(s) != null) {
+ fontStyle = lu;
if (intLU != null) {
if (fontWeight == null) {
fontWeight = intLU;
intLU = null;
- } else
+ } else {
throw createInvalidLexicalUnitDOMException
(intLU.getLexicalUnitType());
+ }
}
break;
}
- if ((fontVariant == null) && (fvSM.get(s) != null)) {
+ if (fontVariant == null && fvSM.get(s) != null) {
fontVariant = lu;
if (intLU != null) {
if (fontWeight == null) {
fontWeight = intLU;
intLU = null;
- } else
+ } else {
throw createInvalidLexicalUnitDOMException
(intLU.getLexicalUnitType());
+ }
}
break;
}
- if ((intLU == null) && (fontWeight == null) &&
- (fwSM.get(s) != null)) {
+ if (intLU == null && fontWeight == null
+ && fwSM.get(s) != null) {
fontWeight = lu;
break;
}
@@ -215,7 +231,7 @@
break;
}
case LexicalUnit.SAC_INTEGER:
- if ((intLU == null) && (fontWeight == null)) {
+ if (intLU == null && fontWeight == null) {
intLU = lu;
break;
}
@@ -314,8 +330,9 @@
ph.property(CSSConstants.CSS_FONT_VARIANT_PROPERTY, fontVariant, imp);
ph.property(CSSConstants.CSS_FONT_WEIGHT_PROPERTY, fontWeight, imp);
ph.property(CSSConstants.CSS_FONT_SIZE_PROPERTY, fontSize, imp);
- if (lh!=-1)
+ if (lh != -1) {
ph.property(CSSConstants.CSS_LINE_HEIGHT_PROPERTY,
lineHeight, imp);
+ }
}
}
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontSizeAdjustManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontSizeAdjustManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontSizeAdjustManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontSizeAdjustManager.java Tue Mar 7 16:03:46 2006
@@ -24,6 +24,8 @@
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -41,6 +43,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_NUMBER_OR_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontSizeManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontSizeManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontSizeManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontSizeManager.java Tue Mar 7 16:03:46 2006
@@ -29,6 +29,8 @@
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -83,12 +85,33 @@
}
/**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return true;
+ }
+
+ /**
* Implements {@link ValueManager#getPropertyName()}.
*/
public String getPropertyName() {
return CSSConstants.CSS_FONT_SIZE_PROPERTY;
}
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_LENGTH_OR_IDENT;
+ }
+
/**
* Implements {@link ValueManager#getDefaultValue()}.
*/
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontStretchManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontStretchManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontStretchManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontStretchManager.java Tue Mar 7 16:03:46 2006
@@ -26,6 +26,7 @@
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'font-stretch' property values.
@@ -72,6 +73,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontStyleManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontStyleManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontStyleManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontStyleManager.java Tue Mar 7 16:03:46 2006
@@ -22,6 +22,7 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'font-style' property values.
@@ -52,6 +53,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontVariantManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontVariantManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontVariantManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontVariantManager.java Tue Mar 7 16:03:46 2006
@@ -22,6 +22,7 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'font-variant' property values.
@@ -48,6 +49,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontWeightManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontWeightManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontWeightManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontWeightManager.java Tue Mar 7 16:03:46 2006
@@ -27,6 +27,8 @@
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -61,6 +63,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_FONT_WEIGHT_VALUE;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/OverflowManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/OverflowManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/OverflowManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/OverflowManager.java Tue Mar 7 16:03:46 2006
@@ -22,6 +22,7 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'overflow' property values.
@@ -52,6 +53,27 @@
*/
public boolean isInheritedProperty() {
return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/SrcManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/SrcManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/SrcManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/SrcManager.java Tue Mar 7 16:03:46 2006
@@ -27,6 +27,7 @@
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
import org.w3c.dom.css.CSSPrimitiveValue;
import org.w3c.dom.DOMException;
@@ -60,6 +61,27 @@
*/
public boolean isInheritedProperty() {
return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_FONT_DESCRIPTOR_SRC_VALUE;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/TextDecorationManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/TextDecorationManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/TextDecorationManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/TextDecorationManager.java Tue Mar 7 16:03:46 2006
@@ -25,6 +25,7 @@
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -57,6 +58,27 @@
*/
public boolean isInheritedProperty() {
return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT_LIST;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/UnicodeBidiManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/UnicodeBidiManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/UnicodeBidiManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/UnicodeBidiManager.java Tue Mar 7 16:03:46 2006
@@ -22,6 +22,7 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'unicode-bidi' property values.
@@ -50,6 +51,27 @@
*/
public boolean isInheritedProperty() {
return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/VisibilityManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/VisibilityManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/VisibilityManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/VisibilityManager.java Tue Mar 7 16:03:46 2006
@@ -23,6 +23,7 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'visibility' property values.
@@ -51,6 +52,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/AlignmentBaselineManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/AlignmentBaselineManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/AlignmentBaselineManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/AlignmentBaselineManager.java Tue Mar 7 16:03:46 2006
@@ -21,6 +21,7 @@
import org.apache.batik.css.engine.value.StringMap;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'alignment-baseline' property values.
@@ -65,6 +66,27 @@
*/
public boolean isInheritedProperty() {
return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/BaselineShiftManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/BaselineShiftManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/BaselineShiftManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/BaselineShiftManager.java Tue Mar 7 16:03:46 2006
@@ -26,6 +26,8 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -56,6 +58,27 @@
*/
public boolean isInheritedProperty() {
return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_LENGTH_OR_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ClipPathManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ClipPathManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ClipPathManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ClipPathManager.java Tue Mar 7 16:03:46 2006
@@ -24,6 +24,8 @@
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -50,6 +52,27 @@
return CSSConstants.CSS_CLIP_PATH_PROPERTY;
}
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_URI_OR_IDENT;
+ }
+
/**
* Implements {@link ValueManager#getDefaultValue()}.
*/
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ClipRuleManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ClipRuleManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ClipRuleManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ClipRuleManager.java Tue Mar 7 16:03:46 2006
@@ -21,6 +21,7 @@
import org.apache.batik.css.engine.value.StringMap;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'clip-rule' property values.
@@ -47,6 +48,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorInterpolationManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorInterpolationManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorInterpolationManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorInterpolationManager.java Tue Mar 7 16:03:46 2006
@@ -21,6 +21,7 @@
import org.apache.batik.css.engine.value.StringMap;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'color-interpolation' property values.
@@ -49,6 +50,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorManager.java Tue Mar 7 16:03:46 2006
@@ -20,6 +20,7 @@
import org.apache.batik.css.engine.value.AbstractColorManager;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'color' property values.
@@ -615,6 +616,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_COLOR;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorProfileManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorProfileManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorProfileManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorProfileManager.java Tue Mar 7 16:03:46 2006
@@ -24,6 +24,7 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -50,6 +51,27 @@
return CSSConstants.CSS_COLOR_PROFILE_PROPERTY;
}
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_URI_OR_IDENT;
+ }
+
/**
* Implements {@link ValueManager#getDefaultValue()}.
*/
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorRenderingManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorRenderingManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorRenderingManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorRenderingManager.java Tue Mar 7 16:03:46 2006
@@ -21,6 +21,7 @@
import org.apache.batik.css.engine.value.StringMap;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'color-rendering' property values.
@@ -49,6 +50,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/DominantBaselineManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/DominantBaselineManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/DominantBaselineManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/DominantBaselineManager.java Tue Mar 7 16:03:46 2006
@@ -21,6 +21,7 @@
import org.apache.batik.css.engine.value.StringMap;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'alignment-baseline' property values.
@@ -71,6 +72,27 @@
*/
public boolean isInheritedProperty() {
return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/EnableBackgroundManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/EnableBackgroundManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/EnableBackgroundManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/EnableBackgroundManager.java Tue Mar 7 16:03:46 2006
@@ -25,6 +25,8 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -48,6 +50,27 @@
*/
public boolean isInheritedProperty() {
return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_ENABLE_BACKGROUND_VALUE;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/FillRuleManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/FillRuleManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/FillRuleManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/FillRuleManager.java Tue Mar 7 16:03:46 2006
@@ -21,6 +21,7 @@
import org.apache.batik.css.engine.value.StringMap;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'fill-rule' property values.
@@ -47,6 +48,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/FilterManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/FilterManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/FilterManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/FilterManager.java Tue Mar 7 16:03:46 2006
@@ -23,6 +23,7 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -50,6 +51,27 @@
return CSSConstants.CSS_FILTER_PROPERTY;
}
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_URI_OR_IDENT;
+ }
+
/**
* Implements {@link ValueManager#getDefaultValue()}.
*/
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/GlyphOrientationManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/GlyphOrientationManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/GlyphOrientationManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/GlyphOrientationManager.java Tue Mar 7 16:03:46 2006
@@ -22,6 +22,8 @@
import org.apache.batik.css.engine.value.FloatValue;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueManager;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -40,6 +42,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_ANGLE_OR_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ImageRenderingManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ImageRenderingManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ImageRenderingManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ImageRenderingManager.java Tue Mar 7 16:03:46 2006
@@ -21,6 +21,7 @@
import org.apache.batik.css.engine.value.StringMap;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'image-rendering' property values.
@@ -49,6 +50,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/KerningManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/KerningManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/KerningManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/KerningManager.java Tue Mar 7 16:03:46 2006
@@ -22,6 +22,8 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -48,6 +50,27 @@
return CSSConstants.CSS_KERNING_PROPERTY;
}
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_LENGTH_OR_IDENT;
+ }
+
/**
* Implements {@link ValueManager#getDefaultValue()}.
*/
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MarkerManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MarkerManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MarkerManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MarkerManager.java Tue Mar 7 16:03:46 2006
@@ -24,6 +24,8 @@
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -53,6 +55,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_URI_OR_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MarkerShorthandManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MarkerShorthandManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MarkerShorthandManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MarkerShorthandManager.java Tue Mar 7 16:03:46 2006
@@ -44,6 +44,20 @@
}
/**
+ * Implements {@link ShorthandManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ShorthandManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
* Implements {@link ShorthandManager#setValues(CSSEngine,ShorthandManager.PropertyHandler,LexicalUnit,boolean)}.
*/
public void setValues(CSSEngine eng,
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MaskManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MaskManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MaskManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MaskManager.java Tue Mar 7 16:03:46 2006
@@ -24,6 +24,8 @@
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -41,6 +43,27 @@
*/
public boolean isInheritedProperty() {
return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_URI_OR_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/OpacityManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/OpacityManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/OpacityManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/OpacityManager.java Tue Mar 7 16:03:46 2006
@@ -22,6 +22,8 @@
import org.apache.batik.css.engine.value.FloatValue;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueManager;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSPrimitiveValue;
@@ -57,6 +59,27 @@
*/
public boolean isInheritedProperty() {
return inherited;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_NUMBER_OR_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/PointerEventsManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/PointerEventsManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/PointerEventsManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/PointerEventsManager.java Tue Mar 7 16:03:46 2006
@@ -21,6 +21,7 @@
import org.apache.batik.css.engine.value.StringMap;
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
/**
* This class provides a manager for the 'pointer-events' property values.
@@ -65,6 +66,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_IDENT;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SVGColorManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SVGColorManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SVGColorManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SVGColorManager.java Tue Mar 7 16:03:46 2006
@@ -24,6 +24,8 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
import org.w3c.dom.css.CSSValue;
@@ -67,6 +69,27 @@
*/
public boolean isInheritedProperty() {
return false;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_COLOR;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SVGPaintManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SVGPaintManager.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SVGPaintManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SVGPaintManager.java Tue Mar 7 16:03:46 2006
@@ -25,6 +25,8 @@
import org.apache.batik.css.engine.value.Value;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.util.CSSConstants;
+import org.apache.batik.util.SVGTypes;
+
import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.css.CSSPrimitiveValue;
import org.w3c.dom.css.CSSValue;
@@ -59,6 +61,27 @@
*/
public boolean isInheritedProperty() {
return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAnimatableProperty()}.
+ */
+ public boolean isAnimatableProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#isAdditiveProperty()}.
+ */
+ public boolean isAdditiveProperty() {
+ return true;
+ }
+
+ /**
+ * Implements {@link ValueManager#getPropertyType()}.
+ */
+ public int getPropertyType() {
+ return SVGTypes.TYPE_PAINT;
}
/**